Fixed a few more unit tests

Author: andrecsilva

src/codemodder/codemods/base_visitor.py

@@ -58,6 +58,21 @@ def node_is_selected(self, node) -> bool:
             pos_to_match
         )
 
+    def node_is_selected_by_line_only(self, node) -> bool:
+        pos_to_match = self.node_position(node)
+        return self.filter_by_result_line_only(
+            pos_to_match
+        ) and self.filter_by_path_includes_or_excludes(pos_to_match)
+
+    def filter_by_result_line_only(self, pos_to_match) -> bool:
+        # Codemods with detectors will only run their transformations if there are results.
+        return self.results is None or any(
+            pos_to_match.start.line >= location.start.line
+            and pos_to_match.end.line <= location.end.line
+            for r in self.results
+            for location in r.locations
+        )
+
     def node_position(self, node):
         # See https://github.com/Instagram/LibCST/blob/main/libcst/_metadata_dependent.py#L112
         match node:

src/codemodder/codemods/test/utils.py

@@ -8,7 +8,7 @@
 
 from codemodder import registry
 from codemodder.codemods.api import BaseCodemod
-from codemodder.codetf import Change
+from codemodder.codetf.v2.codetf import ChangeSet
 from codemodder.context import CodemodExecutionContext
 from codemodder.diff import create_diff
 from codemodder.providers import load_providers
@@ -107,10 +107,12 @@ def run_and_assert(
         )
 
     def assert_num_changes(self, changes, expected_num_changes, min_num_changes):
-        print(len(changes))
-        print(changes)
+        print("expected_diff_per_change = [")
         for c in changes:
-            print(c.diff)
+            print('"""\\')
+            print(c.diff.replace("\t", "    "), end="")
+            print('""",')
+        print("]")
         assert len(changes) == expected_num_changes
 
         actual_num = len(changes)
@@ -248,7 +250,7 @@ def run_and_assert(
 
         self.assert_num_changes(changes, num_changes, min_num_changes)
 
-        self.assert_findings(changes[0].changes)
+        self.assert_findings(changes)
 
         self.assert_changes(
             tmpdir,
@@ -262,7 +264,7 @@ def run_and_assert(
 
         return changes
 
-    def assert_findings(self, changes: list[Change]):
+    def assert_findings(self, changes: list[ChangeSet]):
         assert all(
-            x.fixedFindings for x in changes
+            c.fixedFindings for a in changes for c in a.changes
         ), f"Expected all changes to have findings: {changes}"

src/core_codemods/semgrep/semgrep_no_csrf_exempt.py

@@ -26,14 +26,15 @@ def leave_Decorator(
             self.node_position(original_node)
         ):
             return updated_node
-
-        if (
-            self.find_base_name(original_node.decorator)
-            == "django.views.decorators.csrf.csrf_exempt"
-        ):
-            self.report_change(original_node)
-            return cst.RemovalSentinel.REMOVE
-        return original_node
+        # Due to semgrep's odd way of reporting the position for this (decorators + functiondef), we match by line only
+        if self.node_is_selected_by_line_only(original_node):
+            if (
+                self.find_base_name(original_node.decorator)
+                == "django.views.decorators.csrf.csrf_exempt"
+            ):
+                self.report_change(original_node)
+                return cst.RemovalSentinel.REMOVE
+        return updated_node
 
 
 SemgrepNoCsrfExempt = SemgrepCodemod(

tests/codemods/semgrep/test_semgrep_no_csrf_exempt.py

@@ -48,7 +48,31 @@ def ssrf_code_checker(request):
         def foo():
             pass
         """
-
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -3,7 +3,6 @@
+ from django.dispatch import receiver
+ from django.core.signals import request_finished
+ 
+-@csrf_exempt
+ def ssrf_code_checker(request):
+     if request.user.is_authenticated:
+         if request.method == 'POST':
+""",
+            """\
+--- 
++++ 
+@@ -12,6 +12,5 @@
+ 
+ 
+ @receiver(request_finished)
+-@csrf_exempt
+ def foo():
+     pass
+""",
+        ]
         results = {
             "runs": [
                 {
@@ -113,6 +137,7 @@ def foo():
             tmpdir,
             input_code,
             expected_output,
+            expected_diff_per_change,
             results=json.dumps(results),
             num_changes=2,
         )

tests/codemods/sonar/test_sonar_fix_missing_self_or_cls.py

@@ -30,6 +30,32 @@ def instance_method(self):
             def class_method(cls):
                 pass
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -1,6 +1,6 @@
+ 
+ class A:
+-    def instance_method():
++    def instance_method(self):
+         pass
+ 
+     @classmethod
+""",
+            """\
+--- 
++++ 
+@@ -4,5 +4,5 @@
+         pass
+ 
+     @classmethod
+-    def class_method():
++    def class_method(cls):
+         pass
+""",
+        ]
+
         issues = {
             "issues": [
                 {
@@ -60,6 +86,7 @@ def class_method(cls):
             tmpdir,
             input_code,
             expected_output,
+            expected_diff_per_change,
             results=json.dumps(issues),
             num_changes=2,
         )

tests/codemods/sonar/test_sonar_invert_boolean_check.py

@@ -20,6 +20,27 @@ def test_simple(self, tmpdir):
         if a != 2:
             b = i >= 10
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -1,3 +1,3 @@
+ 
+-if not a == 2:
++if a != 2:
+     b = not i < 10
+""",
+            """\
+--- 
++++ 
+@@ -1,3 +1,3 @@
+ 
+ if not a == 2:
+-    b = not i < 10
++    b = i >= 10
+""",
+        ]
+
         issues = {
             "issues": [
                 {
@@ -50,6 +71,7 @@ def test_simple(self, tmpdir):
             tmpdir,
             input_code,
             expected_output,
+            expected_diff_per_change,
             results=json.dumps(issues),
             num_changes=2,
         )