Merge pull request diffblue#287 from diffblue/bugfix/test_failures_do_to_refactoring_utility_functions

!!! IMPORTANT!!! Bugfix: test failures due to refactoring utility functions

Author: marek-trtik

regression/end_to_end/interprocedural01/test_interprocedural01.py

@@ -1,10 +1,11 @@
 import regression.end_to_end.driver as pipeline_executor
 import os
 import subprocess
+import regression.utils as utils
 
 
 def test_interprocedural01():
-    with pipeline_executor.working_dir(os.path.abspath(os.path.dirname(__file__))):
+    with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call("ant")
     traces = pipeline_executor.run_security_analyser_pipeline(
         os.path.join("dist", "interprocedural01.jar"),

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

@@ -2,11 +2,12 @@
 import os.path
 import pytest
 import subprocess
+import regression.utils as utils
 
 
 @pytest.mark.xfail
 def test_taint_crossing_substr_and_concatenation():
-    with pipeline_executor.working_dir(os.path.abspath(os.path.dirname(__file__))):
+    with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call("ant")
     traces = pipeline_executor.run_security_analyser_pipeline(
         "dist/concat.jar",

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

@@ -1,10 +1,11 @@
 import regression.end_to_end.driver as pipeline_executor
 import os.path
 import subprocess
+import regression.utils as utils
 
 
 def test_tainted_string():
-    with pipeline_executor.working_dir(os.path.abspath(os.path.dirname(__file__))):
+    with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call("ant")
     traces = pipeline_executor.run_security_analyser_pipeline(
         "dist/test.jar",