Merge branch 'develop' into fix/trash-to-origin-dir-path-bk

Author: degenaro

tests/trestle/core/commands/validate_test.py

@@ -505,8 +505,7 @@ def test_validate_component_definition(
     test_utils.execute_command_and_assert(validate_command, 0, monkeypatch)
 
 
-@pytest.mark.skip()
-def xest_validate_component_definition_ports(
+def test_validate_component_definition_ports(
     tmp_trestle_dir: pathlib.Path, testdata_dir: pathlib.Path, monkeypatch: MonkeyPatch
 ) -> None:
     """Test validation of ports in Component Definition."""
@@ -525,7 +524,6 @@ def xest_validate_component_definition_ports(
     test_utils.execute_command_and_assert(validate_command, 0, monkeypatch)
 
 
-@pytest.mark.skip()
 def test_validate_component_definition_ports_invalid(
     tmp_trestle_dir: pathlib.Path, testdata_dir: pathlib.Path, monkeypatch: MonkeyPatch
 ) -> None:
@@ -542,7 +540,7 @@ def test_validate_component_definition_ports_invalid(
 
     shutil.copyfile(spth, tpth)
     validate_command = f'trestle validate -f {tpth}'
-    test_utils.execute_command_and_assert(validate_command, 1, monkeypatch)
+    test_utils.execute_command_and_assert(validate_command, CmdReturnCodes.OSCAL_VALIDATION_ERROR.value, monkeypatch)
 
 
 def test_validate_mapping_simple(