From a8f8b2016698783fc3baa1a47f0cf938157849fb Mon Sep 17 00:00:00 2001 From: Tapac Date: Thu, 31 Oct 2019 01:12:27 +0900 Subject: [PATCH] Fix test dependencies after extracting exposed-dao module --- exposed-java-time/build.gradle.kts | 1 + .../src/test/kotlin/org/jetbrains/exposed/DefaultsTest.kt | 7 ++----- exposed-jodatime/build.gradle.kts | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/exposed-java-time/build.gradle.kts b/exposed-java-time/build.gradle.kts index c8c6ffebf2..b20078ea65 100644 --- a/exposed-java-time/build.gradle.kts +++ b/exposed-java-time/build.gradle.kts @@ -16,6 +16,7 @@ val dialect: String by project dependencies { api(project(":exposed-core")) + testImplementation(project(":exposed-dao")) testImplementation(project(":exposed-tests")) testImplementation("junit", "junit", "4.12") testImplementation(kotlin("test-junit")) diff --git a/exposed-java-time/src/test/kotlin/org/jetbrains/exposed/DefaultsTest.kt b/exposed-java-time/src/test/kotlin/org/jetbrains/exposed/DefaultsTest.kt index 5c9027750b..7240c7b6ee 100644 --- a/exposed-java-time/src/test/kotlin/org/jetbrains/exposed/DefaultsTest.kt +++ b/exposed-java-time/src/test/kotlin/org/jetbrains/exposed/DefaultsTest.kt @@ -1,9 +1,6 @@ package org.jetbrains.exposed -import org.jetbrains.exposed.dao.EntityID -import org.jetbrains.exposed.dao.IntEntity -import org.jetbrains.exposed.dao.IntEntityClass -import org.jetbrains.exposed.dao.IntIdTable +import org.jetbrains.exposed.dao.* import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.statements.BatchDataInconsistentException import org.jetbrains.exposed.sql.statements.BatchInsertStatement @@ -53,7 +50,7 @@ class DefaultsTest : DatabaseTestsBase() { field = "2" t1 = LocalDateTime.now().minusDays(5) }) - flushCache() + commit() created.forEach { DBDefault.removeFromCache(it) } diff --git a/exposed-jodatime/build.gradle.kts b/exposed-jodatime/build.gradle.kts index 6fefefd556..862ddcc55f 100644 --- a/exposed-jodatime/build.gradle.kts +++ b/exposed-jodatime/build.gradle.kts @@ -14,6 +14,7 @@ val dialect: String by project dependencies { api(project(":exposed-core")) api("joda-time", "joda-time", "2.10.2") + testImplementation(project(":exposed-dao")) testImplementation(project(":exposed-tests")) testImplementation("junit", "junit", "4.12") testImplementation(kotlin("test-junit"))