Skip to content

Commit d18386f

Browse files
committed
test: use asserts instead of manually checking stdout
Note that some printed checks failed expectedly (those that didn't ignore whitespace or didn't compare diffs semantically) and thus are removed without replacement.
1 parent 6ac3440 commit d18386f

1 file changed

Lines changed: 30 additions & 43 deletions

File tree

src/test/java/VariationUnparserTest.java

Lines changed: 30 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.variantsync.diffdetective.variation.VariationUnparser;
1515
import org.variantsync.diffdetective.variation.tree.source.VariationTreeSource;
1616

17+
import static org.junit.jupiter.api.Assertions.assertEquals;
1718
import static org.variantsync.diffdetective.experiments.thesis_es.UnparseAnalysis.removeWhitespace;
1819

1920
public class VariationUnparserTest {
@@ -56,11 +57,8 @@ public void testTree() throws IOException, DiffParseException {
5657
VariationTree<DiffLinesLabel> tree = VariationTree.fromText(source, VariationTreeSource.Unknown,
5758
VariationDiffParseOptions.Default);
5859
String temp = VariationUnparser.variationTreeUnparser(tree);
59-
System.out.println(removeWhitespace(source, false).equals(removeWhitespace(temp, false)));
60-
// System.out.println(removeWhitespace(source));
61-
// System.out.println("Ende");
62-
// System.out.println(removeWhitespace(temp));
63-
// System.out.println("Ende");
60+
61+
assertEquals(removeWhitespace(source, false), removeWhitespace(temp, false));
6462
}
6563

6664
@Test
@@ -69,47 +67,45 @@ public void testDiffSemEq() throws IOException, DiffParseException {
6967
.readString(Path.of("src", "test", "resources", "unparser", "diff", "diff.diff"));
7068
VariationDiff<DiffLinesLabel> diff = VariationDiff.fromDiff(source, VariationDiffParseOptions.Default);
7169
String temp = VariationUnparser.variationDiffUnparser(diff);
72-
System.out.println(removeWhitespace(source, true).equals(removeWhitespace(temp, true)));
73-
System.out.println(removeWhitespace(VariationUnparser.undiff(source, Time.BEFORE), false)
74-
.equals(removeWhitespace(VariationUnparser.undiff(temp, Time.BEFORE), false)));
75-
System.out.println(removeWhitespace(VariationUnparser.undiff(source, Time.AFTER), false)
76-
.equals(removeWhitespace(VariationUnparser.undiff(temp, Time.AFTER), false)));
77-
78-
// System.out.println(removeWhitespace(source));
79-
// System.out.println("Ende");
80-
// System.out.println(removeWhitespace(temp));
81-
// System.out.println("Ende");
70+
71+
assertEquals(
72+
removeWhitespace(VariationUnparser.undiff(source, Time.BEFORE), false),
73+
removeWhitespace(VariationUnparser.undiff(temp, Time.BEFORE), false));
74+
assertEquals(
75+
removeWhitespace(VariationUnparser.undiff(source, Time.AFTER), false),
76+
removeWhitespace(VariationUnparser.undiff(temp, Time.AFTER), false));
8277
}
8378

8479
public static void testCaseTree(Path testCasePath) throws IOException, DiffParseException {
8580
String temp = Files.readString(testCasePath);
86-
System.out.println(testCasePath);
8781
temp = temp.replaceAll("\\r\\n", "\n");
82+
8883
String unparse1 = parseUnparseTree(testCasePath, new VariationDiffParseOptions(false, false));
8984
String unparse2 = parseUnparseTree(testCasePath, new VariationDiffParseOptions(false, true));
9085
String unparse3 = parseUnparseTree(testCasePath, new VariationDiffParseOptions(true, false));
9186
String unparse4 = parseUnparseTree(testCasePath, new VariationDiffParseOptions(true, true));
92-
System.out.println(temp.equals(unparse1) + " " + temp.equals(unparse2) + " " + temp.equals(unparse3) + " "
93-
+ temp.equals(unparse4));
87+
9488
temp = removeWhitespace(temp, false);
9589
unparse1 = removeWhitespace(unparse1, false);
9690
unparse2 = removeWhitespace(unparse2, false);
9791
unparse3 = removeWhitespace(unparse3, false);
9892
unparse4 = removeWhitespace(unparse4, false);
99-
System.out.println(temp.equals(unparse1) + " " + temp.equals(unparse2) + " " + temp.equals(unparse3) + " "
100-
+ temp.equals(unparse4));
93+
94+
assertEquals(temp, unparse1);
95+
assertEquals(temp, unparse2);
96+
assertEquals(temp, unparse3);
97+
assertEquals(temp, unparse4);
10198
}
10299

103100
public static void testCaseDiff(Path testCasePath) throws IOException, DiffParseException {
104101
String temp = Files.readString(testCasePath);
105-
System.out.println(testCasePath);
106102
temp = temp.replaceAll("\\r\\n", "\n");
103+
107104
String unparse1 = parseUnparseDiff(testCasePath, new VariationDiffParseOptions(false, false));
108105
String unparse2 = parseUnparseDiff(testCasePath, new VariationDiffParseOptions(false, true));
109106
String unparse3 = parseUnparseDiff(testCasePath, new VariationDiffParseOptions(true, false));
110107
String unparse4 = parseUnparseDiff(testCasePath, new VariationDiffParseOptions(true, true));
111-
System.out.println(temp.equals(unparse1) + " " + temp.equals(unparse2) + " " + temp.equals(unparse3) + " "
112-
+ temp.equals(unparse4));
108+
113109
String temp1 = VariationUnparser.undiff(temp, Time.BEFORE);
114110
String temp2 = VariationUnparser.undiff(temp, Time.AFTER);
115111
String unparse11 = VariationUnparser.undiff(unparse1, Time.BEFORE);
@@ -118,26 +114,17 @@ public static void testCaseDiff(Path testCasePath) throws IOException, DiffParse
118114
String unparse22 = VariationUnparser.undiff(unparse2, Time.AFTER);
119115
String unparse31 = VariationUnparser.undiff(unparse3, Time.BEFORE);
120116
String unparse32 = VariationUnparser.undiff(unparse3, Time.AFTER);
121-
String unparse41 = VariationUnparser.undiff(unparse1, Time.BEFORE);
122-
String unparse42 = VariationUnparser.undiff(unparse1, Time.AFTER);
123-
System.out.println(temp1.equals(unparse11) + " " + temp2.equals(unparse12) + " " + temp1.equals(unparse21) + " "
124-
+ temp2.equals(unparse22) + " " + temp1.equals(unparse31) + " " + temp2.equals(unparse32) + " "
125-
+ temp1.equals(unparse41) + " " + temp2.equals(unparse42));
126-
System.out.println(removeWhitespace(temp1, false).equals(removeWhitespace(unparse11, false)) + " "
127-
+ removeWhitespace(temp2, false).equals(removeWhitespace(unparse12, false)) + " "
128-
+ removeWhitespace(temp1, false).equals(removeWhitespace(unparse21, false)) + " "
129-
+ removeWhitespace(temp2, false).equals(removeWhitespace(unparse22, false)) + " "
130-
+ removeWhitespace(temp1, false).equals(removeWhitespace(unparse31, false)) + " "
131-
+ removeWhitespace(temp2, false).equals(removeWhitespace(unparse32, false)) + " "
132-
+ removeWhitespace(temp1, false).equals(removeWhitespace(unparse41, false)) + " "
133-
+ removeWhitespace(temp2, false).equals(removeWhitespace(unparse42, false)));
134-
temp = removeWhitespace(temp, true);
135-
unparse1 = removeWhitespace(unparse1, true);
136-
unparse2 = removeWhitespace(unparse2, true);
137-
unparse3 = removeWhitespace(unparse3, true);
138-
unparse4 = removeWhitespace(unparse4, true);
139-
System.out.println(temp.equals(unparse1) + " " + temp.equals(unparse2) + " " + temp.equals(unparse3) + " "
140-
+ temp.equals(unparse4));
117+
String unparse41 = VariationUnparser.undiff(unparse4, Time.BEFORE);
118+
String unparse42 = VariationUnparser.undiff(unparse4, Time.AFTER);
119+
120+
assertEquals(removeWhitespace(temp1, false), removeWhitespace(unparse11, false));
121+
assertEquals(removeWhitespace(temp2, false), removeWhitespace(unparse12, false));
122+
assertEquals(removeWhitespace(temp1, false), removeWhitespace(unparse21, false));
123+
assertEquals(removeWhitespace(temp2, false), removeWhitespace(unparse22, false));
124+
assertEquals(removeWhitespace(temp1, false), removeWhitespace(unparse31, false));
125+
assertEquals(removeWhitespace(temp2, false), removeWhitespace(unparse32, false));
126+
assertEquals(removeWhitespace(temp1, false), removeWhitespace(unparse41, false));
127+
assertEquals(removeWhitespace(temp2, false), removeWhitespace(unparse42, false));
141128
}
142129

143130
public static String parseUnparseTree(Path path, VariationDiffParseOptions option) throws IOException, DiffParseException {

0 commit comments

Comments
 (0)