Minor: update junit to 4.11
This commit is contained in:
@@ -30,7 +30,7 @@ public class JUnitUsageGenTest extends CodegenTestCase {
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
File junitJar = new File("libraries/lib/junit-4.9.jar");
|
||||
File junitJar = new File("libraries/lib/junit-4.11.jar");
|
||||
|
||||
if (!junitJar.exists()) {
|
||||
throw new AssertionError("JUnit jar wasn't found");
|
||||
|
||||
@@ -86,7 +86,7 @@ public class TestlibTest extends UsefulTestCase {
|
||||
CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK);
|
||||
configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, JetTestUtils.getAnnotationsJar());
|
||||
|
||||
junitJar = new File("libraries/lib/junit-4.9.jar");
|
||||
junitJar = new File("libraries/lib/junit-4.11.jar");
|
||||
assertTrue(junitJar.exists());
|
||||
configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, junitJar);
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import kotlin.modules.*
|
||||
fun project() {
|
||||
module("kunit") {
|
||||
// TODO how to refer to the dir of the module?
|
||||
classpath += "lib/junit-4.9.jar"
|
||||
classpath += "lib/junit-4.11.jar"
|
||||
|
||||
addSourceFiles("src/main/kotlin")
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -2,7 +2,7 @@ import kotlin.modules.*
|
||||
|
||||
fun project() {
|
||||
module("testlib") {
|
||||
classpath += "lib/junit-4.9.jar"
|
||||
classpath += "lib/junit-4.11.jar"
|
||||
|
||||
addSourceFiles("test")
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import kotlin.modules.*
|
||||
|
||||
fun project() {
|
||||
module("apidocs") {
|
||||
classpath += "../../lib/junit-4.9.jar"
|
||||
classpath += "../../lib/junit-4.11.jar"
|
||||
|
||||
addSourceFiles("../../stdlib/src")
|
||||
addSourceFiles("../../kunit/src/main/kotlin")
|
||||
|
||||
@@ -25,7 +25,7 @@ class KDocTest {
|
||||
"-kotlin-home", "../../../dist/kotlinc",
|
||||
"-d", "target/classes-stdlib",
|
||||
"-no-stdlib",
|
||||
"-classpath", "../runtime/target/kotlin-runtime-0.1-SNAPSHOT.jar${File.pathSeparator}../../lib/junit-4.9.jar",
|
||||
"-classpath", "../runtime/target/kotlin-runtime-0.1-SNAPSHOT.jar${File.pathSeparator}../../lib/junit-4.11.jar",
|
||||
"../../stdlib/src", "../../kunit/src/main/kotlin", "../../kotlin-jdbc/src/main/kotlin"
|
||||
)
|
||||
Assert.assertEquals(ExitCode.OK, r)
|
||||
|
||||
Reference in New Issue
Block a user