From b3e3e05a028e6ead4db8e700ab26c1013a148cc8 Mon Sep 17 00:00:00 2001 From: lin-hua-cheng Date: Sat, 17 Oct 2015 01:22:21 -0700 Subject: [PATCH] Fix order of assertEqual for unit.patterns First parameter should be the expected value. Change-Id: I06140e4be87663136483d1e7be3bc471fbbbf92b Partial-Bug: #1357117 --- .../tests/unit/patterns/test_graph_flow.py | 63 ++++++++-------- .../tests/unit/patterns/test_linear_flow.py | 71 +++++++++---------- .../unit/patterns/test_unordered_flow.py | 48 ++++++------- 3 files changed, 88 insertions(+), 94 deletions(-) diff --git a/taskflow/tests/unit/patterns/test_graph_flow.py b/taskflow/tests/unit/patterns/test_graph_flow.py index 1d876d56..a1433d98 100644 --- a/taskflow/tests/unit/patterns/test_graph_flow.py +++ b/taskflow/tests/unit/patterns/test_graph_flow.py @@ -30,21 +30,21 @@ class GraphFlowTest(test.TestCase): def test_graph_flow_starts_as_empty(self): f = gf.Flow('test') - self.assertEqual(len(f), 0) - self.assertEqual(list(f), []) - self.assertEqual(list(f.iter_links()), []) + self.assertEqual(0, len(f)) + self.assertEqual([], list(f)) + self.assertEqual([], list(f.iter_links())) - self.assertEqual(f.requires, set()) - self.assertEqual(f.provides, set()) + self.assertEqual(set(), f.requires) + self.assertEqual(set(), f.provides) expected = 'taskflow.patterns.graph_flow.Flow: test(len=0)' - self.assertEqual(str(f), expected) + self.assertEqual(expected, str(f)) def test_graph_flow_add_nothing(self): f = gf.Flow('test') result = f.add() self.assertIs(f, result) - self.assertEqual(len(f), 0) + self.assertEqual(0, len(f)) def test_graph_flow_one_task(self): f = gf.Flow('test') @@ -53,45 +53,43 @@ class GraphFlowTest(test.TestCase): self.assertIs(f, result) - self.assertEqual(len(f), 1) - self.assertEqual(list(f), [task]) - self.assertEqual(list(f.iter_links()), []) - self.assertEqual(f.requires, set(['a', 'b'])) - self.assertEqual(f.provides, set(['c', 'd'])) + self.assertEqual(1, len(f)) + self.assertEqual([task], list(f)) + self.assertEqual([], list(f.iter_links())) + self.assertEqual(set(['a', 'b']), f.requires) + self.assertEqual(set(['c', 'd']), f.provides) def test_graph_flow_two_independent_tasks(self): task1 = _task(name='task1') task2 = _task(name='task2') f = gf.Flow('test').add(task1, task2) - self.assertEqual(len(f), 2) + self.assertEqual(2, len(f)) self.assertItemsEqual(f, [task1, task2]) - self.assertEqual(list(f.iter_links()), []) + self.assertEqual([], list(f.iter_links())) def test_graph_flow_two_dependent_tasks(self): task1 = _task(name='task1', provides=['a']) task2 = _task(name='task2', requires=['a']) f = gf.Flow('test').add(task1, task2) - self.assertEqual(len(f), 2) + self.assertEqual(2, len(f)) self.assertItemsEqual(f, [task1, task2]) - self.assertEqual(list(f.iter_links()), [ - (task1, task2, {'reasons': set(['a'])}) - ]) + self.assertEqual([(task1, task2, {'reasons': set(['a'])})], + list(f.iter_links())) - self.assertEqual(f.requires, set()) - self.assertEqual(f.provides, set(['a'])) + self.assertEqual(set(), f.requires) + self.assertEqual(set(['a']), f.provides) def test_graph_flow_two_dependent_tasks_two_different_calls(self): task1 = _task(name='task1', provides=['a']) task2 = _task(name='task2', requires=['a']) f = gf.Flow('test').add(task1).add(task2) - self.assertEqual(len(f), 2) + self.assertEqual(2, len(f)) self.assertItemsEqual(f, [task1, task2]) - self.assertEqual(list(f.iter_links()), [ - (task1, task2, {'reasons': set(['a'])}) - ]) + self.assertEqual([(task1, task2, {'reasons': set(['a'])})], + list(f.iter_links())) def test_graph_flow_two_task_same_provide(self): task1 = _task(name='task1', provides=['a', 'b']) @@ -136,10 +134,10 @@ class GraphFlowTest(test.TestCase): ret = retry.AlwaysRevert(requires=['a'], provides=['b']) f = gf.Flow('test', ret) self.assertIs(f.retry, ret) - self.assertEqual(ret.name, 'test_retry') + self.assertEqual('test_retry', ret.name) - self.assertEqual(f.requires, set(['a'])) - self.assertEqual(f.provides, set(['b'])) + self.assertEqual(set(['a']), f.requires) + self.assertEqual(set(['b']), f.provides) def test_graph_flow_ordering(self): task1 = _task('task1', provides=set(['a', 'b'])) @@ -248,7 +246,7 @@ class TargetedGraphFlowTest(test.TestCase): task4 = _task('task4', provides=[], requires=['b']) f.add(task1, task2, task3, task4) f.set_target(task3) - self.assertEqual(len(f), 3) + self.assertEqual(3, len(f)) self.assertItemsEqual(f, [task1, task2, task3]) self.assertNotIn('c', f.provides) @@ -261,7 +259,7 @@ class TargetedGraphFlowTest(test.TestCase): f.add(task1, task2, task3, task4) f.set_target(task3) f.reset_target() - self.assertEqual(len(f), 4) + self.assertEqual(4, len(f)) self.assertItemsEqual(f, [task1, task2, task3, task4]) self.assertIn('c', f.provides) @@ -278,7 +276,7 @@ class TargetedGraphFlowTest(test.TestCase): task1 = _task('task1', provides=['a'], requires=[]) f.add(task1) f.set_target(task1) - self.assertEqual(len(f), 1) + self.assertEqual(1, len(f)) self.assertItemsEqual(f, [task1]) def test_recache_on_add(self): @@ -311,6 +309,5 @@ class TargetedGraphFlowTest(test.TestCase): f.link(task2, task1) self.assertEqual(2, len(f)) - self.assertEqual(list(f.iter_links()), [ - (task2, task1, {'manual': True}) - ]) + self.assertEqual([(task2, task1, {'manual': True})], + list(f.iter_links()), ) diff --git a/taskflow/tests/unit/patterns/test_linear_flow.py b/taskflow/tests/unit/patterns/test_linear_flow.py index 05f4253a..046c8f31 100644 --- a/taskflow/tests/unit/patterns/test_linear_flow.py +++ b/taskflow/tests/unit/patterns/test_linear_flow.py @@ -29,21 +29,21 @@ class LinearFlowTest(test.TestCase): def test_linear_flow_starts_as_empty(self): f = lf.Flow('test') - self.assertEqual(len(f), 0) - self.assertEqual(list(f), []) - self.assertEqual(list(f.iter_links()), []) + self.assertEqual(0, len(f)) + self.assertEqual([], list(f)) + self.assertEqual([], list(f.iter_links())) - self.assertEqual(f.requires, set()) - self.assertEqual(f.provides, set()) + self.assertEqual(set(), f.requires) + self.assertEqual(set(), f.provides) expected = 'taskflow.patterns.linear_flow.Flow: test(len=0)' - self.assertEqual(str(f), expected) + self.assertEqual(expected, str(f)) def test_linear_flow_add_nothing(self): f = lf.Flow('test') result = f.add() self.assertIs(f, result) - self.assertEqual(len(f), 0) + self.assertEqual(0, len(f)) def test_linear_flow_one_task(self): f = lf.Flow('test') @@ -52,47 +52,44 @@ class LinearFlowTest(test.TestCase): self.assertIs(f, result) - self.assertEqual(len(f), 1) - self.assertEqual(list(f), [task]) - self.assertEqual(list(f.iter_links()), []) - self.assertEqual(f.requires, set(['a', 'b'])) - self.assertEqual(f.provides, set(['c', 'd'])) + self.assertEqual(1, len(f)) + self.assertEqual([task], list(f)) + self.assertEqual([], list(f.iter_links())) + self.assertEqual(set(['a', 'b']), f.requires) + self.assertEqual(set(['c', 'd']), f.provides) def test_linear_flow_two_independent_tasks(self): task1 = _task(name='task1') task2 = _task(name='task2') f = lf.Flow('test').add(task1, task2) - self.assertEqual(len(f), 2) - self.assertEqual(list(f), [task1, task2]) - self.assertEqual(list(f.iter_links()), [ - (task1, task2, {'invariant': True}) - ]) + self.assertEqual(2, len(f)) + self.assertEqual([task1, task2], list(f)) + self.assertEqual([(task1, task2, {'invariant': True})], + list(f.iter_links())) def test_linear_flow_two_dependent_tasks(self): task1 = _task(name='task1', provides=['a']) task2 = _task(name='task2', requires=['a']) f = lf.Flow('test').add(task1, task2) - self.assertEqual(len(f), 2) - self.assertEqual(list(f), [task1, task2]) - self.assertEqual(list(f.iter_links()), [ - (task1, task2, {'invariant': True}) - ]) + self.assertEqual(2, len(f)) + self.assertEqual([task1, task2], list(f)) + self.assertEqual([(task1, task2, {'invariant': True})], + list(f.iter_links())) - self.assertEqual(f.requires, set()) - self.assertEqual(f.provides, set(['a'])) + self.assertEqual(set(), f.requires) + self.assertEqual(set(['a']), f.provides) def test_linear_flow_two_dependent_tasks_two_different_calls(self): task1 = _task(name='task1', provides=['a']) task2 = _task(name='task2', requires=['a']) f = lf.Flow('test').add(task1).add(task2) - self.assertEqual(len(f), 2) - self.assertEqual(list(f), [task1, task2]) - self.assertEqual(list(f.iter_links()), [ - (task1, task2, {'invariant': True}) - ]) + self.assertEqual(2, len(f)) + self.assertEqual([task1, task2], list(f)) + self.assertEqual([(task1, task2, {'invariant': True})], + list(f.iter_links()), ) def test_linear_flow_three_tasks(self): task1 = _task(name='task1') @@ -100,24 +97,24 @@ class LinearFlowTest(test.TestCase): task3 = _task(name='task3') f = lf.Flow('test').add(task1, task2, task3) - self.assertEqual(len(f), 3) - self.assertEqual(list(f), [task1, task2, task3]) - self.assertEqual(list(f.iter_links()), [ + self.assertEqual(3, len(f)) + self.assertEqual([task1, task2, task3], list(f)) + self.assertEqual([ (task1, task2, {'invariant': True}), (task2, task3, {'invariant': True}) - ]) + ], list(f.iter_links())) expected = 'taskflow.patterns.linear_flow.Flow: test(len=3)' - self.assertEqual(str(f), expected) + self.assertEqual(expected, str(f)) def test_linear_flow_with_retry(self): ret = retry.AlwaysRevert(requires=['a'], provides=['b']) f = lf.Flow('test', ret) self.assertIs(f.retry, ret) - self.assertEqual(ret.name, 'test_retry') + self.assertEqual('test_retry', ret.name) - self.assertEqual(f.requires, set(['a'])) - self.assertEqual(f.provides, set(['b'])) + self.assertEqual(set(['a']), f.requires) + self.assertEqual(set(['b']), f.provides) def test_iter_nodes(self): task1 = _task(name='task1') diff --git a/taskflow/tests/unit/patterns/test_unordered_flow.py b/taskflow/tests/unit/patterns/test_unordered_flow.py index eeb3bb2b..d14c4e70 100644 --- a/taskflow/tests/unit/patterns/test_unordered_flow.py +++ b/taskflow/tests/unit/patterns/test_unordered_flow.py @@ -29,21 +29,21 @@ class UnorderedFlowTest(test.TestCase): def test_unordered_flow_starts_as_empty(self): f = uf.Flow('test') - self.assertEqual(len(f), 0) - self.assertEqual(list(f), []) - self.assertEqual(list(f.iter_links()), []) + self.assertEqual(0, len(f)) + self.assertEqual([], list(f)) + self.assertEqual([], list(f.iter_links())) - self.assertEqual(f.requires, set()) - self.assertEqual(f.provides, set()) + self.assertEqual(set(), f.requires) + self.assertEqual(set(), f.provides) expected = 'taskflow.patterns.unordered_flow.Flow: test(len=0)' - self.assertEqual(str(f), expected) + self.assertEqual(expected, str(f)) def test_unordered_flow_add_nothing(self): f = uf.Flow('test') result = f.add() self.assertIs(f, result) - self.assertEqual(len(f), 0) + self.assertEqual(0, len(f)) def test_unordered_flow_one_task(self): f = uf.Flow('test') @@ -52,27 +52,27 @@ class UnorderedFlowTest(test.TestCase): self.assertIs(f, result) - self.assertEqual(len(f), 1) - self.assertEqual(list(f), [task]) - self.assertEqual(list(f.iter_links()), []) - self.assertEqual(f.requires, set(['a', 'b'])) - self.assertEqual(f.provides, set(['c', 'd'])) + self.assertEqual(1, len(f)) + self.assertEqual([task], list(f)) + self.assertEqual([], list(f.iter_links())) + self.assertEqual(set(['a', 'b']), f.requires) + self.assertEqual(set(['c', 'd']), f.provides) def test_unordered_flow_two_tasks(self): task1 = _task(name='task1') task2 = _task(name='task2') f = uf.Flow('test').add(task1, task2) - self.assertEqual(len(f), 2) - self.assertEqual(set(f), set([task1, task2])) - self.assertEqual(list(f.iter_links()), []) + self.assertEqual(2, len(f)) + self.assertEqual(set([task1, task2]), set(f)) + self.assertEqual([], list(f.iter_links())) def test_unordered_flow_two_tasks_two_different_calls(self): task1 = _task(name='task1', provides=['a']) task2 = _task(name='task2', requires=['a']) f = uf.Flow('test').add(task1) f.add(task2) - self.assertEqual(len(f), 2) + self.assertEqual(2, len(f)) self.assertEqual(set(['a']), f.requires) self.assertEqual(set(['a']), f.provides) @@ -80,7 +80,7 @@ class UnorderedFlowTest(test.TestCase): task1 = _task(name='task1', provides=['a']) task2 = _task(name='task2', requires=['a']) f = uf.Flow('test').add(task2).add(task1) - self.assertEqual(len(f), 2) + self.assertEqual(2, len(f)) self.assertEqual(set(['a']), f.requires) self.assertEqual(set(['a']), f.provides) @@ -89,25 +89,25 @@ class UnorderedFlowTest(test.TestCase): task2 = _task(name='task2', provides=['a', 'c']) f = uf.Flow('test') f.add(task2, task1) - self.assertEqual(len(f), 2) + self.assertEqual(2, len(f)) def test_unordered_flow_with_retry(self): ret = retry.AlwaysRevert(requires=['a'], provides=['b']) f = uf.Flow('test', ret) self.assertIs(f.retry, ret) - self.assertEqual(ret.name, 'test_retry') + self.assertEqual('test_retry', ret.name) - self.assertEqual(f.requires, set(['a'])) - self.assertEqual(f.provides, set(['b'])) + self.assertEqual(set(['a']), f.requires) + self.assertEqual(set(['b']), f.provides) def test_unordered_flow_with_retry_fully_satisfies(self): ret = retry.AlwaysRevert(provides=['b', 'a']) f = uf.Flow('test', ret) f.add(_task(name='task1', requires=['a'])) self.assertIs(f.retry, ret) - self.assertEqual(ret.name, 'test_retry') - self.assertEqual(f.requires, set([])) - self.assertEqual(f.provides, set(['b', 'a'])) + self.assertEqual('test_retry', ret.name) + self.assertEqual(set([]), f.requires) + self.assertEqual(set(['b', 'a']), f.provides) def test_iter_nodes(self): task1 = _task(name='task1', provides=['a', 'b'])