increase test coverage + fix for IMPLEMENTATION_LEVEL

Author: rw-bsi

fixtures/fail_missing_implementation_level.ifc

@@ -0,0 +1,30 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView_V1.2]', 'ExchangeRequirement [Any]')); /* missing implementation level */
+FILE_NAME('Header example2.ifc', '2022-09-16T10:35:07', ('Evandro Alfieri'), ('buildingSMART Int.'), 'IFC Motor 1.0', 'Company - Application - 26.0.0.0', 'none');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'v0.7.0-6c9e130ca','IfcOpenShell-v0.7.0-6c9e130ca','');
+#5=IFCOWNERHISTORY(#3,#4,$,.NOTDEFINED.,$,#3,#4,1700419055);
+#6=IFCDIRECTION((1.,0.,0.));
+#7=IFCDIRECTION((0.,0.,1.));
+#8=IFCCARTESIANPOINT((0.,0.,0.));
+#9=IFCAXIS2PLACEMENT3D(#8,#7,#6);
+#10=IFCDIRECTION((0.,1.));
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#9,#10);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#14=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#15=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#16=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#17=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453292519943295),#16);
+#18=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'DEGREE',#17);
+#19=IFCUNITASSIGNMENT((#13,#14,#15,#18));
+#20=IFCPROJECT('0iDmeiiLP3AOllitM2Favn',#5,'',$,$,$,$,(#11),#19);
+#21=IFCSITE('3rg2jGkIH10RFhrQsGZKRk',#5,$,$,$,$,$,$,$,$,$,$,$,$);
+ENDSEC;
+END-ISO-10303-21;

fixtures/fail_wrong_implementation_level.ifc

@@ -0,0 +1,30 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'4;5'); /* should be '2;1' */
+FILE_NAME('Header example2.ifc', '2022-09-16T10:35:07', ('Evandro Alfieri'), ('buildingSMART Int.'), 'IFC Motor 1.0', 'Company - Application - 26.0.0.0', 'none');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'v0.7.0-6c9e130ca','IfcOpenShell-v0.7.0-6c9e130ca','');
+#5=IFCOWNERHISTORY(#3,#4,$,.NOTDEFINED.,$,#3,#4,1700419055);
+#6=IFCDIRECTION((1.,0.,0.));
+#7=IFCDIRECTION((0.,0.,1.));
+#8=IFCCARTESIANPOINT((0.,0.,0.));
+#9=IFCAXIS2PLACEMENT3D(#8,#7,#6);
+#10=IFCDIRECTION((0.,1.));
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#9,#10);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#14=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#15=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#16=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#17=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453292519943295),#16);
+#18=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'DEGREE',#17);
+#19=IFCUNITASSIGNMENT((#13,#14,#15,#18));
+#20=IFCPROJECT('0iDmeiiLP3AOllitM2Favn',#5,'',$,$,$,$,(#11),#19);
+#21=IFCSITE('3rg2jGkIH10RFhrQsGZKRk',#5,$,$,$,$,$,$,$,$,$,$,$,$);
+ENDSEC;
+END-ISO-10303-21;

fixtures/passing_header.ifc fixtures/pass_header.ifcfixtures/passing_header.ifc renamed to fixtures/pass_header.ifc

@@ -23,6 +23,8 @@
 
 
 def validate_header_fields(header, error_collector, only_header=False):
+    
+    # all required fields present
     for field in HEADER_FIELDS.keys():
         observed = header.get(field.upper(), [])
         expected = HEADER_FIELDS.get(field)._fields
@@ -33,6 +35,16 @@ def validate_header_fields(header, error_collector, only_header=False):
             if only_header:
                 error_collector.raise_if_any()
 
+    # implementation level should be present and equal to "2;1"
+    file_description = header.get('FILE_DESCRIPTION')
+    implementation_level = None if len(file_description) < 2 else file_description[1]
+    if implementation_level != "2;1":
+        error_collector.add(
+            HeaderFieldError("IMPLEMENTATION_LEVEL", implementation_level, "2;1")
+        )
+        if only_header:
+            error_collector.raise_if_any()
+
 
 @dataclass
 class ParseResult:

