Commit 13f4c238 authored by David Hendriks's avatar David Hendriks
Browse files

fixed failing tests

parent 4025e3c9
Loading
Loading
Loading
Loading
+105 −14
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ class test_event_file_processing(unittest.TestCase):
            event_based_logging_SN=1,
            event_based_logging_RLOF=1,
            event_based_logging_handle_output=True,
            event_based_logging_output_directory=os.path.join(TMP_DIR, "events"),
            event_based_logging_combine_individual_event_files=False,
            event_based_logging_remove_individual_event_files_after_combining=False,
            event_based_logging_split_events_file_to_each_type=False,
@@ -334,15 +335,47 @@ class test_event_file_processing(unittest.TestCase):
        source_file_sampling_pop.evolve()

        # Test if there are 2 files
        self.assertTrue(os.path.isfile(os.path.join(data_dir, "events-0.dat")))
        self.assertTrue(os.path.isfile(os.path.join(data_dir, "events-1.dat")))
        self.assertTrue(
            os.path.isfile(
                os.path.join(
                    source_file_sampling_pop.population_options[
                        "event_based_logging_output_directory"
                    ],
                    "events-0.dat",
                )
            )
        )
        self.assertTrue(
            os.path.isfile(
                os.path.join(
                    source_file_sampling_pop.population_options[
                        "event_based_logging_output_directory"
                    ],
                    "events-1.dat",
                )
            )
        )

        # Test if neither of them is empty
        with open(os.path.join(data_dir, "events-0.dat")) as f:
        with open(
            os.path.join(
                source_file_sampling_pop.population_options[
                    "event_based_logging_output_directory"
                ],
                "events-0.dat",
            )
        ) as f:
            content = f.read()
            self.assertTrue(len(content) > 0)

        with open(os.path.join(data_dir, "events-1.dat")) as f:
        with open(
            os.path.join(
                source_file_sampling_pop.population_options[
                    "event_based_logging_output_directory"
                ],
                "events-1.dat",
            )
        ) as f:
            content = f.read()
            self.assertTrue(len(content) > 0)

@@ -350,7 +383,14 @@ class test_event_file_processing(unittest.TestCase):
        # Test if in the files there are 3 unique events but individually only 1.
        all_events_list = []
        for file in ["events-0.dat", "events-1.dat"]:
            with open(os.path.join(data_dir, file)) as f:
            with open(
                os.path.join(
                    source_file_sampling_pop.population_options[
                        "event_based_logging_output_directory"
                    ],
                    file,
                )
            ) as f:
                for line in f:
                    all_events_list.append(line.strip())

@@ -402,6 +442,7 @@ class test_event_file_processing(unittest.TestCase):
            event_based_logging_SN=1,
            event_based_logging_RLOF=1,
            event_based_logging_handle_output=True,
            event_based_logging_output_directory=os.path.join(TMP_DIR, "events"),
            event_based_logging_combine_individual_event_files=True,
            event_based_logging_remove_individual_event_files_after_combining=True,
            event_based_logging_split_events_file_to_each_type=False,
@@ -411,7 +452,9 @@ class test_event_file_processing(unittest.TestCase):
        source_file_sampling_pop.evolve()

        combined_event_file_name = os.path.join(
            data_dir,
            source_file_sampling_pop.population_options[
                "event_based_logging_output_directory"
            ],
            source_file_sampling_pop.population_options[
                "event_based_logging_combined_events_filename"
            ],
@@ -421,8 +464,26 @@ class test_event_file_processing(unittest.TestCase):
        self.assertTrue(os.path.isfile(combined_event_file_name))

        # Test that the individual files are not there
        self.assertFalse(os.path.isfile(os.path.join(data_dir, "events-0.dat")))
        self.assertFalse(os.path.isfile(os.path.join(data_dir, "events-1.dat")))
        self.assertFalse(
            os.path.isfile(
                os.path.join(
                    source_file_sampling_pop.population_options[
                        "event_based_logging_output_directory"
                    ],
                    "events-0.dat",
                )
            )
        )
        self.assertFalse(
            os.path.isfile(
                os.path.join(
                    source_file_sampling_pop.population_options[
                        "event_based_logging_output_directory"
                    ],
                    "events-1.dat",
                )
            )
        )

        # Test if neither of them is empty
        with open(combined_event_file_name) as f:
@@ -484,6 +545,7 @@ class test_event_file_processing(unittest.TestCase):
            event_based_logging_SN=1,
            event_based_logging_RLOF=1,
            event_based_logging_handle_output=True,
            event_based_logging_output_directory=os.path.join(TMP_DIR, "events"),
            event_based_logging_combine_individual_event_files=True,
            event_based_logging_remove_individual_event_files_after_combining=True,
            event_based_logging_split_events_file_to_each_type=True,
@@ -492,27 +554,56 @@ class test_event_file_processing(unittest.TestCase):

        source_file_sampling_pop.evolve()
        combined_event_file_name = os.path.join(
            data_dir,
            source_file_sampling_pop.population_options[
                "event_based_logging_output_directory"
            ],
            source_file_sampling_pop.population_options[
                "event_based_logging_combined_events_filename"
            ],
        )

        # Test that the individual files are not there
        self.assertFalse(os.path.isfile(os.path.join(data_dir, "events-0.dat")))
        self.assertFalse(os.path.isfile(os.path.join(data_dir, "events-1.dat")))
        self.assertFalse(
            os.path.isfile(
                os.path.join(
                    source_file_sampling_pop.population_options[
                        "event_based_logging_output_directory"
                    ],
                    "events-0.dat",
                )
            )
        )
        self.assertFalse(
            os.path.isfile(
                os.path.join(
                    source_file_sampling_pop.population_options[
                        "event_based_logging_output_directory"
                    ],
                    "events-1.dat",
                )
            )
        )
        self.assertFalse(os.path.isfile(combined_event_file_name))

        # Test that the per-event-type files exist:
        content_data_dir = os.listdir(data_dir)
        content_event_dir = os.listdir(
            source_file_sampling_pop.population_options[
                "event_based_logging_output_directory"
            ]
        )
        event_type_files = [
            filename for filename in content_data_dir if filename.startswith("total_")
            filename for filename in content_event_dir if filename.startswith("total_")
        ]
        self.assertTrue(len(event_type_files) == 3)

        # test the content of each of the files:
        for event_type_file in event_type_files:
            full_path_event_type_file = os.path.join(data_dir, event_type_file)
            full_path_event_type_file = os.path.join(
                source_file_sampling_pop.population_options[
                    "event_based_logging_output_directory"
                ],
                event_type_file,
            )

            # open file and check contents
            with open(full_path_event_type_file) as f: