Fixed more unit tests

Author: andrecsilva

tests/codemods/defectdojo/semgrep/test_avoid_insecure_deserialization.py

@@ -62,7 +62,6 @@ def test_pickle_load(self, adds_dependency, tmpdir):
 
         result = fickling.load("data")
         """
-
         findings = {
             "results": [
                 {
@@ -100,6 +99,31 @@ def test_pickle_and_yaml(self, adds_dependency, tmpdir):
         result = fickling.load("data")
         result = yaml.load("data", Loader=yaml.SafeLoader)
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -1,6 +1,6 @@
+ 
+-import pickle
+ import yaml
++import fickling
+ 
+-result = pickle.load("data")
++result = fickling.load("data")
+ result = yaml.load("data")
+""",
+            """\
+--- 
++++ 
+@@ -3,4 +3,4 @@
+ import yaml
+ 
+ result = pickle.load("data")
+-result = yaml.load("data")
++result = yaml.load("data", Loader=yaml.SafeLoader)
+""",
+        ]
 
         findings = {
             "results": [
@@ -122,18 +146,19 @@ def test_pickle_and_yaml(self, adds_dependency, tmpdir):
             tmpdir,
             input_code,
             expected,
+            expected_diff_per_change,
             results=json.dumps(findings),
             num_changes=2,
         )
         adds_dependency.assert_called_once_with(Fickling)
 
         assert changes is not None
         assert changes[0].changes[0].fixedFindings is not None
-        assert changes[0].changes[0].fixedFindings[0].id == "4"
+        assert changes[0].changes[0].fixedFindings[0].id == "3"
         assert changes[0].changes[0].fixedFindings[0].rule.id == RULE_ID
-        assert changes[0].changes[1].fixedFindings is not None
-        assert changes[0].changes[1].fixedFindings[0].id == "3"
-        assert changes[0].changes[1].fixedFindings[0].rule.id == RULE_ID
+        assert changes[1].changes[0].fixedFindings is not None
+        assert changes[1].changes[0].fixedFindings[0].id == "4"
+        assert changes[1].changes[0].fixedFindings[0].rule.id == RULE_ID
 
     @mock.patch("codemodder.codemods.api.FileContext.add_dependency")
     def test_pickle_loads(self, adds_dependency, tmpdir):

tests/codemods/sonar/test_sonar_enable_jinja2_autoescape.py

@@ -24,6 +24,29 @@ def test_simple(self, tmpdir):
         env = Environment(autoescape=True)
         env = Environment(autoescape=True)
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -1,4 +1,4 @@
+ 
+ from jinja2 import Environment
+-env = Environment()
++env = Environment(autoescape=True)
+ env = Environment(autoescape=False)
+""",
+            """\
+--- 
++++ 
+@@ -1,4 +1,4 @@
+ 
+ from jinja2 import Environment
+ env = Environment()
+-env = Environment(autoescape=False)
++env = Environment(autoescape=True)
+""",
+        ]
+
         hotspots = {
             "hotspots": [
                 {
@@ -54,6 +77,7 @@ def test_simple(self, tmpdir):
             tmpdir,
             input_code,
             expected_output,
+            expected_diff_per_change,
             results=json.dumps(hotspots),
             num_changes=2,
         )

tests/codemods/sonar/test_sonar_secure_cookie.py

@@ -34,6 +34,55 @@ def test_simple(self, tmpdir):
         var = "hello"
         response2.set_cookie("name", "value", secure=True, httponly=True, samesite='Lax')
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -3,7 +3,7 @@
+ 
+ response = flask.make_response()
+ var = "hello"
+-response.set_cookie("name", "value")
++response.set_cookie("name", "value", secure=True, httponly=True, samesite='Lax')
+ 
+ response2 = flask.Response()
+ var = "hello"
+""",
+            """\
+--- 
++++ 
+@@ -7,4 +7,4 @@
+ 
+ response2 = flask.Response()
+ var = "hello"
+-response2.set_cookie("name", "value")
++response2.set_cookie("name", "value", secure=True, httponly=True, samesite='Lax')
+""",
+            """\
+--- 
++++ 
+@@ -3,7 +3,7 @@
+ 
+ response = flask.make_response()
+ var = "hello"
+-response.set_cookie("name", "value")
++response.set_cookie("name", "value", secure=True, httponly=True, samesite='Lax')
+ 
+ response2 = flask.Response()
+ var = "hello"
+""",
+            """\
+--- 
++++ 
+@@ -7,4 +7,4 @@
+ 
+ response2 = flask.Response()
+ var = "hello"
+-response2.set_cookie("name", "value")
++response2.set_cookie("name", "value", secure=True, httponly=True, samesite='Lax')
+""",
+        ]
+
         issues = {
             "hotspots": [
                 {
@@ -83,5 +132,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=4,
         )

tests/codemods/sonar/test_sonar_secure_random.py

@@ -26,6 +26,48 @@ def test_simple(self, tmpdir):
         secrets.SystemRandom().randint(0, 9)
         secrets.SystemRandom().random()
         """
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -1,6 +1,7 @@
+ 
+ import random
++import secrets
+ 
+-random.getrandbits(1)
++secrets.SystemRandom().getrandbits(1)
+ random.randint(0, 9)
+ random.random()
+""",
+            """\
+--- 
++++ 
+@@ -1,6 +1,7 @@
+ 
+ import random
++import secrets
+ 
+ random.getrandbits(1)
+-random.randint(0, 9)
++secrets.SystemRandom().randint(0, 9)
+ random.random()
+""",
+            """\
+--- 
++++ 
+@@ -1,6 +1,7 @@
+ 
+ import random
++import secrets
+ 
+ random.getrandbits(1)
+ random.randint(0, 9)
+-random.random()
++secrets.SystemRandom().random()
+""",
+        ]
+
         hotspots = {
             "hotspots": [
                 {
@@ -67,6 +109,7 @@ def test_simple(self, tmpdir):
             tmpdir,
             input_code,
             expected_output,
+            expected_diff_per_change,
             results=json.dumps(hotspots),
             num_changes=3,
         )

tests/codemods/test_fix_hasattr_call.py

@@ -37,7 +37,75 @@ class Test:
         if callable(obj):
             print(1)
         """
-        self.run_and_assert(tmpdir, input_code, expected, num_changes=5)
+        expected_diff_per_change = [
+            """\
+--- 
++++ 
+@@ -2,7 +2,7 @@
+ class Test:
+     pass
+ 
+-hasattr(Test(), "__call__")
++callable(Test())
+ hasattr("hi", '__call__')
+ 
+ assert hasattr(1, '__call__')
+""",
+            """\
+--- 
++++ 
+@@ -3,7 +3,7 @@
+     pass
+ 
+ hasattr(Test(), "__call__")
+-hasattr("hi", '__call__')
++callable("hi")
+ 
+ assert hasattr(1, '__call__')
+ obj = Test()
+""",
+            """\
+--- 
++++ 
+@@ -5,7 +5,7 @@
+ hasattr(Test(), "__call__")
+ hasattr("hi", '__call__')
+ 
+-assert hasattr(1, '__call__')
++assert callable(1)
+ obj = Test()
+ var = hasattr(obj, "__call__")
+ 
+""",
+            """\
+--- 
++++ 
+@@ -7,7 +7,7 @@
+ 
+ assert hasattr(1, '__call__')
+ obj = Test()
+-var = hasattr(obj, "__call__")
++var = callable(obj)
+ 
+ if hasattr(obj, "__call__"):
+     print(1)
+""",
+            """\
+--- 
++++ 
+@@ -9,5 +9,5 @@
+ obj = Test()
+ var = hasattr(obj, "__call__")
+ 
+-if hasattr(obj, "__call__"):
++if callable(obj):
+     print(1)
+""",
+        ]
+
+        self.run_and_assert(
+            tmpdir, input_code, expected, expected_diff_per_change, num_changes=5
+        )
 
     def test_other_hasattr(self, tmpdir):
         code = """