parser/parse.py

@@ -46,6 +46,8 @@ def test_file_without_tree(file):
         for sub in [
             "fail_too_many_header_entity_fields.ifc",
             "fail_multiple_wrong_header_fields",
+            "fail_missing_implementation_level.ifc",
+            "fail_wrong_implementation_level.ifc"
         ]
     ):
         pytest.skip(
@@ -66,11 +68,12 @@ def test_parse_features():
     assert f[1][0] is None
     assert f.header.file_description[0][0] == "ViewDefinition [CoordinationView]"
     assert f.header_.get("FILE_DESCRIPTION")[0][0]
+    assert f.header_.get("FILE_DESCRIPTION")[1] == "2;1"
     assert f.by_type("ifcapplication")[1][2] == "Nested ' quotes"
 
 
 def test_parse_valid_header():
-    f = open("fixtures/passing_header.ifc")
+    f = open("fixtures/pass_header.ifc")
 
     expected_description = {
         "description": ("ViewDefinition [Alignment-basedView]",),
@@ -102,7 +105,7 @@ def test_parse_valid_header():
 
 
 def test_header_only_api():
-    f = open("fixtures/passing_header.ifc", only_header=True)
+    f = open("fixtures/pass_header.ifc", only_header=True)
     expected_description = {
         "description": ("ViewDefinition [Alignment-basedView]",),
         "implementation_level": "2;1",
@@ -155,7 +158,9 @@ def test_file_mvd_attr():
     [
         "fixtures/fail_invalid_header_entity.ifc",
         "fixtures/fail_no_header.ifc",
-    ],
+        "fixtures/fail_missing_implementation_level.ifc",
+        "fixtures/fail_wrong_implementation_level.ifc",
+    ]
 )
 def test_invalid_headers_(filename):
     # error in header
@@ -205,7 +210,7 @@ def test_multiple_wrong_header_fields():
 
     errors = exc_info.value.errors
 
-    assert len(errors) == 2
+    assert len(errors) == 3
     assert all(isinstance(e, HeaderFieldError) for e in errors)
 
 
@@ -216,27 +221,44 @@ def test_multiple_wrong_header_fields():
 
 def run_cli(*args):
     return subprocess.run(
-        ["python", "-m", MODULE_NAME, *args],
+        ["python3", "-m", MODULE_NAME, *args],
         capture_output=True,
         text=True,
         cwd=PARENT_DIR,
     )
 
 
-def test_cli_valid_file():
-    result = run_cli("step-file-parser/fixtures/passing_header.ifc")
+@pytest.mark.parametrize("filename", glob.glob("fixtures/pass*.ifc"))
+@pytest.mark.parametrize("only_header", [False, True])
+def test_cli_valid_file(filename, only_header):
+    args = []
+    if only_header: args.append('--only-header')
+    result = run_cli(f'step-file-parser/{filename}', *args)
     assert result.returncode == 0
     assert "Valid" in result.stderr
 
 
-def test_cli_invalid_file():
+@pytest.mark.parametrize("filename", glob.glob("fixtures/pass*.ifc"))
+@pytest.mark.parametrize("only_header", [False, True])
+def test_cli_valid_file_json_output(filename, only_header):
+    args = ['--json']
+    if only_header: args.append('--only-header')
+    result = run_cli(f'step-file-parser/{filename}', *args)
+    assert result.returncode == 0
+    assert result.stderr.strip() == ""
+    assert result.stdout.strip() == ""
+
+
+def test_cli_fail_no_header():
     result = run_cli("step-file-parser/fixtures/fail_no_header.ifc")
     assert result.returncode == 1
+    assert result.stderr.strip() != ""
 
 
-def test_cli_json_output():
-    result = run_cli("--json", "step-file-parser/fixtures/fail_no_header.ifc")
+def test_cli_fail_no_header_json_output():
+    result = run_cli("step-file-parser/fixtures/fail_no_header.ifc", "--json")
     assert result.returncode == 1
+    assert result.stdout.strip() != ""
     errors = json.loads(result.stdout)
     assert isinstance(errors, list)
     assert len(errors) > 0