From bee29f3b988595c6bf7133a4bc077dcf845150b5 Mon Sep 17 00:00:00 2001 From: "Andrey.Tarashevskiy" Date: Sun, 10 May 2020 22:09:28 +0300 Subject: [PATCH] RepeatableTest moved to main sources --- .../kotlin/org/jetbrains/exposed/sql/tests}/RepeatableTest.kt | 2 +- .../kotlin/org/jetbrains/exposed/sql/tests/mysql/MysqlTests.kt | 2 +- .../org/jetbrains/exposed/sql/tests/shared/CoroutineTests.kt | 2 +- .../kotlin/org.jetbrains.exposed.spring/SpringCoroutineTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename exposed-tests/src/{test/kotlin/org/jetbrains/exposed/test/utils => main/kotlin/org/jetbrains/exposed/sql/tests}/RepeatableTest.kt (94%) diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/test/utils/RepeatableTest.kt b/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/RepeatableTest.kt similarity index 94% rename from exposed-tests/src/test/kotlin/org/jetbrains/exposed/test/utils/RepeatableTest.kt rename to exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/RepeatableTest.kt index 7a05e1d502..919efb0e67 100644 --- a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/test/utils/RepeatableTest.kt +++ b/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/RepeatableTest.kt @@ -1,4 +1,4 @@ -package org.jetbrains.exposed.test.utils +package org.jetbrains.exposed.sql.tests import org.junit.rules.TestRule import org.junit.runner.Description diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/mysql/MysqlTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/mysql/MysqlTests.kt index 6cdce79f7e..e8c9531eeb 100644 --- a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/mysql/MysqlTests.kt +++ b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/mysql/MysqlTests.kt @@ -3,7 +3,7 @@ package org.jetbrains.exposed.sql.tests.mysql import org.jetbrains.exposed.sql.tests.DatabaseTestsBase import org.jetbrains.exposed.sql.tests.TestDB import org.jetbrains.exposed.sql.transactions.TransactionManager -import org.jetbrains.exposed.test.utils.RepeatableTestRule +import org.jetbrains.exposed.sql.tests.RepeatableTestRule import org.junit.Rule import org.junit.Test import kotlin.test.assertFalse diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/CoroutineTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/CoroutineTests.kt index 45e12bd69e..a11c24ddde 100644 --- a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/CoroutineTests.kt +++ b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/CoroutineTests.kt @@ -9,7 +9,7 @@ import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransacti import org.jetbrains.exposed.sql.transactions.experimental.suspendedTransaction import org.jetbrains.exposed.sql.transactions.experimental.suspendedTransactionAsync import org.jetbrains.exposed.sql.transactions.transaction -import org.jetbrains.exposed.test.utils.RepeatableTest +import org.jetbrains.exposed.sql.tests.RepeatableTest import org.junit.Rule import org.junit.Test import java.sql.Connection diff --git a/spring-transaction/src/test/kotlin/org.jetbrains.exposed.spring/SpringCoroutineTest.kt b/spring-transaction/src/test/kotlin/org.jetbrains.exposed.spring/SpringCoroutineTest.kt index be9d71f74f..4d94d25769 100644 --- a/spring-transaction/src/test/kotlin/org.jetbrains.exposed.spring/SpringCoroutineTest.kt +++ b/spring-transaction/src/test/kotlin/org.jetbrains.exposed.spring/SpringCoroutineTest.kt @@ -3,9 +3,9 @@ package org.jetbrains.exposed.spring import kotlinx.coroutines.* import kotlinx.coroutines.debug.junit4.CoroutinesTimeout import org.jetbrains.exposed.sql.* -import org.jetbrains.exposed.sql.tests.utils.RepeatableTest import org.jetbrains.exposed.sql.transactions.experimental.suspendedTransactionAsync import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.sql.tests.RepeatableTest import org.junit.Rule import org.junit.Test import org.springframework.test.annotation.Commit