feat: updated test structure

Author: lukasrothenberger

test/end_to_end/do_all/backwards_array_access/test.py

@@ -12,7 +12,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -44,19 +44,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
 
-    def validate_results(self, test_dir, src_dir):
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
+
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/LULESH_proxy/test.py

@@ -14,7 +14,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -46,19 +46,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
+        
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)        
 
-    def validate_results(self, test_dir, src_dir):
+    def test(self):
         """Check that main loop do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/above_nesting_level_3/test.py

@@ -12,7 +12,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -44,19 +44,17 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
 
-    def validate_results(self, test_dir, src_dir):
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
+
+
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/allowing/test.py

@@ -12,7 +12,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -44,19 +44,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
+        
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
 
-    def validate_results(self, test_dir, src_dir):
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/allowing_2/test.py

@@ -12,7 +12,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -44,19 +44,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
+        
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
 
-    def validate_results(self, test_dir, src_dir):
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/complex/test.py

@@ -14,7 +14,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -45,19 +45,16 @@ def test(self):
         # execute DiscoPoP analysis
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, os.path.join(src_dir, ".discopop"), env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
+        
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)        
 
-    def validate_results(self, test_dir, src_dir):
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/preventing/simple/test.py

@@ -13,7 +13,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -47,19 +47,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
 
-    def validate_results(self, test_dir, src_dir):
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
+
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/second_order/allowing/test.py

@@ -12,7 +12,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -44,19 +44,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
 
-    def validate_results(self, test_dir, src_dir):
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
+
+    def validate_results(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/second_order/allowing_2/test.py

@@ -12,7 +12,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -44,19 +44,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
 
-    def validate_results(self, test_dir, src_dir):
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
+
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()

test/end_to_end/do_all/calls/second_order/preventing/test.py

@@ -13,7 +13,7 @@
 
 
 class TestMethods(unittest.TestCase):
-    def test(self):
+    def setUp(self):
         current_dir = pathlib.Path(__file__).parent.resolve()
         dp_build_dir = run_config_provider(
             ConfigProviderArguments(
@@ -47,19 +47,16 @@ def test(self):
         cwd = os.path.join(src_dir, ".discopop")
         cmd = "discopop_explorer --enable-patterns doall,reduction"
         run_cmd(cmd, cwd, env_vars)
-        # validate results
-        try:
-            self.validate_results(current_dir, src_dir)
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-        except Exception as ex:
-            # clean environment
-            run_cmd("make veryclean", src_dir, env_vars)
-            raise ex
 
-    def validate_results(self, test_dir, src_dir):
+        self.src_dir = src_dir
+        self.env_vars = env_vars
+
+    def tearDown(self):
+        run_cmd("make veryclean", self.src_dir, self.env_vars)
+
+    def test(self):
         """Check that exactly one do-all is suggested"""
-        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
+        test_output_file = os.path.join(self.src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load detection results
         with open(test_output_file, "r") as f:
             tmp_str = f.read()