diff --git a/rascal-lsp/pom.xml b/rascal-lsp/pom.xml index d2ac18f1e..a9bd096fe 100644 --- a/rascal-lsp/pom.xml +++ b/rascal-lsp/pom.xml @@ -33,7 +33,7 @@ 2.20.2-SNAPSHOT UTF-8 - 5.10.3 + 4.13.1 3.3.0 2.23.1 0.23.1 @@ -75,29 +75,10 @@ typepal 0.13.1 - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - junit junit - 4.13.1 - test - - - - org.junit.vintage - junit-vintage-engine ${junit.version} test @@ -174,6 +155,13 @@ org.apache.maven.plugins maven-surefire-plugin ${maven-surefire-plugin.version} + + + org.apache.maven.surefire + surefire-junit47 + 3.3.0 + + org.rascalmpl diff --git a/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LineColumnOffsetMapTests.java b/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LineColumnOffsetMapTests.java index 1c507942b..a5f2bcfff 100644 --- a/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LineColumnOffsetMapTests.java +++ b/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LineColumnOffsetMapTests.java @@ -28,19 +28,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; +import org.junit.Test; import org.rascalmpl.vscode.lsp.util.locations.LineColumnOffsetMap; import org.rascalmpl.vscode.lsp.util.locations.impl.ArrayLineOffsetMap; public class LineColumnOffsetMapTests { @Test - void noUnicodeChars() { + public void noUnicodeChars() { LineColumnOffsetMap map = ArrayLineOffsetMap.build("1234\n1234"); assertEquals(2, map.translateColumn(0, 2, false)); } @Test - void singleWideChar() { + public void singleWideChar() { LineColumnOffsetMap map = ArrayLineOffsetMap.build("12🎉45\n1234🎉"); assertEquals(3, map.translateColumn(0, 3, false)); assertEquals(4, map.translateColumn(0, 3, true)); @@ -49,7 +49,7 @@ void singleWideChar() { @Test - void doubleChars() { + public void doubleChars() { LineColumnOffsetMap map = ArrayLineOffsetMap.build("12🎉4🎉6\n1234"); assertEquals(6, map.translateColumn(0, 5, false)); assertEquals(7, map.translateColumn(0, 5, true)); @@ -57,13 +57,13 @@ void doubleChars() { } @Test - void noUnicodeCharsInverse() { + public void noUnicodeCharsInverse() { LineColumnOffsetMap map = ArrayLineOffsetMap.build("1234\n1234"); assertEquals(2, map.translateInverseColumn(0, 2, false)); } @Test - void singleWideCharInverse() { + public void singleWideCharInverse() { LineColumnOffsetMap map = ArrayLineOffsetMap.build("12🎉45\n1234🎉"); assertEquals(3, map.translateInverseColumn(0, 3, false)); assertEquals(3, map.translateInverseColumn(0, 4, false)); @@ -72,7 +72,7 @@ void singleWideCharInverse() { @Test - void doubleCharsInverse() { + public void doubleCharsInverse() { LineColumnOffsetMap map = ArrayLineOffsetMap.build("12🎉4🎉6\n1234"); assertEquals(5, map.translateInverseColumn(0, 6, false)); assertEquals(5, map.translateInverseColumn(0, 7, true)); diff --git a/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LookupTests.java b/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LookupTests.java index ffd6c0a0a..4ed1cc998 100644 --- a/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LookupTests.java +++ b/rascal-lsp/src/test/java/engineering/swat/rascal/lsp/util/LookupTests.java @@ -26,13 +26,14 @@ */ package engineering.swat.rascal.lsp.util; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.Assert.assertSame; + import java.util.HashMap; import java.util.Map; import java.util.Random; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; -import org.junit.jupiter.api.Test; +import org.junit.Test; import org.rascalmpl.vscode.lsp.util.locations.impl.TreeMapLookup; public class LookupTests { @@ -157,7 +158,7 @@ public void randomRanges() { ranges.forEach(target::put); for (var e: ranges.entrySet()) { var found = target.lookup(e.getKey()); - assertSame(e.getValue(), found, "Entry " + e + "should be found"); + assertSame("Entry " + e + "should be found", e.getValue(), found); } }