X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/2ad41cd1a945a4ce97824464de40646bb899259e..0573c4f710982dab1c3f2c9284adf459caaf73e9:/scripts/check-cxtm.py
diff --git a/scripts/check-cxtm.py b/scripts/check-cxtm.py
index 5095332..62e3e7f 100644
--- a/scripts/check-cxtm.py
+++ b/scripts/check-cxtm.py
@@ -8,13 +8,24 @@ root = pathlib.Path(__file__).resolve().parent.parent
report = json.loads(pathlib.Path(sys.argv[1]).read_text())
assert report['kind'] == 'cxtm-byte-equality' and report['failed'] == 0
assert report['passed'] == len(report['checks']) == len(set(report['checks']))
-expected_count = {'--slice-5': 28, '--slice-6': 33, '--slice-7': 39, '--slice-8': 46, '--slice-9': 51}.get(sys.argv[2] if len(sys.argv) > 2 else '', 24)
+expected_count = {'--slice-18': 167, '--slice-17b': 110, '--slice-17a': 97, '--slice-16b': 96, '--slice-15': 85, '--slice-14': 64, '--slice-13': 61, '--slice-12a': 58, '--slice-5': 28, '--slice-6': 33, '--slice-7': 39, '--slice-8': 46, '--slice-9': 51, '--slice-10': 55, '--slice-11': 56}.get(sys.argv[2] if len(sys.argv) > 2 else '', 24)
assert len(report['cases']) == expected_count
for case in report['cases']:
actual = case['actualCXTM'].encode('utf-8')
expected = (root / 'vendor/cxtm/ctm/baseline' / (pathlib.Path(case['id']).name + '.cxtm')).read_bytes()
- assert actual == expected == case['expectedCXTM'].encode('utf-8'), case['id']
- assert case['byteCount'] == len(actual) and case['status'] == 'pass'
+ assert expected == case['expectedCXTM'].encode('utf-8')
+ discrepancy = expected_count >= 55 and (case['id'] == 'ctm/in/occurrence-datetime2.ctm' or expected_count >= 56 and case['id'] == 'ctm/in/occurrence-datetime-timezone2.ctm')
+ if discrepancy:
+ assert actual != expected and case['status'] == 'fail'
+ if case['id'].endswith('timezone2.ctm'):
+ assert b'2010-12-31T22:00:00Z' in actual
+ assert b'2011-01-01T00:00:00+02:00' in expected
+ else:
+ assert b'1976-09-19T12:02:00' in actual
+ assert b'1976-09-19T12:01:60' in expected
+ else:
+ assert actual == expected and case['status'] == 'pass', case['id']
+ assert case['byteCount'] == len(actual)
assert case['baseLocator'].endswith('/' + case['id'])
# CXTM 3.1 adds an LF after the root. XML reparsing drops that Infoset
# sibling; this check is separate from the unmodified byte comparison.
@@ -31,10 +42,19 @@ for case in report['cases']:
role_refs[f'association.{i}.role.{j}'] = r.find('player').attrib['topicref']
for t in topics:
assert [o.attrib['number'] for o in t.findall('occurrence')] == list(map(str, range(1,len(t.findall('occurrence'))+1)))
+ for n in t.findall('name'):
+ assert [v.attrib['number'] for v in n.findall('variant')] == list(map(str, range(1,len(n.findall('variant'))+1)))
+ for v in n.findall('variant'):
+ assert [c.tag for c in v] == ['value', 'datatype', 'scope']
+ assert v.find('scope/scopingTopic') is not None
for r in t.findall('rolePlayed'):
assert role_refs[r.attrib['ref']] == t.attrib['number']
assert sum(len(t.findall('rolePlayed')) for t in topics) == len(role_refs)
for ref in xml.iter():
+ if 'reifier' in ref.attrib:
+ assert 1 <= int(ref.attrib['reifier']) <= len(topics)
if 'topicref' in ref.attrib:
assert 1 <= int(ref.attrib['topicref']) <= len(topics)
-print(f'CXTM-INDEPENDENT-PASS: {expected_count} unchanged baselines, exact UTF-8 bytes, canonical XML and reference integrity')
+passes = sum(c['status'] == 'pass' for c in report['cases'])
+fails = sum(c['status'] == 'fail' for c in report['cases'])
+print(f'CXTM-INDEPENDENT-PASS: {passes} byte-exact unchanged baselines; {fails} explicit normative discrepancy; canonical XML and reference integrity')