fix(tests): Adapt to the current EdgeLabelFormat

ibbem · ibbem · commit 388f7fa4d7ab · 2023-04-03T23:47:57.000+02:00
The commit 766b481 groups parallel edges into one edge. This changes the effective `EdgeLabelFormat` unchanged edges are only exported once.
diff --git a/src/test/resources/diffs/differ/4a4c1db1b192e221d8e25460d6d1128d1bdd0c0d.lg b/src/test/resources/diffs/differ/4a4c1db1b192e221d8e25460d6d1128d1bdd0c0d.lg
@@ -3,7 +3,7 @@ v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 2, diff: 2, new:2);;Hello worl
 v 203 REM;ARTIFACT;(old: 2, diff: 2, new:-1);(old: 3, diff: 3, new:-1);;
 v 259 ADD;ARTIFACT;(old: -1, diff: 3, new:2);(old: -1, diff: 4, new:3);;Hallo
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new:3);(old: 4, diff: 5, new:4);;Another line
-e 147 16 ba;0;0
+e 147 16 ba;0
 e 203 16 b;1
 e 259 16 a;2
-e 339 16 ba;3;3
+e 339 16 ba;3
diff --git a/src/test/resources/diffs/differ/a032346092e47048becb36a7cb183b4739547370.lg b/src/test/resources/diffs/differ/a032346092e47048becb36a7cb183b4739547370.lg
@@ -22,26 +22,26 @@ v 1811 NON;ARTIFACT;(old: 27, diff: 27, new:27);(old: 28, diff: 28, new:28);;hel
 v 1939 NON;ARTIFACT;(old: 29, diff: 29, new:29);(old: 30, diff: 30, new:30);;}
 v 2000 NON;IF;(old: 30, diff: 30, new:30);(old: 32, diff: 32, new:32);DEFINED_MESSAGE;#if defined (MESSAGE);#endif
 v 2067 NON;ARTIFACT;(old: 31, diff: 31, new:31);(old: 32, diff: 32, new:32);;   #define MESSAGE "You wish!"
-e 147 16 ba;0;0
-e 211 16 ba;1;1
-e 275 16 ba;2;2
-e 336 16 ba;3;3
-e 403 336 ba;0;0
-e 467 336 ba;1;1
-e 528 336 ba;2;2
-e 595 528 ba;0;0
-e 657 528 ba;1;1
-e 723 657 ba;0;0
-e 851 336 ba;3;3
-e 915 336 ba;4;4
-e 979 336 ba;5;5
-e 1043 336 ba;6;6
-e 1104 336 ba;7;7
-e 1299 1104 ba;0;0
-e 1363 1104 ba;1;1
-e 1619 336 ba;8;8
-e 1680 336 ba;9;9
-e 1811 1680 ba;0;0
-e 1939 336 ba;10;10
-e 2000 336 ba;11;11
-e 2067 2000 ba;0;0
+e 147 16 ba;0
+e 211 16 ba;1
+e 275 16 ba;2
+e 336 16 ba;3
+e 403 336 ba;0
+e 467 336 ba;1
+e 528 336 ba;2
+e 595 528 ba;0
+e 657 528 ba;1
+e 723 657 ba;0
+e 851 336 ba;3
+e 915 336 ba;4
+e 979 336 ba;5
+e 1043 336 ba;6
+e 1104 336 ba;7
+e 1299 1104 ba;0
+e 1363 1104 ba;1
+e 1619 336 ba;8
+e 1680 336 ba;9
+e 1811 1680 ba;0
+e 1939 336 ba;10
+e 2000 336 ba;11
+e 2067 2000 ba;0
diff --git a/src/test/resources/diffs/differ/d7eeba1b94f3d0c0ebed3457eea8fa8537143348.lg b/src/test/resources/diffs/differ/d7eeba1b94f3d0c0ebed3457eea8fa8537143348.lg
@@ -2,6 +2,6 @@ v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 2, diff: 2, new:2);;Hello world
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 3, diff: 3, new:3);;
 v 275 NON;ARTIFACT;(old: 3, diff: 3, new:3);(old: 4, diff: 4, new:4);;Another line
