Merge pull request diffblue#406 from diffblue/making_checks_of_end_to_end_regressions_tests_more_precise

Making checks in end-to-end regression tests more precise.

Author: marek-trtik

regression/end_to_end/general001/test_general001.py

@@ -13,5 +13,5 @@ def test_general001():
             "taint_traces_01_rules.json",
             os.path.realpath(os.path.dirname(__file__)),
             "Main.bar") as traces:
-        assert traces.count_traces() > 0
+        assert traces.count_traces() == 1
         assert traces.trace_exists("java::Main.bug:(I)V", 84)

regression/end_to_end/general004/test_general004.py

@@ -13,7 +13,7 @@ def test_general004():
             "taint_traces_04_rules.json",
             os.path.realpath(os.path.dirname(__file__)),
             "Main.start") as traces:
-        assert traces.count_traces() > 0
+        assert traces.count_traces() == 3
         assert traces.trace_exists("java::Main.baz0:()V", 19)
         assert traces.trace_exists("java::Main.baz1:()V", 26)
         assert traces.trace_exists("java::Main.baz2:(LOther;)V", 32)

regression/end_to_end/general005/test_general005.py

@@ -13,5 +13,5 @@ def test_general005():
             "taint_traces_05_rules.json",
             os.path.realpath(os.path.dirname(__file__)),
             "AssignmentAction.doUpload_all") as traces:
-        assert traces.count_traces() > 0
+        assert traces.count_traces() == 1
         assert traces.trace_exists("java::DummyAssignmentSubmissionEdit.setSubmittedText:(Ljava/lang/String;)V", 3)

regression/end_to_end/general006/test_general006.py

@@ -15,7 +15,7 @@ def test_general006():
             "taint_traces_06_rules.json",
             os.path.realpath(os.path.dirname(__file__)),
             "taint_test.test.doGet") as traces:
-        assert traces.count_traces() > 0
+        assert traces.count_traces() == 2
         assert traces.trace_exists(
             "java::taint_test.test.doGet:(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V",
             165)

regression/end_to_end/general007/test_general007.py

@@ -13,6 +13,6 @@ def test_general007():
             "taint_traces_07_rules.json",
             os.path.realpath(os.path.dirname(__file__)),
             "training07.test.doGet") as traces:
-        assert traces.count_traces() > 0
+        assert traces.count_traces() == 1
         assert traces.trace_exists(
             "java::training07.test.doGet:(Ltraining07/HttpServletRequest;Ltraining07/HttpServletResponse;)V", 109)

regression/end_to_end/tainted-array-type/test_tainted_array_type.py

@@ -13,5 +13,5 @@ def test_user_class():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "test.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::test.main:(I)V", 16)

regression/end_to_end/tainted-integers/test_tainted_integers.py

@@ -13,7 +13,7 @@ def test_tainted_integers_taint_flows_inwards():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "flow_in.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::flow_in.checker:(I)V", 5)
 
 
@@ -25,7 +25,7 @@ def test_tainted_integers_taint_flows_outwards():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "flow_out.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::flow_out.main:(I)V", 21)
 
 
@@ -37,7 +37,7 @@ def test_tainted_integers_single_function():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "single_function.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::single_function.main:(I)V", 13)
 
 
@@ -49,7 +49,7 @@ def test_tainted_integers_taint_stored_in_array():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "stored_in_array.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::stored_in_array.main:(I)V", 16)
 
 
@@ -61,7 +61,7 @@ def test_tainted_integers_taint_stored_in_fields():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "stored_in_fields.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::stored_in_fields.main:(I)V", 18)
 
 
@@ -73,7 +73,7 @@ def test_tainted_integers_dependent_taint():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "dependent_taint.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::dependent_taint.main:(I)V", 15)
     assert not traces.trace_exists("java::dependent_taint.main:(I)V", 18)
 
@@ -86,5 +86,5 @@ def test_tainted_integers_dependent_taint_in_summary():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
          "dependent_taint_in_summary.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::dependent_taint_in_summary.main:()V", 11)

regression/end_to_end/tainted-string-type-concat/test_tainted_string_type_concat.py

@@ -13,6 +13,6 @@ def test_taint_crossing_substr_and_concatenation():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "concat.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert not traces.trace_exists("java::concat.main:(I)V", 18)
     assert traces.trace_exists("java::concat.main:(I)V", 20)

regression/end_to_end/tainted-string-type/test_tainted_string_type.py

@@ -12,5 +12,5 @@ def test_tainted_string():
         "rules.json",
         os.path.realpath(os.path.dirname(__file__)),
         "test.main")
-    assert traces.count_traces() > 0
+    assert traces.count_traces() == 1
     assert traces.trace_exists("java::test.main:(I)V", 16)