From 44070db2dda3a655254b260ee525c6ebca323be8 Mon Sep 17 00:00:00 2001 From: dh00601 <dh00601@surrey.ac.uk> Date: Wed, 29 Dec 2021 14:20:34 +0000 Subject: [PATCH] working on the tests now. slowly adding them all again --- binarycpython/tests/main.py | 30 ++++++++++++++---------- binarycpython/tests/test_c_bindings.py | 5 ---- binarycpython/tests/test_useful_funcs.py | 9 ------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/binarycpython/tests/main.py b/binarycpython/tests/main.py index 9725fd0f2..94e785c88 100755 --- a/binarycpython/tests/main.py +++ b/binarycpython/tests/main.py @@ -1,22 +1,28 @@ # /usr/bin/env python """ Main file for the tests. This file imports all the combined_test functions from all files. + +TODO: fix the imports without the wildcard """ import unittest -from binarycpython.tests.test_c_bindings import * -from binarycpython.tests.test_custom_logging import * -from binarycpython.tests.test_distributions import * -from binarycpython.tests.test_functions import * -from binarycpython.tests.test_grid import * -from binarycpython.tests.test_hpc_functions import * -from binarycpython.tests.test_plot_functions import * -from binarycpython.tests.test_run_system_wrapper import * -from binarycpython.tests.test_spacing_functions import * -from binarycpython.tests.test_useful_funcs import * -from binarycpython.tests.test_grid_options_defaults import * -from binarycpython.tests.test_stellar_types import * +from binarycpython.tests.test_c_bindings import ( + test_run_system, + test_return_store_memaddr, + TestEnsemble, +) +# from binarycpython.tests.test_custom_logging import * +# from binarycpython.tests.test_distributions import * +# from binarycpython.tests.test_functions import * +# from binarycpython.tests.test_grid import * +# from binarycpython.tests.test_hpc_functions import * +# from binarycpython.tests.test_plot_functions import * +# from binarycpython.tests.test_run_system_wrapper import * +# from binarycpython.tests.test_spacing_functions import * +# from binarycpython.tests.test_useful_funcs import * +# from binarycpython.tests.test_grid_options_defaults import * +# from binarycpython.tests.test_stellar_types import * if __name__ == "__main__": unittest.main() diff --git a/binarycpython/tests/test_c_bindings.py b/binarycpython/tests/test_c_bindings.py index 2fc163d87..b8ee8e1e5 100644 --- a/binarycpython/tests/test_c_bindings.py +++ b/binarycpython/tests/test_c_bindings.py @@ -119,8 +119,6 @@ class test_run_system(unittest.TestCase): ### memaddr test ####################################################################################################################################################### -# TODO: Make some assertion tests in c - class test_return_store_memaddr(unittest.TestCase): """ @@ -180,9 +178,6 @@ class TestEnsemble(unittest.TestCase): output = _binary_c_bindings.return_persistent_data_memaddr() self.assertTrue(is_capsule(output), msg="Object must be a capsule") - # self.assertNotEqual( - # output, 0, "memory adress seems not to have a correct value" - # ) def test_minimal_ensemble_output(self): with Capturing() as output: diff --git a/binarycpython/tests/test_useful_funcs.py b/binarycpython/tests/test_useful_funcs.py index bbab35f7a..77b4a9e8b 100644 --- a/binarycpython/tests/test_useful_funcs.py +++ b/binarycpython/tests/test_useful_funcs.py @@ -18,15 +18,6 @@ from binarycpython.utils.useful_funcs import ( calc_period_from_sep, ) -# class test_(unittest.TestCase): -# """ -# Unittests for function -# """ - -# def test_1(self): -# pass - - class test_calc_period_from_sep(unittest.TestCase): """ Unittests for function calc_period_from_sep -- GitLab