Fixed more unit tests

Author: andrecsilva

src/codemodder/codemods/test/utils.py

@@ -94,7 +94,9 @@ def run_and_assert(
             assert not changes
             return
 
-        self.assert_num_changes(changes, num_changes, min_num_changes)
+        self.assert_num_changes(
+            changes, num_changes, expected_diff_per_change, min_num_changes
+        )
 
         self.assert_changes(
             tmpdir,
@@ -106,16 +108,25 @@ def run_and_assert(
             changes,
         )
 
-    def assert_num_changes(self, changes, expected_num_changes, min_num_changes):
+    def assert_num_changes(
+        self, changes, expected_num_changes, expected_diff_per_change, min_num_changes
+    ):
         print("expected_diff_per_change = [")
         for c in changes:
             print('"""\\')
-            print(c.diff.replace("\t", "    "), end="")
+            diff_lines = c.diff.replace("\t", "    ").splitlines()
+            for line in diff_lines:
+                print(line)
             print('""",')
         print("]")
-        assert len(changes) == expected_num_changes
+        if expected_diff_per_change:
+            assert len(changes) == expected_num_changes
+            actual_num = len(changes)
+        else:
+            assert len(changes[0].changes) == expected_num_changes
+            actual_num = len(changes[0].changes)
 
-        actual_num = len(changes)
+        # actual_num = len(changes)
 
         if min_num_changes is not None:
             assert (
@@ -142,7 +153,7 @@ def assert_changes(
         assert all(c.description for change in changes for c in change.changes)
 
         # assert each change individually
-        if num_changes > 1:
+        if expected_diff_per_change and num_changes > 1:
             assert num_changes == len(expected_diff_per_change)
             for change, diff in zip(changes, expected_diff_per_change):
                 print(change.diff)
@@ -248,7 +259,9 @@ def run_and_assert(
             assert not changes
             return
 
-        self.assert_num_changes(changes, num_changes, min_num_changes)
+        self.assert_num_changes(
+            changes, num_changes, expected_diff_per_change, min_num_changes
+        )
 
         self.assert_findings(changes)
 

tests/codemods/semgrep/test_semgrep_nan_injection.py

@@ -65,6 +65,7 @@ def home(request):
             tmpdir,
             input_code,
             expected_output,
+            num_changes=4,
             results=json.dumps(results),
         )
 
@@ -107,6 +108,68 @@ def view(request):
             else:
                 return [1, 2, float(tid), 3]
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -2,7 +2,10 @@
+     tid = request.POST.get("tid")
+     some_list = [1, 2, 3, float('nan')]
+ 
+-    float(tid) in some_list
++    if tid.lower() == "nan":
++        raise ValueError
++    else:
++        float(tid) in some_list
+ 
+     z = [1, 2, complex(tid), 3]
+ 
+""",
+            """\
+--- 
++++ 
+@@ -4,7 +4,10 @@
+ 
+     float(tid) in some_list
+ 
+-    z = [1, 2, complex(tid), 3]
++    if tid.lower() == "nan":
++        raise ValueError
++    else:
++        z = [1, 2, complex(tid), 3]
+ 
+     x = [float(tid), 1.0, 2.0]
+ 
+""",
+            """\
+--- 
++++ 
+@@ -6,6 +6,9 @@
+ 
+     z = [1, 2, complex(tid), 3]
+ 
+-    x = [float(tid), 1.0, 2.0]
++    if tid.lower() == "nan":
++        raise ValueError
++    else:
++        x = [float(tid), 1.0, 2.0]
+ 
+     return [1, 2, float(tid), 3]
+""",
+            """\
+--- 
++++ 
+@@ -8,4 +8,7 @@
+ 
+     x = [float(tid), 1.0, 2.0]
+ 
+-    return [1, 2, float(tid), 3]
++    if tid.lower() == "nan":
++        raise ValueError
++    else:
++        return [1, 2, float(tid), 3]
+""",
+        ]
 
         results = {
             "runs": [
@@ -224,6 +287,8 @@ def view(request):
             tmpdir,
             input_code,
             expected_output,
+            expected_diff_per_change,
+            num_changes=4,
             results=json.dumps(results),
         )
 
@@ -281,6 +346,7 @@ def view(request):
             tmpdir,
             input_code,
             expected_output,
+            num_changes=4,
             results=json.dumps(results),
         )
 
@@ -337,6 +403,7 @@ def view(request):
             tmpdir,
             input_code,
             expected_output,
+            num_changes=4,
             results=json.dumps(results),
         )
 
@@ -391,6 +458,7 @@ def view(request):
             tmpdir,
             input_code,
             expected_output,
+            num_changes=4,
             results=json.dumps(results),
         )
 
@@ -447,6 +515,7 @@ def view(request):
             tmpdir,
             input_code,
             expected_output,
+            num_changes=4,
             results=json.dumps(results),
         )
 

tests/codemods/sonar/test_sonar_django_receiver_on_top.py

@@ -13,8 +13,8 @@ def test_name(self):
 
     def assert_findings(self, changes):
         # For now we can only link the finding to the line with the receiver decorator
-        assert changes[0].fixedFindings
-        assert not changes[1].fixedFindings
+        assert changes[0].changes[0].fixedFindings
+        assert not changes[0].changes[1].fixedFindings
 
     def test_simple(self, tmpdir):
         input_code = """

tests/codemods/sonar/test_sonar_fix_assert_tuple.py

@@ -13,9 +13,9 @@ def test_name(self):
 
     def assert_findings(self, changes):
         # For now we can only link the finding to the first line changed
-        assert changes[0].fixedFindings
-        assert not changes[1].fixedFindings
-        assert not changes[2].fixedFindings
+        assert changes[0].changes[0].fixedFindings
+        assert not changes[0].changes[1].fixedFindings
+        assert not changes[0].changes[2].fixedFindings
 
     def test_simple(self, tmpdir):
         input_code = """

tests/codemods/sonar/test_sonar_timezone_aware_datetime.py

@@ -4,7 +4,7 @@
 from core_codemods.sonar.sonar_timezone_aware_datetime import SonarTimezoneAwareDatetime
 
 
-class TestSonarSQLParameterization(BaseSASTCodemodTest):
+class TestSonarTimezoneAwareDatetime(BaseSASTCodemodTest):
     codemod = SonarTimezoneAwareDatetime
     tool = "sonar"
 
@@ -26,6 +26,30 @@ def test_simple(self, tmpdir):
         timestamp = 1571595618.0
         datetime.datetime.fromtimestamp(timestamp, tz=datetime.timezone.utc)
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -1,5 +1,5 @@
+ import datetime
+ 
+-datetime.datetime.utcnow()
++datetime.datetime.now(tz=datetime.timezone.utc)
+ timestamp = 1571595618.0
+ datetime.datetime.utcfromtimestamp(timestamp)
+""",
+            """\
+--- 
++++ 
+@@ -2,4 +2,4 @@
+ 
+ datetime.datetime.utcnow()
+ timestamp = 1571595618.0
+-datetime.datetime.utcfromtimestamp(timestamp)
++datetime.datetime.fromtimestamp(timestamp, tz=datetime.timezone.utc)
+""",
+        ]
+
         issues = {
             "issues": [
                 {
@@ -60,5 +84,10 @@ def test_simple(self, tmpdir):
             ]
         }
         self.run_and_assert(
-            tmpdir, input_code, expected, results=json.dumps(issues), num_changes=2
+            tmpdir,
+            input_code,
+            expected,
+            expected_diff_per_change,
+            results=json.dumps(issues),
+            num_changes=2,
         )