fixed conditions for while loop

Author: smythi93

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sflkit"
-version = "0.2.8"
+version = "0.2.9"
 authors = [
     { name = "Marius Smytzek", email = "marius.smytzek@cispa.de" },
 ]

src/sflkit/__init__.py

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

src/sflkit/language/python/factory.py

@@ -839,7 +839,9 @@ def visit_condition(self, node: typing.Union[If, While]) -> Injection:
         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)

tests/test_suggestions.py

@@ -168,7 +168,6 @@ def test_return_suggestions(self):
 
 class SuggestionsFromPredicatesTest3(BaseTest):
     def _analyze_tests(self, analysis, relevant, irrelevant):
-
         return self.run_analysis(
             self.TEST_SPECIAL_VALUES,
             "def",
@@ -262,3 +261,26 @@ def test_loop_suggestions(self):
         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)