-e 147 16 ba;0;0
-e 211 16 ba;1;1
-e 275 16 ba;2;2
+e 147 16 ba;0
+e 211 16 ba;1
+e 275 16 ba;2
diff --git a/src/test/resources/diffs/parser/04_expected.lg b/src/test/resources/diffs/parser/04_expected.lg
@@ -1,5 +1,5 @@
 v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 4, diff: 4, new:4);A;#ifdef A;#endif
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 4, diff: 4, new:4);;  a \;  b
-e 144 16 ba;0;0
-e 211 144 ba;0;0
+e 144 16 ba;0
+e 211 144 ba;0
diff --git a/src/test/resources/diffs/parser/05_expected.lg b/src/test/resources/diffs/parser/05_expected.lg
@@ -1,5 +1,5 @@
 v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 4, diff: 4, new:4);A;#ifdef A;#endif
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 4, diff: 4, new:4);;  a \;  b
-e 144 16 ba;0;0
-e 211 144 ba;0;0
+e 144 16 ba;0
+e 211 144 ba;0
diff --git a/src/test/resources/diffs/parser/06_expected.lg b/src/test/resources/diffs/parser/06_expected.lg
@@ -1,5 +1,5 @@
 v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 3, diff: 3, new:3);;// hehe \;#ifdef A
 v 275 NON;ARTIFACT;(old: 3, diff: 3, new:3);(old: 5, diff: 5, new:5);;Code \;#endif
-e 147 16 ba;0;0
-e 275 16 ba;1;1
+e 147 16 ba;0
+e 275 16 ba;1
diff --git a/src/test/resources/diffs/parser/09_expected.lg b/src/test/resources/diffs/parser/09_expected.lg
@@ -2,7 +2,7 @@ v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 3, diff: 5, new:4);A;#ifdef A;#endif;#endif
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 3, diff: 3, new:3);;Code 1
 v 339 NON;ARTIFACT;(old: 4, diff: 4, new:3);(old: 5, diff: 5, new:4);;Code 2
-e 144 16 ba;0;0
-e 211 144 ba;0;0
+e 144 16 ba;0
+e 211 144 ba;0
 e 339 16 b;1
 e 339 144 a;1
diff --git a/src/test/resources/diffs/parser/12_expected.lg b/src/test/resources/diffs/parser/12_expected.lg
@@ -1,5 +1,5 @@
 v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 3, diff: 3, new:3);DEFINED_A;#if defined(A);#endif
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 3, diff: 3, new:3);;Code
-e 144 16 ba;0;0
-e 211 144 ba;0;0
+e 144 16 ba;0
+e 211 144 ba;0
diff --git a/src/test/resources/diffs/parser/13_expected.lg b/src/test/resources/diffs/parser/13_expected.lg
@@ -1,5 +1,5 @@
 v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 2, diff: 2, new:2);A;#ifdef A
 v 209 NON;ELSE;(old: 2, diff: 2, new:2);(old: 3, diff: 3, new:3);;#else // B;#endif
-e 144 16 ba;0;0
-e 209 144 ba;0;0
+e 144 16 ba;0
+e 209 144 ba;0
diff --git a/src/test/resources/diffs/parser/14_expected.lg b/src/test/resources/diffs/parser/14_expected.lg
@@ -1,5 +1,5 @@
 v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 2, diff: 3, new:2);A;#ifdef A;#endif
 v 201 REM;ELSE;(old: 2, diff: 2, new:-1);(old: 3, diff: 3, new:-1);;#else // B;#endif
-e 144 16 ba;0;0
+e 144 16 ba;0
 e 201 144 b;0
diff --git a/src/test/resources/diffs/parser/15_expected.lg b/src/test/resources/diffs/parser/15_expected.lg
@@ -2,6 +2,6 @@ v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 2, diff: 4, new:3);A;#ifdef A;#endif
 v 202 REM;ELIF;(old: 2, diff: 2, new:-1);(old: 4, diff: 4, new:-1);B;#elif \;  B;#endif
 v 259 ADD;ARTIFACT;(old: -1, diff: 3, new:2);(old: -1, diff: 4, new:3);;  B
-e 144 16 ba;0;0
+e 144 16 ba;0
 e 202 144 b;0
 e 259 144 a;1
diff --git a/src/test/resources/diffs/parser/16_expected.lg b/src/test/resources/diffs/parser/16_expected.lg
@@ -16,6 +16,6 @@ e 467 136 b;2
 e 467 386 a;0
 e 529 136 b;3
 e 529 386 a;1
-e 595 529 ba;0;0
+e 595 529 ba;0
 e 256 16 a;2
 e 386 256 a;1
diff --git a/src/test/resources/diffs/parser/18_expected.lg b/src/test/resources/diffs/parser/18_expected.lg
@@ -1,3 +1,3 @@
 v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
 v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 3, diff: 3, new:3);;// Comment \;#ifdef A
-e 147 16 ba;0;0
+e 147 16 ba;0
diff --git a/src/test/resources/serialize/expected.tex b/src/test/resources/serialize/expected.tex
@@ -29,8 +29,7 @@
 	\node[textbox] at (8275) {\verb|128|};
 
 	\draw[vtdarrow]
-		(node_592) edge[before] (node_144)
-		(node_592) edge[after] (node_144)
+		(node_592) edge[always] (node_144)
 		(node_899) edge[after] (node_592)
 		(node_3200) edge[after] (node_592)
 		(node_3283) edge[after] (node_3200)
