Fixed a few more tests

Author: andrecsilva

src/codemodder/codemods/test/utils.py

@@ -164,9 +164,9 @@ def assert_changes(
                 dedent(expected).splitlines(keepends=True),
             )
             try:
-                assert expected_diff == changes.diff
+                assert expected_diff == changes[0].diff
             except AssertionError:
-                raise DiffError(expected_diff, changes.diff)
+                raise DiffError(expected_diff, changes[0].diff)
 
             output_code = file_path.read_bytes().decode("utf-8")
 

tests/codemods/semgrep/test_semgrep_nan_injection.py

@@ -66,7 +66,6 @@ def home(request):
             input_code,
             expected_output,
             results=json.dumps(results),
-            num_changes=4,
         )
 
     def test_multiple(self, tmpdir):
@@ -226,7 +225,6 @@ def view(request):
             input_code,
             expected_output,
             results=json.dumps(results),
-            num_changes=16,
         )
 
     def test_once_nested(self, tmpdir):
@@ -284,7 +282,6 @@ def view(request):
             input_code,
             expected_output,
             results=json.dumps(results),
-            num_changes=4,
         )
 
     def test_twice_nested(self, tmpdir):
@@ -341,7 +338,6 @@ def view(request):
             input_code,
             expected_output,
             results=json.dumps(results),
-            num_changes=4,
         )
 
     def test_direct_source(self, tmpdir):
@@ -396,7 +392,6 @@ def view(request):
             input_code,
             expected_output,
             results=json.dumps(results),
-            num_changes=4,
         )
 
     def test_binop(self, tmpdir):
@@ -453,7 +448,6 @@ def view(request):
             input_code,
             expected_output,
             results=json.dumps(results),
-            num_changes=4,
         )
 
 

tests/codemods/semgrep/test_semgrep_sql_parametrization.py

@@ -46,6 +46,37 @@ def f():
             conn = sqlite3.connect("example")
             conn.cursor().execute(sql, ((user), ))
         '''
+        expected_diff_per_change = [
+            '''\
+--- 
++++ 
+@@ -8,7 +8,7 @@
+ @app.route("/example")
+ def f():
+     user = request.args["user"]
+-    sql = """SELECT user FROM users WHERE user = '%s'"""
++    sql = """SELECT user FROM users WHERE user = ?"""
+ 
+     conn = sqlite3.connect("example")
+-    conn.cursor().execute(sql % (user))
++    conn.cursor().execute(sql, ((user), ))
+''',
+            '''\
+--- 
++++ 
+@@ -8,7 +8,7 @@
+ @app.route("/example")
+ def f():
+     user = request.args["user"]
+-    sql = """SELECT user FROM users WHERE user = '%s'"""
++    sql = """SELECT user FROM users WHERE user = ?"""
+ 
+     conn = sqlite3.connect("example")
+-    conn.cursor().execute(sql % (user))
++    conn.cursor().execute(sql, ((user), ))
+''',
+        ]
+
         results = {
             "runs": [
                 {
@@ -189,12 +220,11 @@ def f():
                 }
             ]
         }
-        changes = self.run_and_assert(
+        self.run_and_assert(
             tmpdir,
             input_code,
             expexted_output,
+            expected_diff_per_change,
             results=json.dumps(results),
-        )
-        assert len(changes[0].changes[0].fixedFindings) == len(
-            results["runs"][0]["results"]
+            num_changes=2,
         )

tests/codemods/test_with_threading_lock.py

@@ -93,7 +93,7 @@ class TestThreadingNameResolution(BaseCodemodTest):
     codemod = WithThreadingLock
 
     @pytest.mark.parametrize(
-        "input_code,expected_code,num_changes",
+        "input_code,expected_code,expected_diff_per_change,num_changes",
         [
             (
                 """
@@ -111,6 +111,7 @@ class TestThreadingNameResolution(BaseCodemodTest):
                 with lock_1:
                     ...
                 """,
+                [],
                 1,
             ),
             (
@@ -127,6 +128,7 @@ class TestThreadingNameResolution(BaseCodemodTest):
                 with lock_1:
                     ...
                 """,
+                [],
                 1,
             ),
             (
@@ -147,6 +149,7 @@ def f(l):
                     with lock_2:
                         return [lock_1 for lock_1 in l]
                 """,
+                [],
                 1,
             ),
             (
@@ -173,25 +176,49 @@ def f(l):
                 with lock_2:
                     print()
                 """,
+                [
+                    """\
+--- 
++++ 
+@@ -1,6 +1,7 @@
+ 
+ import threading
+-with threading.Lock():
++lock = threading.Lock()
++with lock:
+     int("1")
+ with threading.Lock():
+     print()
+""",
+                    """\
+--- 
++++ 
+@@ -2,7 +2,8 @@
+ import threading
+ with threading.Lock():
+     int("1")
+-with threading.Lock():
++lock = threading.Lock()
++with lock:
+     print()
+ var = 1
+ with threading.Lock():
+""",
+                    """\
+--- 
++++ 
+@@ -5,5 +5,6 @@
+ with threading.Lock():
+     print()
+ var = 1
+-with threading.Lock():
++lock = threading.Lock()
++with lock:
+     print()
+""",
+                ],
                 3,
             ),
-            (
-                """
-                import threading
-                with threading.Lock():
-                    with threading.Lock():
-                        print()
-                """,
-                """
-                import threading
-                lock_1 = threading.Lock()
-                with lock_1:
-                    lock = threading.Lock()
-                    with lock:
-                        print()
-                """,
-                2,
-            ),
             (
                 """
                 import threading
@@ -210,9 +237,18 @@ def my_func():
                     with lock_1:
                         foo()
                 """,
+                [],
                 1,
             ),
         ],
     )
-    def test_name_resolution(self, tmpdir, input_code, expected_code, num_changes):
-        self.run_and_assert(tmpdir, input_code, expected_code, num_changes=num_changes)
+    def test_name_resolution(
+        self, tmpdir, input_code, expected_code, expected_diff_per_change, num_changes
+    ):
+        self.run_and_assert(
+            tmpdir,
+            input_code,
+            expected_code,
+            expected_diff_per_change,
+            num_changes=num_changes,
+        )