jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585425 )

Change subject: [IMPR] Simplify code and use subTest ......................................................................

[IMPR] Simplify code and use subTest

Setup data in setUp and use subTest to reduce similar codes

Change-Id: I2da09ecc01811843ab1aedf6fc09cb7f94ced5ef --- M tests/interwiki_graph_tests.py 1 file changed, 16 insertions(+), 25 deletions(-)

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified

diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index 07f5fa9..e1b64d9 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Test Interwiki Graph functionality.""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # @@ -47,45 +47,36 @@ 'pl': DryPage(cls.plwikt, 'origin'), }

- def test_simple_graph(self): - """Test that GraphDrawer.createGraph does not raise exception.""" + def setUp(self): + """Setup interwiki_graph data.""" + super(TestWiktionaryGraph, self).setUp() data = interwiki_graph.Subject(self.pages['en']) - data.found_in[self.pages['en']] = [self.pages['fr'], self.pages['pl']] data.found_in[self.pages['fr']] = [self.pages['en'], self.pages['pl']] data.found_in[self.pages['pl']] = [self.pages['en'], self.pages['fr']] + self.data = data

- drawer = interwiki_graph.GraphDrawer(data) - + def test_simple_graph(self): + """Test that GraphDrawer.createGraph does not raise exception.""" + drawer = interwiki_graph.GraphDrawer(self.data) drawer.createGraph()

def test_octagon(self): """Test octagon nodes.""" - data = interwiki_graph.Subject(self.pages['en']) - - data.found_in[self.pages['en']] = [self.pages['fr'], self.pages['pl']] - data.found_in[self.pages['en2']] = [self.pages['fr']] - data.found_in[self.pages['fr']] = [self.pages['en'], self.pages['pl']] - data.found_in[self.pages['pl']] = [self.pages['en'], self.pages['fr']] - - drawer = interwiki_graph.GraphDrawer(data) + self.data.found_in[self.pages['en2']] = [self.pages['fr']] + drawer = interwiki_graph.GraphDrawer(self.data)

self.assertEqual({self.pages['en'].site}, drawer._octagon_site_set())

drawer.createGraph() - nodes = drawer.graph.obj_dict['nodes'] - self.assertEqual( - nodes['"pl:origin"'][0]['attributes']['shape'], - 'rectangle')

- self.assertEqual( - nodes['"fr:origin"'][0]['attributes']['shape'], - 'rectangle') - - self.assertEqual( - nodes['"en:origin"'][0]['attributes']['shape'], - 'octagon') + for node, shape in [('"pl:origin"', 'rectangle'), + ('"fr:origin"', 'rectangle'), + ('"en:origin"', 'octagon')]: + with self.subTest(node=node): + self.assertEqual( + nodes[node][0]['attributes']['shape'], shape)

if __name__ == '__main__': # pragma: no cover