sflkit 0.2.7__tar.gz → 0.2.9__tar.gz

{sflkit-0.2.7/src/SFLKit.egg-info → sflkit-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sflkit
-Version: 0.2.7
+Version: 0.2.9
 Summary: SFLKit: : A Workbench for Statistical Fault Localization
 Home-page: https://github.com/uds-se/sflkit
 Author: Marius Smytzek & Andreas Zeller

{sflkit-0.2.7 → sflkit-0.2.9}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sflkit"
-version = "0.2.7"
+version = "0.2.9"
 authors = [
     { name = "Marius Smytzek", email = "marius.smytzek@cispa.de" },
 ]
@@ -27,6 +27,9 @@ classifiers = [
 "Homepage" = "https://github.com/uds-se/sflkit/"
 "Bug Tracker" = "https://github.com/uds-se/sflkit/issues"
 
+[project.scripts]
+sflkit = "sflkit.cli:main"
+
 [tool.black]
 line-length = 88
 target-version = ['py310']

{sflkit-0.2.7 → sflkit-0.2.9/src/SFLKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sflkit
-Version: 0.2.7
+Version: 0.2.9
 Summary: SFLKit: : A Workbench for Statistical Fault Localization
 Home-page: https://github.com/uds-se/sflkit
 Author: Marius Smytzek & Andreas Zeller

{sflkit-0.2.7 → sflkit-0.2.9}/src/sflkit/__init__.py

@@ -6,7 +6,7 @@ from sflkit.analysis.predicate import Predicate
 from sflkit.config import Config, parse_config
 from sflkit.instrumentation.dir_instrumentation import DirInstrumentation
 
-__version__ = "0.2.7"
+__version__ = "0.2.9"
 
 
 def instrument_config(conf: Config, event_dump: str = None):

{sflkit-0.2.7 → sflkit-0.2.9}/src/sflkit/language/python/factory.py

@@ -839,7 +839,9 @@ class ConditionEventFactory(PythonEventFactory):
         return Injection(pre=[var_assign], assign=var_use, events=events)
 
     def visit_While(self, node: While) -> Injection:
-        return self.visit_condition(node)
+        injection = self.visit_condition(node)
+        injection.body_last = injection.pre
+        return injection
 
     def visit_If(self, node: If) -> Injection:
         return self.visit_condition(node)

{sflkit-0.2.7 → sflkit-0.2.9}/src/sflkit/runners/run.py

@@ -91,7 +91,11 @@ class PytestTree:
     def parse(self, output: str, directory: Path = None):
         current_level = 0
         current_node = None
+        root_dir = Path.cwd() if directory is None else directory
+        directory = None if directory is None else directory.absolute()
         for line in output.split("\n"):
+            if line.startswith("rootdir: ") and directory is not None:
+                root_dir = Path(line.replace("rootdir: ", "")).absolute()
             match = PYTEST_COLLECT_PATTERN.search(line)
             if match:
                 level = self._count_spaces(line) // 2
@@ -99,11 +103,11 @@ class PytestTree:
                 if match.group("kind") == "Package":
                     node_class = Package
                     if directory:
-                        name = os.path.relpath(name, directory)
+                        name = str((root_dir / name).relative_to(directory))
                 elif match.group("kind") == "Module":
                     node_class = Module
                     if directory:
-                        name = os.path.relpath(name, directory)
+                        name = str((root_dir / name).relative_to(directory))
                 elif match.group("kind") in ("Class", "UnitTestCase"):
                     node_class = Class
                 elif match.group("kind") in ("Function", "TestCaseFunction"):

{sflkit-0.2.7 → sflkit-0.2.9}/tests/test_suggestions.py

@@ -168,7 +168,6 @@ class SuggestionsFromPredicatesTypesTest(BaseTest):
 
 class SuggestionsFromPredicatesTest3(BaseTest):
     def _analyze_tests(self, analysis, relevant, irrelevant):
-
         return self.run_analysis(
             self.TEST_SPECIAL_VALUES,
             "def",
@@ -262,3 +261,26 @@ class SuggestionsFromPredicatesLoopTest(BaseTest):
         self.assertEqual(2, len(suggestions[0].lines))
         self.assertIn(Location("main.py", 7), suggestions[0].lines)
         self.assertIn(Location("main.py", 8), suggestions[0].lines)
+
+
+class SuggestionsFromConditionsLoopTest(BaseTest):
+    @classmethod
+    def setUpClass(cls):
+        cls.analyzer = cls.run_analysis(
+            cls.TEST_LOOP,
+            "",
+            "condition",
+            relevant=[["00"]],
+            irrelevant=[["z"], ["123"]],
+        )
+        cls.original_dir = os.path.join(cls.TEST_RESOURCES, cls.TEST_LOOP)
+
+    def test_loop_suggestions(self):
+        suggestions = self.analyzer.get_sorted_suggestions(
+            base_dir=self.original_dir,
+            type_=AnalysisType.CONDITION,
+            metric=Spectrum.Tarantula,
+        )
+        self.assertAlmostEqual(0.5, suggestions[0].suspiciousness, delta=self.DELTA)
+        self.assertEqual(1, len(suggestions[0].lines))
+        self.assertIn(Location("main.py", 7), suggestions[0].lines)