Merge pull request #64 from Bjwebb/improve-code-quality

Refine dummy XML in light of changes to comprehensiveness logic aa0be1b
IATI · Aug 5, 2015 · ebb35fa · ebb35fa
2 parents 1e83379 + 958515a
commit ebb35fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/stats/dashboard.py b/stats/dashboard.py
@@ -708,6 +708,7 @@ def empty_or_percentage_sum_is_100(path, by_vocab=False):
                     else:
                         return len(elements) == 1 or sum(decimal_or_zero(x.attrib.get('percentage')) for x in elements) == 100
 
+
             bools.update({
                 'version': bools['version'] and self.element.getparent().attrib['version'] in CODELISTS[self._major_version()]['Version'],
                 'iati-identifier': bools['iati-identifier'] and reporting_org_ref and self.element.find('iati-identifier').text.startswith(reporting_org_ref),

diff --git a/stats/tests/test_comprehensiveness.py b/stats/tests/test_comprehensiveness.py
@@ -505,7 +505,7 @@ def test_comprehensiveness_with_validation(key, major_version):
                 <reporting-org ref="BBB"/>
                 <iati-identifier>AAA-1</iati-identifier>
                 <participating-org role="Implementing"/>
-                <activity-status code="2" />
+                <activity-status />
                 <activity-date iso-date="9990-05-01" />
                 <!-- Must have at least one activity-date of type start-planned or start-actual with valid date -->
                 <activity-date type="end-planned" iso-date="2014-01-01" />
@@ -544,11 +544,11 @@ def test_comprehensiveness_with_validation(key, major_version):
                 <reporting-org ref="BBB"/>
                 <iati-identifier>AAA-1</iati-identifier>
                 <participating-org role="4"/><!-- Implementing -->
-                <activity-status code="2" />
+                <activity-status />
                 <activity-date iso-date="9990-05-01" />
                 <!-- Must have at least one activity-date of type start-planned or start-actual with valid date -->
-                <activity-date type="end-planned" iso-date="2014-01-01" />
-                <activity-date type="start-planned" iso-date="2014-0101" />
+                <activity-date type="3" iso-date="2014-01-01" />
+                <activity-date type="1" iso-date="2014-0101" />
                 <sector vocabulary="1" percentage="100" code="a" />
                 <sector vocabulary="1" percentage="100" code="b" />
                 <sector vocabulary="2" percentage="100" code="a" />
@@ -590,7 +590,9 @@ def test_comprehensiveness_with_validation(key, major_version):
                 <reporting-org ref="AAA"/>
                 <iati-identifier>AAA-1</iati-identifier>
                 <participating-org role="Funding"/>
+                <activity-status code="2" />
                 <!-- Must have at least one activity-date in the past year (if 'end-actual') or in the future (if type 'end-planned') -->
+                <activity-date iso-date="2014-01-01" type="start-planned" />
                 <activity-date iso-date="2015-06-01" type="end-planned" />
                 <sector vocabulary="DAC" percentage="50" code="11220" />
                 <sector vocabulary="DAC" percentage="50" code="11240" />
@@ -632,7 +634,9 @@ def test_comprehensiveness_with_validation(key, major_version):
                 <reporting-org ref="AAA"/>
                 <iati-identifier>AAA-1</iati-identifier>
                 <participating-org role="1"/><!-- Funding -->
+                <activity-status code="2" />
                 <!-- Must have at least one activity-date in the past year (if '4') or in the future (if type '3') -->
+                <activity-date iso-date="2014-01-01" type="1" />
                 <activity-date iso-date="2015-06-01" type="3" />
                 <sector vocabulary="1" percentage="50" code="11220" />
                 <sector vocabulary="1" percentage="50" code="11240" />