Fixed test directory sturcture

tests/manipulate_single_hook/decorator/analysis.py

@@ -1,6 +1,5 @@
 from dynapyt.analyses.BaseAnalysis import BaseAnalysis
 
-
 class TestAnalysis(BaseAnalysis):
     def begin_execution(self) -> None:
         print("begin execution")
@@ -10,12 +9,9 @@ def enter_decorator(self, dyn_ast: str, iid: int, decorator: str, args, kwargs)
 
     def exit_decorator(self, dyn_ast: str, iid: int, decorator: str, result, args, kwargs) -> None:
         print("exit decorator: ", decorator)
-
-    def runtime_event(self, dyn_ast: str, iid: int) -> None:
-        print("runtime event")
+        number = 10
+        print("Number returned from exit_decorator: ", number)
+        return number
 
-    def control_flow_event(self, dyn_ast: str, iid: int) -> None:
-        print("control flow event")
-
     def end_execution(self) -> None:
         print("end execution")

tests/manipulate_single_hook/decorator/expected.txt

@@ -1,39 +1,9 @@
 begin execution
-runtime event
-control flow event
-runtime event
-runtime event
-control flow event
-runtime event
-runtime event
-control flow event
-runtime event
-control flow event
 enter decorator:  wrapper
-runtime event
-control flow event
-runtime event
-runtime event
-control flow event
 Decorator function before
-runtime event
-runtime event
-control flow event
-runtime event
-control flow event
-runtime event
-runtime event
-control flow event
-Simple function
-runtime event
-control flow event
-runtime event
-runtime event
-control flow event
+Number returned from function:  2
 Decorator function after
-runtime event
-control flow event
-runtime event
-control flow event
 exit decorator:  wrapper
+Number returned from exit_decorator:  10
+Number returned from decorated function:  10
 end execution

tests/manipulate_single_hook/decorator/program.py

@@ -6,8 +6,12 @@ def wrapper():
     return wrapper
 
 @decorator_function_one
-def simple_function():
-    print("Simple function")
+def return_number():
+    number = 2
+    print("Number returned from function: ", number)
+    return number
+
+result = return_number()
+print("Number returned from decorated function: ", result)
 
-simple_function()
 

tests/trace_single_hook/decorators/decorator_result_modification/analysis.py → tests/trace_single_hook/decorators/decorator_runtime_controlflow/analysis.py

@@ -1,5 +1,6 @@
 from dynapyt.analyses.BaseAnalysis import BaseAnalysis
 
+
 class TestAnalysis(BaseAnalysis):
     def begin_execution(self) -> None:
         print("begin execution")
@@ -9,9 +10,12 @@ def enter_decorator(self, dyn_ast: str, iid: int, decorator: str, args, kwargs)
 
     def exit_decorator(self, dyn_ast: str, iid: int, decorator: str, result, args, kwargs) -> None:
         print("exit decorator: ", decorator)
-        number = 10
-        print("Number returned from exit_decorator: ", number)
-        return number
+
+    def runtime_event(self, dyn_ast: str, iid: int) -> None:
+        print("runtime event")
 
+    def control_flow_event(self, dyn_ast: str, iid: int) -> None:
+        print("control flow event")
+
     def end_execution(self) -> None:
         print("end execution")

tests/trace_single_hook/decorators/decorator_runtime_controlflow/expected.txt

@@ -0,0 +1,39 @@
+begin execution
+runtime event
+control flow event
+runtime event
+runtime event
+control flow event
+runtime event
+runtime event
+control flow event
+runtime event
+control flow event
+enter decorator:  wrapper
+runtime event
+control flow event
+runtime event
+runtime event
+control flow event
+Decorator function before
+runtime event
+runtime event
+control flow event
+runtime event
+control flow event
+runtime event
+runtime event
+control flow event
+Simple function
+runtime event
+control flow event
+runtime event
+runtime event
+control flow event
+Decorator function after
+runtime event
+control flow event
+runtime event
+control flow event
+exit decorator:  wrapper
+end execution

tests/trace_single_hook/decorators/decorator_result_modification/program.py → tests/trace_single_hook/decorators/decorator_runtime_controlflow/program.py

@@ -6,12 +6,8 @@ def wrapper():
     return wrapper
 
 @decorator_function_one
-def return_number():
-    number = 2
-    print("Number returned from function: ", number)
-    return number
-
-result = return_number()
-print("Number returned from decorated function: ", result)
+def simple_function():
+    print("Simple function")
 
+simple_function()