Merge pull request diffblue#426 from diffblue/smowton/admin/test-use-with-statements

Tainted integer tests: use with-statements

Author: smowton

regression/end_to_end/tainted-integers/test_tainted_integers.py

@@ -10,89 +10,89 @@
 def test_tainted_integers_taint_flows_inwards():
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["ant", "compile1"])
-    traces = run_security_analyser_pipeline(
-        "build_flow_in",
-        "rules.json",
-        os.path.realpath(os.path.dirname(__file__)),
-        "flow_in.main")
-    assert traces.count_traces() == 1
-    assert traces.trace_exists("java::flow_in.checker:(I)V", 5)
+    with run_security_analyser_pipeline(
+            "build_flow_in",
+            "rules.json",
+            os.path.realpath(os.path.dirname(__file__)),
+            "flow_in.main") as traces:
+        assert traces.count_traces() == 1
+        assert traces.trace_exists("java::flow_in.checker:(I)V", 5)
 
 
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_taint_flows_outwards():
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["ant", "compile2"])
-    traces = run_security_analyser_pipeline(
-        "build_flow_out",
-        "rules.json",
-        os.path.realpath(os.path.dirname(__file__)),
-        "flow_out.main")
-    assert traces.count_traces() == 1
-    assert traces.trace_exists("java::flow_out.main:(I)V", 21)
+    with run_security_analyser_pipeline(
+            "build_flow_out",
+            "rules.json",
+            os.path.realpath(os.path.dirname(__file__)),
+            "flow_out.main") as traces:
+        assert traces.count_traces() == 1
+        assert traces.trace_exists("java::flow_out.main:(I)V", 21)
 
 
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_single_function():
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["ant", "compile3"])
-    traces = run_security_analyser_pipeline(
-        "build_single_function",
-        "rules.json",
-        os.path.realpath(os.path.dirname(__file__)),
-        "single_function.main")
-    assert traces.count_traces() == 1
-    assert traces.trace_exists("java::single_function.main:(I)V", 13)
+    with run_security_analyser_pipeline(
+            "build_single_function",
+            "rules.json",
+            os.path.realpath(os.path.dirname(__file__)),
+            "single_function.main") as traces:
+        assert traces.count_traces() == 1
+        assert traces.trace_exists("java::single_function.main:(I)V", 13)
 
 
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_taint_stored_in_array():
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["ant", "compile4"])
-    traces = run_security_analyser_pipeline(
-        "build_stored_in_array",
-        "rules.json",
-        os.path.realpath(os.path.dirname(__file__)),
-        "stored_in_array.main")
-    assert traces.count_traces() == 1
-    assert traces.trace_exists("java::stored_in_array.main:(I)V", 16)
+    with run_security_analyser_pipeline(
+            "build_stored_in_array",
+            "rules.json",
+            os.path.realpath(os.path.dirname(__file__)),
+            "stored_in_array.main") as traces:
+        assert traces.count_traces() == 1
+        assert traces.trace_exists("java::stored_in_array.main:(I)V", 16)
 
 
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_taint_stored_in_fields():
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["ant", "compile5"])
-    traces = run_security_analyser_pipeline(
-        "build_stored_in_fields",
-        "rules.json",
-        os.path.realpath(os.path.dirname(__file__)),
-        "stored_in_fields.main")
-    assert traces.count_traces() == 1
-    assert traces.trace_exists("java::stored_in_fields.main:(I)V", 18)
+    with run_security_analyser_pipeline(
+            "build_stored_in_fields",
+            "rules.json",
+            os.path.realpath(os.path.dirname(__file__)),
+            "stored_in_fields.main") as traces:
+        assert traces.count_traces() == 1
+        assert traces.trace_exists("java::stored_in_fields.main:(I)V", 18)
 
 
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_dependent_taint():
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["ant", "compile6"])
-    traces = run_security_analyser_pipeline(
-        "build_dependent_taint",
-        "rules.json",
-        os.path.realpath(os.path.dirname(__file__)),
-        "dependent_taint.main")
-    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)
+    with run_security_analyser_pipeline(
+            "build_dependent_taint",
+            "rules.json",
+            os.path.realpath(os.path.dirname(__file__)),
+            "dependent_taint.main") as traces:
+        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)
 
 
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_dependent_taint_in_summary():
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["ant", "compile7"])
-    traces = run_security_analyser_pipeline(
-        "build_dependent_taint_in_summary",
-        "rules.json",
-        os.path.realpath(os.path.dirname(__file__)),
-         "dependent_taint_in_summary.main")
-    assert traces.count_traces() == 1
-    assert traces.trace_exists("java::dependent_taint_in_summary.main:()V", 11)
+    with run_security_analyser_pipeline(
+            "build_dependent_taint_in_summary",
+            "rules.json",
+            os.path.realpath(os.path.dirname(__file__)),
+            "dependent_taint_in_summary.main") as traces:
+        assert traces.count_traces() == 1
+        assert traces.trace_exists("java::dependent_taint_in_summary.main:()V", 11)