diagrams: condition label similar to UML notation

Author: Ludovic Coquelle

tests/test_graphing.py

@@ -32,7 +32,7 @@ def test_agraph_diagram(self):
             set(m.states.keys()), set([n.name for n in graph.nodes()]))
         triggers = set([n.attr['label'] for n in graph.edges()])
         for t in triggers:
-            t = t.split(AGraph.trigger_condition_sep)[0]
+            t = AGraph.edge_label_from_transition_label(t)
             self.assertIsNotNone(getattr(m, t))
 
         self.assertEqual(len(graph.edges()), len(transitions))
@@ -71,7 +71,7 @@ def test_nested_agraph_diagram(self):
 
         triggers = set([n.attr['label'] for n in graph.edges()])
         for t in triggers:
-            t = t.split(AGraph.trigger_condition_sep)[0]
+            t = AGraph.edge_label_from_transition_label(t)
             self.assertIsNotNone(getattr(m, t))
 
         self.assertEqual(len(graph.edges()), 8)  # see above
@@ -111,7 +111,7 @@ def test_store_nested_agraph_diagram(self):
 
         triggers = set([n.attr['label'] for n in graph.edges()])
         for t in triggers:
-            t = t.split(AGraph.trigger_condition_sep)[0]
+            t = AGraph.edge_label_from_transition_label(t)
             self.assertIsNotNone(getattr(m, t))
 
         self.assertEqual(len(graph.edges()), 8)  # see above

transitions/extensions/diagrams.py

@@ -18,8 +18,6 @@ def get_graph(self):
 
 class AGraph(Diagram):
 
-    trigger_condition_sep = ' / '
-
     machine_attributes = {
         'directed': True,
         'strict': False,
@@ -79,11 +77,18 @@ def _add_edges(self, events, container):
                     lbl = self._transition_label(label, t)
                     container.add_edge(src, dst, label=lbl)
 
+    @staticmethod
+    def edge_label_from_transition_label(label):
+        return label.split(' [')[0]  # if no condition, label is returned
+
     def _transition_label(self, edge_label, tran):
         if self.machine.show_conditions and tran.conditions:
-            return edge_label + AGraph.trigger_condition_sep + '&'.join(
-                c.func if c.target else '!' + c.func
-                for c in tran.conditions
+            return '{edge_label} [{conditions}]'.format(
+                edge_label=edge_label,
+                conditions='&'.join(
+                    c.func if c.target else '!' + c.func
+                    for c in tran.conditions
+                ),
             )
         return edge_label