aboutsummaryrefslogtreecommitdiff
path: root/core/src/test/kotlin/model
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2016-01-25 13:56:01 +0100
committerDmitry Jemerov <yole@jetbrains.com>2016-01-25 13:56:01 +0100
commit74fa763533b0d7db3344ed1add945e72c3a462bc (patch)
treefc8479157aed26bcf0c4c845197e5cb0764b03d7 /core/src/test/kotlin/model
parentdecb439ec77d53b317dc14ba2e07dc4cd9b188db (diff)
downloaddokka-74fa763533b0d7db3344ed1add945e72c3a462bc.tar.gz
dokka-74fa763533b0d7db3344ed1add945e72c3a462bc.tar.bz2
dokka-74fa763533b0d7db3344ed1add945e72c3a462bc.zip
update Dokka to internal RC: remove usages of kotlin.test
Diffstat (limited to 'core/src/test/kotlin/model')
-rw-r--r--core/src/test/kotlin/model/ClassTest.kt4
-rw-r--r--core/src/test/kotlin/model/CommentTest.kt2
-rw-r--r--core/src/test/kotlin/model/FunctionTest.kt4
-rw-r--r--core/src/test/kotlin/model/JavaTest.kt6
-rw-r--r--core/src/test/kotlin/model/KotlinAsJavaTest.kt2
-rw-r--r--core/src/test/kotlin/model/LinkTest.kt2
-rw-r--r--core/src/test/kotlin/model/PackageTest.kt4
-rw-r--r--core/src/test/kotlin/model/PropertyTest.kt4
8 files changed, 14 insertions, 14 deletions
diff --git a/core/src/test/kotlin/model/ClassTest.kt b/core/src/test/kotlin/model/ClassTest.kt
index d4e6f26b..d50a3624 100644
--- a/core/src/test/kotlin/model/ClassTest.kt
+++ b/core/src/test/kotlin/model/ClassTest.kt
@@ -4,8 +4,8 @@ import org.jetbrains.dokka.Content
import org.jetbrains.dokka.NodeKind
import org.jetbrains.dokka.RefKind
import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
public class ClassTest {
@Test fun emptyClass() {
diff --git a/core/src/test/kotlin/model/CommentTest.kt b/core/src/test/kotlin/model/CommentTest.kt
index f3792610..5dfd1157 100644
--- a/core/src/test/kotlin/model/CommentTest.kt
+++ b/core/src/test/kotlin/model/CommentTest.kt
@@ -1,7 +1,7 @@
package org.jetbrains.dokka.tests
import org.junit.Test
-import kotlin.test.*
+import org.junit.Assert.*
import org.jetbrains.dokka.*
public class CommentTest {
diff --git a/core/src/test/kotlin/model/FunctionTest.kt b/core/src/test/kotlin/model/FunctionTest.kt
index af85d569..4cced562 100644
--- a/core/src/test/kotlin/model/FunctionTest.kt
+++ b/core/src/test/kotlin/model/FunctionTest.kt
@@ -3,8 +3,8 @@ package org.jetbrains.dokka.tests
import org.jetbrains.dokka.Content
import org.jetbrains.dokka.NodeKind
import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
public class FunctionTest {
@Test fun function() {
diff --git a/core/src/test/kotlin/model/JavaTest.kt b/core/src/test/kotlin/model/JavaTest.kt
index 3d6f2e75..447fa537 100644
--- a/core/src/test/kotlin/model/JavaTest.kt
+++ b/core/src/test/kotlin/model/JavaTest.kt
@@ -3,9 +3,9 @@ package org.jetbrains.dokka.tests
import org.jetbrains.dokka.NodeKind
import org.jetbrains.dokka.RefKind
import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
public class JavaTest {
@Test fun function() {
diff --git a/core/src/test/kotlin/model/KotlinAsJavaTest.kt b/core/src/test/kotlin/model/KotlinAsJavaTest.kt
index fab307f3..d24d8bdd 100644
--- a/core/src/test/kotlin/model/KotlinAsJavaTest.kt
+++ b/core/src/test/kotlin/model/KotlinAsJavaTest.kt
@@ -3,7 +3,7 @@ package org.jetbrains.dokka.tests
import org.jetbrains.dokka.DocumentationModule
import org.jetbrains.dokka.NodeKind
import org.junit.Test
-import kotlin.test.assertEquals
+import org.junit.Assert.assertEquals
class KotlinAsJavaTest {
@Test fun function() {
diff --git a/core/src/test/kotlin/model/LinkTest.kt b/core/src/test/kotlin/model/LinkTest.kt
index 71d31511..1c206467 100644
--- a/core/src/test/kotlin/model/LinkTest.kt
+++ b/core/src/test/kotlin/model/LinkTest.kt
@@ -2,7 +2,7 @@ package org.jetbrains.dokka.tests
import org.jetbrains.dokka.NodeKind
import org.junit.Test
-import kotlin.test.assertEquals
+import org.junit.Assert.assertEquals
class LinkTest {
@Test fun linkToSelf() {
diff --git a/core/src/test/kotlin/model/PackageTest.kt b/core/src/test/kotlin/model/PackageTest.kt
index edb5d989..97810e80 100644
--- a/core/src/test/kotlin/model/PackageTest.kt
+++ b/core/src/test/kotlin/model/PackageTest.kt
@@ -4,8 +4,8 @@ import org.jetbrains.dokka.Content
import org.jetbrains.dokka.NodeKind
import org.jetbrains.kotlin.config.KotlinSourceRoot
import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
public class PackageTest {
@Test fun rootPackage() {
diff --git a/core/src/test/kotlin/model/PropertyTest.kt b/core/src/test/kotlin/model/PropertyTest.kt
index a049979d..cdf44c03 100644
--- a/core/src/test/kotlin/model/PropertyTest.kt
+++ b/core/src/test/kotlin/model/PropertyTest.kt
@@ -4,8 +4,8 @@ import org.jetbrains.dokka.Content
import org.jetbrains.dokka.NodeKind
import org.jetbrains.dokka.RefKind
import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
public class PropertyTest {
@Test fun valueProperty() {