diff --git a/verarbeitung/Processing_unittest.py b/verarbeitung/Processing_unittest.py index b9f810467cb8b8cb2dcb8fa4dc6cd3af781a1999..c64c6eb12925771f0dba9736748efc9f9fe5d0da 100644 --- a/verarbeitung/Processing_unittest.py +++ b/verarbeitung/Processing_unittest.py @@ -3,8 +3,13 @@ from Processing import process_main class ProcessingTest(unittest.TestCase): def testCycle(self): - self.assertEqual(process_main(['doiz1'],1,1,True), (['doiz1', 'doiz2'], [['doiz2', 'doiz1'], ['doiz1', 'doiz2']])) - self.assertEqual(process_main(['doiz1'],2,2,True), (['doiz1', 'doiz2'], [['doiz2', 'doiz1'], ['doiz1', 'doiz2']])) + nodes, edges = process_main(['doiz1'],1,1,True) + self.assertCountEqual(nodes, ['doiz1', 'doiz2']) + self.assertCountEqual(edges, [['doiz1', 'doiz2'], ['doiz2', 'doiz1']]) + + nodes, edges = process_main(['doiz1'],2,2,True) + self.assertCountEqual(nodes, ['doiz1', 'doiz2']) + self.assertCountEqual(edges, [['doiz2', 'doiz1'], ['doiz1', 'doiz2']]) #def testBigCycle(self): @@ -13,9 +18,18 @@ class ProcessingTest(unittest.TestCase): #def testEmptyDepth(self): def testEmptyDepthHeight(self): - self.assertEqual(process_main(['doi1'],0,0,True), (['doi1'], [])) - self.assertEqual(process_main(['doi1', 'doi2'],0,0,True), (['doi1','doi2'], [['doi1', 'doi2']])) - self.assertEqual(process_main(['doi1', 'doi2', 'doi3'],0,0,True), (['doi1','doi2', 'doi3'], [['doi3', 'doi1'], ['doi1', 'doi2']])) + nodes, edges = process_main(['doi1'],0,0,True) + self.assertCountEqual(nodes,['doi1']) + self.assertCountEqual(edges, []) + + nodes, edges = process_main(['doi1', 'doi2'],0,0,True) + self.assertCountEqual(nodes, ['doi1','doi2']) + self.assertCountEqual(edges, [['doi1', 'doi2']]) + + nodes, edges = process_main(['doi1', 'doi2', 'doi3'],0,0,True) + self.assertCountEqual(nodes, ['doi1','doi2', 'doi3']) + self.assertCountEqual(edges, [['doi3', 'doi1'], ['doi1', 'doi2']]) + #def testInnerEdges(self):