Merge pull request #7795 from github/nickrolfe/graph_test_edge_ordering

Ruby/C#: add semmle.order attribute to edges in CFG tests

Author: nickrolfe

csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll

@@ -900,10 +900,25 @@ module TestOutput {
   }
 
   query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
+    attr = "semmle.label" and
     exists(SuccessorType t | succ = getASuccessor(pred, t) |
-      attr = "semmle.label" and
       if successorTypeIsSimple(t) then val = "" else val = t.toString()
     )
+    or
+    attr = "semmle.order" and
+    val =
+      any(int i |
+        succ =
+          rank[i](RelevantNode s, SuccessorType t, Location l |
+            s = getASuccessor(pred, t) and
+            l = s.getLocation()
+          |
+            s
+            order by
+              l.getFile().getBaseName(), l.getFile().getAbsolutePath(), l.getStartLine(),
+              l.getStartColumn(), l.getEndLine(), l.getEndColumn(), t.toString()
+          )
+      ).toString()
   }
 }