Make the tests compatible with pytest (#323)

* make multi model row count use pytest rather than unittest * fix arg count test * run1psub0 * add param sweep * add test runs not zero * add policy aggregation * add import nb * add timestep1psub0 * add empty cadCAD exp test --------- Co-authored-by: Emanuel Lima <[email protected]>
cadCAD-org · Dec 15, 2023 · ec70d5d · ec70d5d
1 parent 5241edf
commit ec70d5d
Show file tree

Hide file tree

Showing 18 changed files with 289 additions and 243 deletions.
diff --git a/testing/results_comparison.py b/testing/results_comparison.py
@@ -2,7 +2,22 @@
 import pandas as pd # type: ignore
 from tabulate import tabulate # type: ignore
 from pandas._testing import assert_frame_equal # type: ignore
-
+from testing.utils import assertEqual
+
+def compare_results_pytest(result_diff):
+    val_error_status_ind = False not in result_diff.val_error_status.tolist()
+    type_error_status_ind = False not in result_diff.type_error_status.tolist()
+    df_out = None
+    erroneous_indexes = None
+    select_result_diff = None
+
+    if (val_error_status_ind is False) or (type_error_status_ind is False):
+        erroneous_indexes = list(result_diff.index[result_diff["val_error_status"] == False])
+        select_result_diff = result_diff.iloc[erroneous_indexes]
+        df_out = tabulate(select_result_diff, headers='keys', tablefmt='psql')
+
+    assertEqual(val_error_status_ind, True, "Value Error")
+    assertEqual(type_error_status_ind, True, "Type Error")
 
 def compare_results(result_diff):
     class CompareResults(unittest.TestCase):

diff --git a/testing/tests/cadCAD_exp.py b/testing/tests/cadCAD_exp.py
diff --git a/testing/tests/import_cadCAD_test.py b/testing/tests/import_cadCAD_test.py
diff --git a/testing/tests/multi_model_row_count.py b/testing/tests/multi_model_row_count.py
diff --git a/testing/tests/param_sweep.py b/testing/tests/param_sweep.py
diff --git a/testing/tests/policy_aggregation.py b/testing/tests/policy_aggregation.py
diff --git a/testing/tests/run1psub0.py b/testing/tests/run1psub0.py
diff --git a/testing/tests/runs_not_zero.py b/testing/tests/runs_not_zero.py
diff --git a/testing/tests/test_cadCAD_exp.py b/testing/tests/test_cadCAD_exp.py
@@ -0,0 +1,22 @@
+import pandas as pd
+from tabulate import tabulate
+from testing.results_comparison import dataframe_difference, compare_results_pytest
+from cadCAD import configs
+from cadCAD.engine import ExecutionMode, ExecutionContext, Executor
+import pytest
+
+
+@pytest.fixture
+def empty_experiment():
+    exec_mode = ExecutionMode()
+    exec_ctx = ExecutionContext(context=exec_mode.local_mode)
+    run = Executor(exec_context=exec_ctx, configs=configs)
+    raw_result, _, _ = run.execute()
+
+    result_df = pd.DataFrame(raw_result)
+    expected_df = pd.read_pickle("expected_results/param_sweep_4.pkl")
+    return dataframe_difference(result_df, expected_df)
+
+
+def test_experiment(empty_experiment):
+    compare_results_pytest(empty_experiment)
diff --git a/testing/tests/test_import_cadCAD_test.py b/testing/tests/test_import_cadCAD_test.py
@@ -0,0 +1,10 @@
+import os, subprocess, json
+from testing.utils import assertEqual
+
+def test_jupyter_nbconvert_row_count():
+    command = f'jupyter nbconvert --to=notebook --ExecutePreprocessor.enabled=True {os.getcwd()}/testing/tests/import_cadCAD.ipynb'
+    process = subprocess.Popen(command.split(), stdout=subprocess.PIPE)
+    process.communicate()
+    json_path = f'{os.getcwd()}/testing/tests/cadCAD_memory_address.json'
+    memory_address = json.load(open(json_path))['memory_address']
+    assertEqual(type(memory_address) == str, True, "cadCAD is not importable by jupyter server")