kotlin-test: migrate multiplatform integration test to use common test module

This commit is contained in:
Sergey Mashkov
2017-01-24 15:12:42 +03:00
committed by Ilya Gorbunov
parent e500eba59f
commit 66de78e82a
7 changed files with 14 additions and 20 deletions
@@ -1,5 +0,0 @@
package org.jetbrains
impl fun assertEquals(a: String, b: String) {
kotlin.test.assertEquals(a, b)
}
@@ -24,6 +24,12 @@
<artifactId>test-multimodule-shared</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -1,7 +0,0 @@
package org.jetbrains
import org.junit.*
impl fun assertEquals(a: String, b: String) {
Assert.assertEquals(a, b)
}
@@ -19,6 +19,12 @@
<artifactId>kotlin-stdlib-common</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-common</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -1,10 +1,11 @@
package org.jetbrains
import org.junit.*
import kotlin.test.*
open class SharedTest {
@Test
fun test0() {
assertEquals("Hello, World!", getGreeting())
}
}
}
@@ -1,3 +0,0 @@
package org.jetbrains
header fun assertEquals(a: String, b: String)
@@ -1,4 +0,0 @@
package org.junit
@Suppress("HEADER_WITHOUT_IMPLEMENTATION")
header annotation class Test