azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: update junit to 4.11

Browse Source
This commit is contained in:
Zalim Bashorov
2014-10-10 23:08:55 +04:00
parent 1b2aa205ec
commit 88f9621b45
8 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class JUnitUsageGenTest extends CodegenTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); 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()) { if (!junitJar.exists()) {
throw new AssertionError("JUnit jar wasn't found"); throw new AssertionError("JUnit jar wasn't found");
compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class TestlibTest extends UsefulTestCase {
CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK); CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK);
configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, JetTestUtils.getAnnotationsJar()); 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()); assertTrue(junitJar.exists());
configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, junitJar); configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, junitJar);
libraries/kunit/module.kt
+1 -1
View File
@@ -3,7 +3,7 @@ import kotlin.modules.*
fun project() { fun project() {
module("kunit") { module("kunit") {
// TODO how to refer to the dir of the module? // 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") addSourceFiles("src/main/kotlin")
} }
libraries/lib/junit-4.11.jar
BIN
View File
Binary file not shown.
libraries/lib/junit-4.9.jar
BIN
View File
Binary file not shown.
libraries/stdlib/testModule.kt
+1 -1
View File
@@ -2,7 +2,7 @@ import kotlin.modules.*
fun project() { fun project() {
module("testlib") { module("testlib") {
classpath += "lib/junit-4.9.jar" classpath += "lib/junit-4.11.jar"
addSourceFiles("test") addSourceFiles("test")
} }
libraries/tools/kdoc/ApiDocsModule.kt
+1 -1
View File
@@ -2,7 +2,7 @@ import kotlin.modules.*
fun project() { fun project() {
module("apidocs") { module("apidocs") {
classpath += "../../lib/junit-4.9.jar" classpath += "../../lib/junit-4.11.jar"
addSourceFiles("../../stdlib/src") addSourceFiles("../../stdlib/src")
addSourceFiles("../../kunit/src/main/kotlin") addSourceFiles("../../kunit/src/main/kotlin")
libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
+1 -1
View File
@@ -25,7 +25,7 @@ class KDocTest {
"-kotlin-home", "../../../dist/kotlinc", "-kotlin-home", "../../../dist/kotlinc",
"-d", "target/classes-stdlib", "-d", "target/classes-stdlib",
"-no-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" "../../stdlib/src", "../../kunit/src/main/kotlin", "../../kotlin-jdbc/src/main/kotlin"
) )
Assert.assertEquals(ExitCode.OK, r) Assert.assertEquals(ExitCode.OK, r)