Testing for colours feature in netgen.

Author: stevemccoll

gitnet/gitnet_tests/test_netgen.py

@@ -209,6 +209,28 @@ def test_author_file(self):
             self.assertEqual(n[1],net2.node[n[0]])
         self.assertEqual(len(net),len(net2))
 
+    def test_no_colours(self):
+        net = self.my_log.generate_network('author', 'files', colours=None)
+        nodes = str(net.nodes(data=True))
+        print(nodes)
+        self.assertIn('Bob' and 'Alice', nodes)
+        # self.assertIn(not 'colour', nodes)
+        # self.assertIn(not 'lightcoral', nodes)
+        # self.assertIn(not 'oldlace', nodes)
+
+    def test_simple_colours(self):
+        net = self.my_log.generate_network('author', 'files', colours='simple')
+        nodes = str(net.nodes(data=True))
+        #print(nodes)
+        self.assertIn("'id': 'readme.md'" and "'type': 'files'" and "'colour': 'lightcoral'", nodes)
+        self.assertIn("'id': 'Alice'" and "'type': 'author'" and "'colour': 'oldlace'", nodes)
+
+    def test_complex_colours(self):
+        net = self.my_log.generate_network('author', 'files', colours='complex')
+        nodes = str(net.nodes(data=True))
+        self.assertIn("'id': 'readme.md'" and "'type': 'files'" and "'colour': 'lightgrey'", nodes)
+        self.assertIn("'id': 'Alice'" and "'type': 'author'" and "'colour': 'oldlace'", nodes)
+
     def tearDown(self):
         sub.call(["rm","-rf",".git"])
 

gitnet/log.py

@@ -804,21 +804,21 @@ def generate_network(self, mode1, mode2, colours=None, edge_helper=net_edges_sim
                     if graph.node[n]['type'] == mode2:
                         graph.node[n]['colour'] = 'lightcoral'
             elif colours == 'complex':
-                for n in graph.nodes():
-                    if graph.node[n]['type'] == 'author':
-                        graph.node[n]['colour'] = 'oldlace'
-                    elif ".py" in graph.node[n]['id']:
-                        graph.node[n]['colour'] = 'springgreen'
-                    elif ".cc" in graph.node[n]['id']:
-                        graph.node[n]['colour'] = 'seagreen'
-                    elif ".md" in graph.node[n]['id']:
-                        graph.node[n]['colour'] = 'orange'
-                    elif ".sh" in graph.node[n]['id']:
-                        graph.node[n]["colour"] = "slateblue"
-                    elif ".html" in graph.node[n]["id"]:
-                        graph.node[n]["colour"] = "plum"
-                    else:
-                        graph.node[n]['colour'] = 'lightgrey'
+                    for n in graph.nodes():
+                        if graph.node[n]['type'] == 'author':
+                            graph.node[n]['colour'] = 'oldlace'
+                        elif ".py" in graph.node[n]['id']:
+                            graph.node[n]['colour'] = 'springgreen'
+                        elif ".cc" in graph.node[n]['id']:
+                            graph.node[n]['colour'] = 'seagreen'
+                        elif ".md" in graph.node[n]['id']:
+                            graph.node[n]['colour'] = 'orange'
+                        elif ".sh" in graph.node[n]['id']:
+                            graph.node[n]["colour"] = "slateblue"
+                        elif ".html" in graph.node[n]["id"]:
+                            graph.node[n]["colour"] = "plum"
+                        else:
+                            graph.node[n]['colour'] = 'lightgrey'
         return graph
 
     def write_edges(self, fname, mode1, mode2, helper=net_edges_simple, edge_attribute=['weight', 'date']):