From 9eea42482c84ec79adf0822b3baa9175da079402 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Sat, 28 Mar 2020 23:48:21 +1000 Subject: [PATCH] Coding style. - Cleanup old tests. --- tests/__main___test.py | 70 +++++++---------------- tests/golden-files/initial | 80 +++++++++++++++++++------- tests/golden-files/log-appearance | 20 ------- tests/golden-files/log-initial | 0 tests/golden-files/log-one-message | 1 - tests/golden-files/log-two-messages | 2 - tests/golden-files/window-orientation | 82 ++++++++++++++++++++------- 7 files changed, 140 insertions(+), 115 deletions(-) delete mode 100644 tests/golden-files/log-appearance delete mode 100644 tests/golden-files/log-initial delete mode 100644 tests/golden-files/log-one-message delete mode 100644 tests/golden-files/log-two-messages diff --git a/tests/__main___test.py b/tests/__main___test.py index 3de7d40..1e2dacf 100755 --- a/tests/__main___test.py +++ b/tests/__main___test.py @@ -47,11 +47,13 @@ class ScreenWidgetTestCase(unittest.TestCase): def setUp(self): self.temp_dir = tempfile.mkdtemp() - foo_path = os.path.join(self.temp_dir, "foo.py") + project_dir = os.path.join(self.temp_dir, "project") + os.mkdir(project_dir) + foo_path = os.path.join(project_dir, "foo.py") _touch(foo_path) jobs_added_event = asyncio.Event() appearance_changed_event = asyncio.Event() - summary = __main__.Summary(self.temp_dir, jobs_added_event) + summary = __main__.Summary(project_dir, jobs_added_event) log = __main__.Log(appearance_changed_event) self.main_widget = __main__.Screen( summary, log, appearance_changed_event, _MockMainLoop()) @@ -59,27 +61,28 @@ class ScreenWidgetTestCase(unittest.TestCase): def tearDown(self): shutil.rmtree(self.temp_dir) - # def test_initial_appearance(self): - # _assert_widget_appearance(self.main_widget, "golden-files/initial") + def test_initial_appearance(self): + _assert_widget_appearance(self.main_widget, "golden-files/initial") def test_help_appearance(self): self.main_widget.toggle_help() _assert_widget_appearance(self.main_widget, "golden-files/help") - # def test_log_appearance(self): - # log_shown = _widget_to_string(self.main_widget) - # self.main_widget.toggle_log() - # log_hidden = _widget_to_string(self.main_widget) - # actual = "shown:\n%s\nhidden:\n%s" % (log_shown, log_hidden) - # golden.assertGolden(actual, "golden-files/log") + def test_log_appearance(self): + log_shown = _widget_to_string(self.main_widget) + self.main_widget.toggle_log() + log_hidden = _widget_to_string(self.main_widget) + actual = "shown:\n%s\nhidden:\n%s" % (log_shown, log_hidden) + _assert_widget_appearance(self.main_widget, "golden-files/log") - # def test_window_orientation(self): - # window_left_right = _widget_to_string(self.main_widget) - # self.main_widget.toggle_window_orientation() - # window_top_bottom = _widget_to_string(self.main_widget) - # actual = ("left-right:\n%s\ntop-bottom:\n%s" % - # (window_left_right, window_top_bottom)) - # golden.assertGolden(actual, "golden-files/window-orientation") + def test_window_orientation(self): + window_left_right = _widget_to_string(self.main_widget) + self.main_widget.toggle_window_orientation() + window_top_bottom = _widget_to_string(self.main_widget) + actual = ("left-right:\n%s\ntop-bottom:\n%s" % + (window_left_right, window_top_bottom)) + _assert_widget_appearance(self.main_widget, + "golden-files/window-orientation") class SummaryCursorTest(unittest.TestCase): @@ -182,23 +185,6 @@ class SummarySyncWithFilesystemTestCase(unittest.TestCase): self._assert_summary_invariants() self.assertTrue(self.jobs_added_event.is_set()) - # def test_sync_changed_file_metadata(self): - # ids_before = [id(entry) for entry in self.summary._column] - # time.sleep(1) - # _touch(self.foo_path) - # self.summary.sync_with_filesystem() - # ids_after = [id(entry) for entry in self.summary._column] - # self.assertTrue(ids_before[0] == ids_after[0]) # bar - # self.assertTrue(ids_before[1] != ids_after[1]) # foo - # self.assertTrue(self.jobs_added_event.is_set()) - - # def test_sync_same_objects(self): - # ids_before = [id(entry) for entry in self.summary._column] - # self.summary.sync_with_filesystem() - # ids_after = [id(entry) for entry in self.summary._column] - # self.assertTrue(ids_before == ids_after) - # self.assertFalse(self.jobs_added_event.is_set()) - def test_sync_linked_files(self): """Symbolic and hard-linked files are given distinct entry objects.""" baz_path = os.path.join(self.temp_dir, "baz") @@ -214,22 +200,6 @@ class SummarySyncWithFilesystemTestCase(unittest.TestCase): self.assertTrue(self.jobs_added_event.is_set()) -# class LogTestCase(unittest.TestCase): - -# def test_log(self): -# appearance_changed_event = asyncio.Event() -# log = __main__.Log(appearance_changed_event) -# _assert_widget_appearance(log, "golden-files/log-initial", None) -# timestamp = "11:11:11" -# self.assertFalse(appearance_changed_event.is_set()) -# log.log_message("foo", timestamp=timestamp) -# self.assertTrue(appearance_changed_event.is_set()) -# _assert_widget_appearance(log, "golden-files/log-one-message", None) -# log.log_message("bar", timestamp=timestamp) -# _assert_widget_appearance(log, "golden-files/log-two-messages", None) -# _assert_widget_appearance(log, "golden-files/log-appearance") - - def _mount_total(): with open("/proc/mounts") as proc_mounts: return len(proc_mounts.readlines()) diff --git a/tests/golden-files/initial b/tests/golden-files/initial index 1fd6156..25d13b2 100644 --- a/tests/golden-files/initial +++ b/tests/golden-files/initial @@ -1,20 +1,60 @@ -(B┌──── Summary ─────┐┌ foo.py ─── (Bmetada(B┐ -│(B. (B. . . . .(B││? │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -│(B (B ││ │ -└──────────────────┘│ │ -┌── Activity log ──┐│ │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -│ ││ │ -└──────────────────┘└──────────────────┘ \ No newline at end of file +┏━━━━━━━━━━━━━━ Summary of project ━━━━━━━━━━━━━━┓┌────────────────────────────────────────────────┐ +┃ ┃│Nothing selected │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛│ │ +┌───────────────────── Log ──────────────────────┐│ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +│ ││ │ +└────────────────────────────────────────────────┘└────────────────────────────────────────────────┘ + help quit tab:focus orient log edit next sort refresh fullscreen xdg-open  \ No newline at end of file diff --git a/tests/golden-files/log-appearance b/tests/golden-files/log-appearance deleted file mode 100644 index 6232d54..0000000 --- a/tests/golden-files/log-appearance +++ /dev/null @@ -1,20 +0,0 @@ -11:11:11(B foo -11:11:11(B bar - - - - - - - - - - - - - - - - - -  \ No newline at end of file diff --git a/tests/golden-files/log-initial b/tests/golden-files/log-initial deleted file mode 100644 index e69de29..0000000 diff --git a/tests/golden-files/log-one-message b/tests/golden-files/log-one-message deleted file mode 100644 index 7d2bb87..0000000 --- a/tests/golden-files/log-one-message +++ /dev/null @@ -1 +0,0 @@ -11:11:11 foo \ No newline at end of file diff --git a/tests/golden-files/log-two-messages b/tests/golden-files/log-two-messages deleted file mode 100644 index 103120e..0000000 --- a/tests/golden-files/log-two-messages +++ /dev/null @@ -1,2 +0,0 @@ -11:11:11 foo -11:11:11 bar \ No newline at end of file diff --git a/tests/golden-files/window-orientation b/tests/golden-files/window-orientation index cf98215..e084c5d 100644 --- a/tests/golden-files/window-orientation +++ b/tests/golden-files/window-orientation @@ -1,22 +1,60 @@ -left-right: -(B┌───────────── Summa┌──────────────────┐ -│(B. (B. . . . . (B│ │ -└───────────────────│ │ -┌┐ │ │ -└┘ │ │ - │ │ - │ │ - │ │ - │ │ - └──────────────────┘ -top-bottom: -(B┌───────────── Summary ─────────────┐┌┐ -│(B. (B. . . . . . . . . . . . . (B│└┘ -└───────────────────────────────────┘ -┌──┐ -│ │ -└──┘ - - - -  \ No newline at end of file +┏━━━━━━━━━━━━━━ Summary of project ━━━━━━━━━━━━━━┓┌───────────────────── Log ──────────────────────┐ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┃ ┃│ │ +┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛└────────────────────────────────────────────────┘ +┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ +│Nothing selected │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +└──────────────────────────────────────────────────────────────────────────────────────────────────┘ + help quit tab:focus orient log edit next sort refresh fullscreen xdg-open  \ No newline at end of file