Skip to content

Commit d896797

Browse files
ileasileileasile
committed
Simplify package declarations and remove redundant qualifiers in database integration tests.
1 parent 85b475e commit d896797

File tree

9 files changed

+37
-35
lines changed

9 files changed

+37
-35
lines changed

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/CreateConnectionTests.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/CreateConnectionTests.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration
22

33
import io.kotest.matchers.should
4-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseInfo
5-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseIntegrationTest
6-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.createSpringApplicationFile
7-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.startTestContainer
8-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.stopTestContainer
4+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseInfo
5+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseIntegrationTest
6+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.createSpringApplicationFile
7+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.startTestContainer
8+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.stopTestContainer
99
import org.junit.jupiter.api.AfterAll
1010
import org.junit.jupiter.api.BeforeAll
1111
import org.junit.jupiter.api.io.TempDir

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/H2Tests.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/H2Tests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration
22

33
import io.kotest.matchers.should
4-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseIntegrationTest
4+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseIntegrationTest
55
import kotlin.test.Test
66

77
/**

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/MssqlTests.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/MssqlTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration
22

33
import io.kotest.matchers.should
4-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseInfo
5-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseIntegrationTest
6-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.startTestContainer
7-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.stopTestContainer
4+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseInfo
5+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseIntegrationTest
6+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.startTestContainer
7+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.stopTestContainer
88
import org.junit.jupiter.api.AfterAll
99
import org.junit.jupiter.api.BeforeAll
1010
import kotlin.test.Test

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/MysqlTests.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/MysqlTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration
22

33
import io.kotest.matchers.should
4-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseInfo
5-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseIntegrationTest
6-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.startTestContainer
7-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.stopTestContainer
4+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseInfo
5+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseIntegrationTest
6+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.startTestContainer
7+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.stopTestContainer
88
import org.junit.jupiter.api.AfterAll
99
import org.junit.jupiter.api.BeforeAll
1010
import kotlin.test.Test

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/OracleFreeTests.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/OracleFreeTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration
22

33
import io.kotest.matchers.should
4-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseInfo
5-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseIntegrationTest
6-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.startTestContainer
7-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.stopTestContainer
4+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseInfo
5+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseIntegrationTest
6+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.startTestContainer
7+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.stopTestContainer
88
import org.junit.jupiter.api.AfterAll
99
import org.junit.jupiter.api.BeforeAll
1010
import kotlin.test.Test

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/PostgresTests.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/PostgresTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration
22

33
import io.kotest.matchers.should
4-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseInfo
5-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseIntegrationTest
6-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.startTestContainer
7-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.stopTestContainer
4+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseInfo
5+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseIntegrationTest
6+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.startTestContainer
7+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.stopTestContainer
88
import org.junit.jupiter.api.AfterAll
99
import org.junit.jupiter.api.BeforeAll
1010
import kotlin.test.Test

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/SQLiteTests.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/SQLiteTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration
22

33
import io.kotest.matchers.should
4-
import org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers.DatabaseIntegrationTest
4+
import org.jetbrains.kotlinx.jupyter.database.test.integration.helpers.DatabaseIntegrationTest
55
import kotlin.test.Test
66

77
/**

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/helpers/DatabaseIntegrationTest.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/helpers/DatabaseIntegrationTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration.helpers
22

3+
import org.jetbrains.kotlinx.jupyter.database.gen.BuildConfig
34
import org.jetbrains.kotlinx.jupyter.testkit.JupyterReplTestCase
45
import org.junit.jupiter.api.BeforeEach
56

@@ -15,7 +16,7 @@ open class DatabaseIntegrationTest :
1516
) {
1617
@BeforeEach
1718
fun setUp() {
18-
val libraryVersion = org.jetbrains.kotlinx.jupyter.database.gen.BuildConfig.LIBRARY_VERSION
19+
val libraryVersion = BuildConfig.LIBRARY_VERSION
1920
execSuccess(
2021
"""
2122
@file:Repository("*mavenLocal")

integrations/database/database-integration-tests/src/test/kotlin/org/jetbrains/kotlinx/jupyter/database/test/helpers/utils.kt renamed to integrations/database/database-integration-tests/src/test/kotlin/test/integration/helpers/utils.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jetbrains.kotlinx.jupyter.database.org.jetbrains.kotlinx.jupyter.database.test.helpers
1+
package org.jetbrains.kotlinx.jupyter.database.test.integration.helpers
22

33
import io.ktor.client.HttpClient
44
import io.ktor.client.call.body
@@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.jupyter.api.EmbeddedKernelRunMode
1515
import org.jetbrains.kotlinx.jupyter.api.StandaloneKernelRunMode
1616
import org.jetbrains.kotlinx.jupyter.config.DefaultKernelLoggerFactory
1717
import org.jetbrains.kotlinx.jupyter.config.defaultRepositoriesCoordinates
18+
import org.jetbrains.kotlinx.jupyter.database.gen.BuildConfig
1819
import org.jetbrains.kotlinx.jupyter.libraries.DefaultResolutionInfoProviderFactory
1920
import org.jetbrains.kotlinx.jupyter.libraries.createLibraryHttpUtil
2021
import org.jetbrains.kotlinx.jupyter.libraries.getStandardResolver
@@ -42,7 +43,7 @@ fun createSpringApplicationFile(
4243
}
4344

4445
fun startTestContainer(containerId: String): DatabaseInfo {
45-
val testPort = org.jetbrains.kotlinx.jupyter.database.gen.BuildConfig.TEST_SERVER_PORT
46+
val testPort = BuildConfig.TEST_SERVER_PORT
4647
return runBlocking {
4748
// Port is defined in `gradle.properties`
4849
val response = httpClient.get("http://127.0.0.1:$testPort/start/$containerId")
@@ -55,7 +56,7 @@ fun startTestContainer(containerId: String): DatabaseInfo {
5556
}
5657

5758
fun stopTestContainer(containerId: String) {
58-
val testPort = org.jetbrains.kotlinx.jupyter.database.gen.BuildConfig.TEST_SERVER_PORT
59+
val testPort = BuildConfig.TEST_SERVER_PORT
5960
runBlocking {
6061
val response = httpClient.get("http://127.0.0.1:$testPort/stop/$containerId")
6162
if (!response.status.isSuccess()) {

0 commit comments

Comments
 (0)