From e9f5ff1dde0e28bbdf2b5919af1ac3bf646866f4 Mon Sep 17 00:00:00 2001 From: Patrick Totzke Date: Mon, 27 May 2019 18:50:39 +0100 Subject: tests: move test for utils.ensure_unique_address --- tests/commands/test_thread.py | 25 ------------------------- tests/db/test_utils.py | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 25 deletions(-) (limited to 'tests') diff --git a/tests/commands/test_thread.py b/tests/commands/test_thread.py index 634c35e8..46d20ac7 100644 --- a/tests/commands/test_thread.py +++ b/tests/commands/test_thread.py @@ -20,31 +20,6 @@ from alot.account import Account # pylint: disable=blacklisted-name -class Test_ensure_unique_address(unittest.TestCase): - - foo = 'foo ' - foo2 = 'foo the fanzy ' - bar = 'bar ' - baz = 'baz ' - - def test_unique_lists_are_unchanged(self): - expected = sorted([self.foo, self.bar]) - actual = thread.ReplyCommand.ensure_unique_address(expected) - self.assertListEqual(actual, expected) - - def test_equal_entries_are_detected(self): - actual = thread.ReplyCommand.ensure_unique_address( - [self.foo, self.bar, self.foo]) - expected = sorted([self.foo, self.bar]) - self.assertListEqual(actual, expected) - - def test_same_address_with_different_name_is_detected(self): - actual = thread.ReplyCommand.ensure_unique_address( - [self.foo, self.foo2]) - expected = [self.foo2] - self.assertListEqual(actual, expected) - - class _AccountTestClass(Account): """Implements stubs for ABC methods.""" diff --git a/tests/db/test_utils.py b/tests/db/test_utils.py index 1e230aef..a27bee51 100644 --- a/tests/db/test_utils.py +++ b/tests/db/test_utils.py @@ -777,3 +777,30 @@ class TestRemoveCte(unittest.TestCase): logmsg = 'DEBUG:root:failed to interpret Content-Transfer-Encoding: '\ '"normal"' self.assertIn(logmsg, cm.output) + + +class Test_ensure_unique_address(unittest.TestCase): + + foo = 'foo ' + foo2 = 'foo the fanzy ' + bar = 'bar ' + baz = 'baz ' + + def test_unique_lists_are_unchanged(self): + expected = sorted([self.foo, self.bar]) + actual = utils.ensure_unique_address(expected) + self.assertListEqual(actual, expected) + + def test_equal_entries_are_detected(self): + actual = utils.ensure_unique_address( + [self.foo, self.bar, self.foo]) + expected = sorted([self.foo, self.bar]) + self.assertListEqual(actual, expected) + + def test_same_address_with_different_name_is_detected(self): + actual = utils.ensure_unique_address( + [self.foo, self.foo2]) + expected = [self.foo2] + self.assertListEqual(actual, expected) + + -- cgit v1.2.3