Skip to content

Commit 7906a96

Browse files
committed
Fix compilation errors
1 parent 5c72a98 commit 7906a96

6 files changed

Lines changed: 3 additions & 374 deletions

File tree

default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ pkgs.stdenvNoCC.mkDerivation rec {
137137
checkPhase = ''
138138
runHook preTest
139139
140+
# MAVEN_OPTS='-XX:+UnlockExperimentalVMOptions' mvn --offline -Dmaven.repo.local="$mavenRepo" test
140141
MAVEN_OPTS='-XX:+UnlockExperimentalVMOptions -XX:hashCode=2' mvn --offline -Dmaven.repo.local="$mavenRepo" test
141142
142143
runHook postTest

src/test/java/GitDifferTest.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/test/java/JPPParserTest.java

Lines changed: 0 additions & 165 deletions
This file was deleted.

src/test/java/TestMultiLineMacros.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/test/java/TreeDiffingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void testCase(TestCase testCase) throws IOException, DiffParseException {
9393
VariationDiff<DiffLinesLabel> variationDiff = GumTreeDiff.diffUsingMatching(beforeEdit, afterEdit, testCase.matcher());
9494

9595
try (var output = IO.newBufferedOutputStream(testCase.actual())) {
96-
new LineGraphExporter<>(new Format<>(new FullNodeFormat(), new ChildOrderEdgeFormat<>()))
96+
new LineGraphExporter<DiffLinesLabel>(new Format<>(new FullNodeFormat(), new ChildOrderEdgeFormat<>()))
9797
.exportVariationDiff(variationDiff, output);
9898
}
9999

@@ -106,7 +106,7 @@ public void testCase(TestCase testCase) throws IOException, DiffParseException {
106106
Files.delete(testCase.actual());
107107
} else {
108108
// Keep output files if the test failed
109-
new TikzExporter<>(new Format<>(new FullNodeFormat(), new DefaultEdgeLabelFormat<>()))
109+
new TikzExporter<DiffLinesLabel>(new Format<>(new FullNodeFormat(), new DefaultEdgeLabelFormat<>()))
110110
.exportFullLatexExample(variationDiff, testCase.visualisation());
111111
fail(String.format(
112112
"The diff of %s and %s is not as expected. " +

0 commit comments

Comments
 (0)