diff --git a/jass/test/test_plots.py b/jass/test/test_plots.py index 7748ccbabb60dfe47cb3a3e260d4af3fda9fd3c3..86a2d59557b19d208006555bde07475193c02e27 100644 --- a/jass/test/test_plots.py +++ b/jass/test/test_plots.py @@ -13,7 +13,7 @@ from . import JassTestCase class TestPlots(JassTestCase): - test_folder = "data_test1" + test_folder = "data_real" def setUp(self): # Create a temporary directory diff --git a/jass/test/test_worktable.py b/jass/test/test_worktable.py index 20e076584a74cfddfc6883aef7cce9c5088ccb5d..8509e2056c7d773d114c6d26a5f54bab1f86b523 100644 --- a/jass/test/test_worktable.py +++ b/jass/test/test_worktable.py @@ -21,7 +21,7 @@ class TestWorkTable(object): cls.test_dir = tempfile.mkdtemp() init_file_path = cls.get_file_path_fn("initTable.hdf5") cls.result_hdf_path = os.path.join(cls.test_dir, "test_worktable.hdf5") - cls.expected_hdf_path = cls.get_file_path_fn("worktable.hdf5") + cls.expected_hdf_path = cls.get_file_path_fn(f"worktable{'-nonans' if cls.remove_nan else '-withnans'}.hdf5") # with coerce_pickle_protocol(4): create_worktable_file( cls.phenotypes_sel, init_file_path, cls.result_hdf_path, cls.remove_nan @@ -84,21 +84,16 @@ class TestWorkTable(object): ) -phenotypes_disney = ["z_DISNEY_POCAHONT", "z_DISNEY_RATATOUY"] -phenotypes_cars = [ - "z_BMW_ISETTA", - "z_BMW_MINI", - "z_FIAT_CINQCENT", - "z_FIAT_CINQUECENTO", - "z_MERCO_SMART", - "z_TATA_TATANANO", +phenotypes_real = [ + "z_MAGIC_FAST-GLUCOSE", + "z_MAGIC_FAST-INSULIN", + "z_MAGIC_GLUCOSE-TOLERANCE", + "z_MAGIC_HBA1C", ] params = [ - ("nonans", "data_test1", phenotypes_disney, True), - ("withnans", "data_test2", phenotypes_cars, False), - # ("nonans", "data_test1_37", phenotypes_disney, True), - # ("withnans", "data_test2_37", phenotypes_cars, False), + ("nonans", "data_real", phenotypes_real, True), + ("withnans", "data_real", phenotypes_real, False), ] for name, param, phenotypes_sel, remove_nan in params: