mustrd 0.3.3__tar.gz → 0.3.4a1__tar.gz

{mustrd-0.3.3 → mustrd-0.3.4a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mustrd
-Version: 0.3.3
+Version: 0.3.4a1
 Summary: A Spec By Example framework for RDF and SPARQL, Inspired by Cucumber.
 License: MIT
 Author: John Placek

{mustrd-0.3.3 → mustrd-0.3.4a1}/mustrd/model/mustrdShapes.ttl

@@ -169,6 +169,7 @@ must:SparqlSourceShape
     a              sh:NodeShape ;
     sh:targetClass must:SparqlSource ;
     sh:property    [ sh:path     must:queryType ;
+                     sh:in ( must:SelectSparql  must:ConstructSparql must:UpdateSparql) ;
                      sh:minCount 1 ;
                      sh:maxCount 1 ; ] .
 

{mustrd-0.3.3 → mustrd-0.3.4a1}/mustrd/mustrd.py

@@ -134,7 +134,7 @@ class TripleStoreConnectionError(SpecResult):
 
 
 @dataclass
-class SpecSkipped(SpecResult):
+class SpecInvalid(SpecResult):
     message: str
     spec_file_name: str = "default.mustrd.ttl"
     spec_source_file: Path = Path("default.mustrd.ttl")
@@ -204,6 +204,12 @@ def validate_specs(
                 f"Could not extract spec from {file} due to exception of type "
                 f"{type(e).__name__} when parsing file"
             ]
+            invalid_specs += [
+                SpecInvalid(
+                    "urn:invalid_spec_file", triple_store["type"], message, file.name, file
+                )
+                for triple_store in triple_stores
+            ]
             continue
 
         # run shacl validation
@@ -310,7 +316,7 @@ def add_spec_validation(
             error_messages.sort()
             error_message = "\n".join(msg for msg in error_messages)
             invalid_specs += [
-                SpecSkipped(
+                SpecInvalid(
                     subject_uri, triple_store["type"], error_message, file.name, file
                 )
                 for triple_store in triple_stores
@@ -324,15 +330,15 @@ def get_specs(
     run_config: dict,
 ):
     specs = []
-    skipped_results = []
+    invalid_spec = []
     try:
         for triple_store in triple_stores:
             if "error" in triple_store:
                 log.error(
                     f"{triple_store['error']}. No specs run for this triple store."
                 )
-                skipped_results += [
-                    SpecSkipped(
+                invalid_spec += [
+                    SpecInvalid(
                         spec_uri,
                         triple_store["type"],
                         triple_store["error"],
@@ -360,8 +366,8 @@ def get_specs(
                             )
                             or "unknown"
                         )
-                        skipped_results += [
-                            SpecSkipped(
+                        invalid_spec += [
+                            SpecInvalid(
                                 spec_uri,
                                 triple_store["type"],
                                 str(e),
@@ -380,7 +386,7 @@ def get_specs(
         log.error("No specifications will be run.")
 
     log.info(f"Extracted {len(specs)} specifications that will be run")
-    return specs, skipped_results
+    return specs, invalid_spec
 
 
 def run_specs(specs) -> List[SpecResult]:
@@ -505,7 +511,7 @@ def run_spec(spec: Specification) -> SpecResult:
         upload_given(triple_store, spec.given)
     else:
         if triple_store["type"] == TRIPLESTORE.RdfLib:
-            return SpecSkipped(
+            return SpecInvalid(
                 spec_uri,
                 triple_store["type"],
                 "Unable to run Inherited State tests on Rdflib",
@@ -526,7 +532,6 @@ def run_spec(spec: Specification) -> SpecResult:
             except NotImplementedError as ex:
                 log.error(f"NotImplementedError {ex}")
                 raise ex
-                # return SpecSkipped(spec_uri, triple_store["type"], ex.args[0])
         return check_result(spec, result)
     except (ConnectionError, TimeoutError, HTTPError, ConnectTimeout, OSError) as e:
         # close_connection = False
@@ -948,8 +953,8 @@ def write_result_diff_to_log(res, info):
     ):
         info(f"{Fore.RED}Failed {res.spec_uri} {res.triple_store}")
         info(res.exception)
-    if isinstance(res, SpecSkipped):
-        info(f"{Fore.YELLOW}Skipped {res.spec_uri} {res.triple_store}")
+    if isinstance(res, SpecInvalid):
+        info(f"{Fore.RED} Invalid {res.spec_uri} {res.triple_store}")
         info(res.message)
 
 
@@ -1046,7 +1051,7 @@ def review_results(results: List[SpecResult], verbose: bool) -> None:
     colours = {
         SpecPassed: Fore.GREEN,
         SpecPassedWithWarning: Fore.YELLOW,
-        SpecSkipped: Fore.YELLOW,
+        SpecInvalid: Fore.RED,
     }
     # Populate dictionaries from results
     for result in results:
@@ -1103,12 +1108,12 @@ def review_results(results: List[SpecResult], verbose: bool) -> None:
 
     pass_count = statuses.count(SpecPassed)
     warning_count = statuses.count(SpecPassedWithWarning)
-    skipped_count = statuses.count(SpecSkipped)
+    invalid_count = statuses.count(SpecInvalid)
     fail_count = len(
         list(
             filter(
                 lambda status: status
-                not in [SpecPassed, SpecPassedWithWarning, SpecSkipped],
+                not in [SpecPassed, SpecPassedWithWarning, SpecInvalid],
                 statuses,
             )
         )
@@ -1116,18 +1121,18 @@ def review_results(results: List[SpecResult], verbose: bool) -> None:
 
     if fail_count:
         overview_colour = Fore.RED
-    elif warning_count or skipped_count:
+    elif warning_count or invalid_count:
         overview_colour = Fore.YELLOW
     else:
         overview_colour = Fore.GREEN
 
     logger_setup.flush()
     log.info(
-        f"{overview_colour}===== {fail_count} failures, {skipped_count} skipped, {Fore.GREEN}{pass_count} passed, "
+        f"{overview_colour}===== {fail_count} failures, {invalid_count} invalid, {Fore.GREEN}{pass_count} passed, "
         f"{overview_colour}{warning_count} passed with warnings ====="
     )
 
-    if verbose and (fail_count or warning_count or skipped_count):
+    if verbose and (fail_count or warning_count or invalid_count):
         display_verbose(results)
 
 
@@ -1165,8 +1170,8 @@ def display_verbose(results: List[SpecResult]):
         ):
             log.info(f"{Fore.RED}Failed {res.spec_uri} {res.triple_store}")
             log.info(res.exception)
-        if isinstance(res, SpecSkipped):
-            log.info(f"{Fore.YELLOW}Skipped {res.spec_uri} {res.triple_store}")
+        if isinstance(res, SpecInvalid):
+            log.info(f"{Fore.YELLOW}Invalid {res.spec_uri} {res.triple_store}")
             log.info(res.message)
 
 

{mustrd-0.3.3 → mustrd-0.3.4a1}/mustrd/mustrdTestPlugin.py

@@ -2,7 +2,7 @@ import logging
 from dataclasses import dataclass
 import pytest
 import os
-from pathlib import Path, PosixPath
+from pathlib import Path
 from rdflib.namespace import Namespace
 from rdflib import Graph, RDF
 from pytest import Session
@@ -11,20 +11,16 @@ from mustrd import logger_setup
 from mustrd.TestResult import ResultList, TestResult, get_result_list
 from mustrd.utils import get_mustrd_root
 from mustrd.mustrd import (
-    write_result_diff_to_log,
-    get_triple_store_graph,
-    get_triple_stores,
-)
-from mustrd.mustrd import (
-    Specification,
-    SpecSkipped,
     validate_specs,
     get_specs,
     SpecPassed,
     run_spec,
+    write_result_diff_to_log,
+    get_triple_store_graph,
+    get_triple_stores,
+    SpecInvalid
 )
 from mustrd.namespace import MUST, TRIPLESTORE, MUSTRDTEST
-from typing import Union
 from pyshacl import validate
 
 import pathlib
@@ -171,13 +167,6 @@ class TestConfig:
     filter_on_tripleStore: str = None
 
 
-@dataclass(frozen=True)
-class TestParamWrapper:
-    id: str
-    test_config: TestConfig
-    unit_test: Union[Specification, SpecSkipped]
-
-
 # Configure logging
 logger = logger_setup.setup_logger(__name__)
 
@@ -187,7 +176,6 @@ class MustrdTestPlugin:
     test_config_file: Path
     selected_tests: list
     secrets: str
-    unit_tests: Union[Specification, SpecSkipped]
     items: list
     path_filter: str
     collect_error: BaseException
@@ -201,18 +189,17 @@ class MustrdTestPlugin:
     @pytest.hookimpl(tryfirst=True)
     def pytest_collection(self, session):
         logger.info("Starting test collection")
-        
-        self.unit_tests = []
+
         args = session.config.args
-        
+
         # Split args into mustrd and regular pytest args
         mustrd_args = [arg for arg in args if ".mustrd.ttl" in arg]
         pytest_args = [arg for arg in args if arg != os.getcwd() and ".mustrd.ttl" not in arg]
-        
+
         self.selected_tests = list(
             map(
                 lambda arg: Path(arg.split("::")[0]),
-                mustrd_args 
+                mustrd_args
             )
         )
         logger.info(f"selected_tests is: {self.selected_tests}")
@@ -237,7 +224,7 @@ class MustrdTestPlugin:
 
     def get_file_name_from_arg(self, arg):
         if arg and len(arg) > 0 and "[" in arg and ".mustrd.ttl " in arg:
-            return arg[arg.index("[") + 1 : arg.index(".mustrd.ttl ")]
+            return arg[arg.index("[") + 1: arg.index(".mustrd.ttl ")]
         return None
 
     @pytest.hookimpl
@@ -247,9 +234,9 @@ class MustrdTestPlugin:
         if not str(path).endswith('.ttl'):
             return None
         if Path(path).resolve() != Path(self.test_config_file).resolve():
-                logger.debug(f"{self.test_config_file}: Skipping non-matching-config file: {path}")
-                return None
-        
+            logger.debug(f"{self.test_config_file}: Skipping non-matching-config file: {path}")
+            return None
+
         mustrd_file = MustrdFile.from_parent(parent, path=pathlib.Path(path), mustrd_plugin=self)
         mustrd_file.mustrd_plugin = self
         return mustrd_file
@@ -264,7 +251,7 @@ class MustrdTestPlugin:
         logger.debug("Generating tests for config: " + str(config))
         logger.debug(f"selected_tests {self.selected_tests}")
 
-        valid_spec_uris, spec_graph, invalid_spec_results = validate_specs(
+        valid_spec_uris, spec_graph, invalid_specs = validate_specs(
             config,
             triple_stores,
             shacl_graph,
@@ -272,17 +259,6 @@ class MustrdTestPlugin:
             file_name or "*",
             selected_test_files=self.selected_tests,
         )
-        # Convert invalid specs to SpecInvalid instead of SpecSkipped
-        invalid_specs = [
-            SpecInvalid(
-                spec.spec_uri,
-                spec.triple_store,
-                spec.message,
-                spec.spec_file_name,
-                spec.spec_source_file
-            ) for spec in invalid_spec_results
-        ]
-
 
         specs, skipped_spec_results = get_specs(
             valid_spec_uris, spec_graph, triple_stores, config
@@ -291,18 +267,6 @@ class MustrdTestPlugin:
         # Return normal specs + skipped results
         return specs + skipped_spec_results + invalid_specs
 
-    # Function called to generate the name of the test
-    def get_test_name(self, spec):
-        # FIXME: SpecSkipped should have the same structure?
-        if isinstance(spec, SpecSkipped):
-            triple_store = spec.triple_store
-        else:
-            triple_store = spec.triple_store["type"]
-
-        triple_store_name = triple_store.replace("https://mustrd.com/model/", "")
-        test_name = spec.spec_uri.replace(spnamespace, "").replace("_", " ")
-        return spec.spec_file_name + " : " + triple_store_name + ": " + test_name
-
     # Get triple store configuration or default
     def get_triple_stores_from_file(self, test_config):
         if test_config.triplestore_spec_path:
@@ -397,13 +361,6 @@ class MustrdTestPlugin:
         with open(self.md_path, "w") as file:
             file.write(md)
 
-@dataclass(frozen=True)
-class SpecInvalid:
-    spec_uri: str
-    triple_store: str
-    message: str
-    spec_file_name: str = None
-    spec_source_file: Path = None
 
 class MustrdFile(pytest.File):
     mustrd_plugin: MustrdTestPlugin
@@ -417,14 +374,14 @@ class MustrdFile(pytest.File):
         try:
             logger.info(f"{self.mustrd_plugin.test_config_file}: Collecting tests from file: {self.path=}")
             # Only process the specific mustrd config file we were given
-            
+
             # if not str(self.fspath).endswith(".ttl"):
             #     return []
             # Only process the specific mustrd config file we were given
             # if str(self.fspath) != str(self.mustrd_plugin.test_config_file):
             #     logger.info(f"Skipping non-config file: {self.fspath}")
             #     return []
-                
+
             test_configs = parse_config(self.path)
             from collections import defaultdict
             pytest_path_grouped = defaultdict(list)
@@ -435,7 +392,7 @@ class MustrdFile(pytest.File):
                 ):
                     logger.info(f"Skipping test config due to path filter: {test_config.pytest_path=} {self.mustrd_plugin.path_filter=}")
                     continue
-                
+
                 triple_stores = self.mustrd_plugin.get_triple_stores_from_file(test_config)
                 try:
                     specs = self.mustrd_plugin.generate_tests_for_config(
@@ -521,7 +478,7 @@ class MustrdItem(pytest.Item):
             f"Error: \n{excinfo.value}\n"
             f"Traceback:\n{tb_str}"
         )
-    
+
     def reportinfo(self):
         r = "", 0, f"mustrd test: {self.name}"
         return r
@@ -531,9 +488,6 @@ class MustrdItem(pytest.Item):
 def run_test_spec(test_spec):
     logger = logging.getLogger("mustrd.test")
     logger.info(f"Running test spec: {getattr(test_spec, 'spec_uri', test_spec)}")
-    if isinstance(test_spec, SpecSkipped):
-        logger.warning(f"Test skipped: {test_spec.message}")
-        pytest.skip(f"Invalid configuration, error : {test_spec.message}")
     try:
         result = run_spec(test_spec)
         logger.info(f"Result type: {type(result)} for spec: {getattr(test_spec, 'spec_uri', test_spec)}")
@@ -544,13 +498,11 @@ def run_test_spec(test_spec):
 
     if isinstance(test_spec, SpecInvalid):
         logger.error(f"Invalid test specification: {test_spec.message} {test_spec}")
-        raise ValueError(f"Invalid test specification: {test_spec.message} {test_spec}")
-    if type(result) == SpecSkipped:
-        logger.warning("Test skipped due to unsupported configuration")
-        pytest.skip("Unsupported configuration")
-    if type(result) != SpecPassed:
+        pytest.fail(f"Invalid test specification: {test_spec.message} {test_spec}")
+    if not isinstance(result, SpecPassed):
         write_result_diff_to_log(result, logger.info)
         log_lines = []
+
         def log_to_string(message):
             log_lines.append(message)
         try:
@@ -562,4 +514,4 @@ def run_test_spec(test_spec):
         raise AssertionError("Test failed: " + "\n".join(log_lines))
 
     logger.info(f"Test PASSED: {getattr(test_spec, 'spec_uri', test_spec)}")
-    return type(result) == SpecPassed
+    return isinstance(result, SpecPassed)

{mustrd-0.3.3 → mustrd-0.3.4a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mustrd"
-version = "0.3.3"
+version = "0.3.4a1"
 description = "A Spec By Example framework for RDF and SPARQL, Inspired by Cucumber."
 authors = [
     { name = "John Placek", email = "john.placek@semanticpartners.com" },