From 2f85ff6fd7896bcccd42f3e16b37f4baae61782d Mon Sep 17 00:00:00 2001
From: Tapac <fantocci@gmail.com>
Date: Sun, 25 Aug 2019 14:31:32 +0300
Subject: [PATCH] Compose tests excluded my default

---
 .../exposed/gradle/DockerTestContainers.kt    | 49 ++++++++++---------
 exposed-java-time/build.gradle.kts            | 18 ++++++-
 exposed-jdbc/build.gradle.kts                 | 18 ++++++-
 gradle.properties                             |  2 +-
 4 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/buildSrc/src/main/kotlin/org/jetbrains/exposed/gradle/DockerTestContainers.kt b/buildSrc/src/main/kotlin/org/jetbrains/exposed/gradle/DockerTestContainers.kt
index 0e453dad..17bba15a 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/exposed/gradle/DockerTestContainers.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/exposed/gradle/DockerTestContainers.kt
@@ -7,32 +7,33 @@ import java.io.File
 import java.time.Duration
 
 fun Project.setupDialectTest(dialect: String) {
-    applyPluginSafely("com.avast.gradle.docker-compose")
-    val dialectTest = tasks.create("exposedDialectTestWithDocker", Test::class) {
-        group = "verification"
-        systemProperties["exposed.test.dialects"] = dialect
+    if (dialect != "none") {
+        applyPluginSafely("com.avast.gradle.docker-compose")
+        val dialectTest = tasks.create("exposedDialectTestWithDocker", Test::class) {
+            group = "verification"
+            systemProperties["exposed.test.dialects"] = dialect
 
-        doFirst {
-            _dockerCompose {
-                val containerInfo = servicesInfos[dialect]!!
-                systemProperty("exposed.test.$dialect.host", containerInfo.host)
-                systemProperty("exposed.test.oracle.port", containerInfo.ports[1521] ?: -1)
-                systemProperty("exposed.test.sqlserver.port", containerInfo.ports[1433] ?: -1)
-                systemProperty("exposed.test.mariadb.port", containerInfo.ports[3306] ?: -1)
-                systemProperty("exposed.test.mysql.port", containerInfo.ports[3306] ?: -1)
-                systemProperty("exposed.test.mysql8.port", containerInfo.ports[3306] ?: -1)
+            doFirst {
+                _dockerCompose {
+                    val containerInfo = servicesInfos[dialect]!!
+                    systemProperty("exposed.test.$dialect.host", containerInfo.host)
+                    systemProperty("exposed.test.oracle.port", containerInfo.ports[1521] ?: -1)
+                    systemProperty("exposed.test.sqlserver.port", containerInfo.ports[1433] ?: -1)
+                    systemProperty("exposed.test.mariadb.port", containerInfo.ports[3306] ?: -1)
+                    systemProperty("exposed.test.mysql.port", containerInfo.ports[3306] ?: -1)
+                    systemProperty("exposed.test.mysql8.port", containerInfo.ports[3306] ?: -1)
+                }
             }
         }
+
+        _dockerCompose.isRequiredBy(dialectTest)
+
+        _dockerCompose {
+            useComposeFiles = listOf(File(project.rootProject.projectDir, "buildScripts/docker/docker-compose-$dialect.yml").absolutePath)
+            captureContainersOutput = true
+            removeVolumes = true
+            environment["COMPOSE_CONVERT_WINDOWS_PATHS"] = true
+            waitForHealthyStateTimeout = Duration.ofMinutes(60)
+        }
     }
-
-    _dockerCompose.isRequiredBy(dialectTest)
-
-    _dockerCompose {
-        useComposeFiles = listOf(File(project.rootProject.projectDir, "buildScripts/docker/docker-compose-$dialect.yml").absolutePath)
-        captureContainersOutput = true
-        removeVolumes = true
-        environment["COMPOSE_CONVERT_WINDOWS_PATHS"] = true
-        waitForHealthyStateTimeout = Duration.ofMinutes(60)
-    }
-
 }
diff --git a/exposed-java-time/build.gradle.kts b/exposed-java-time/build.gradle.kts
index a07beafa..e091d52f 100644
--- a/exposed-java-time/build.gradle.kts
+++ b/exposed-java-time/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.exposed.gradle.setupDialectTest
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 import tanvd.kosogor.proxy.publishJar
 
@@ -41,4 +44,17 @@ publishJar {
             license = "Apache-2.0"
         }
     }
-}
\ No newline at end of file
+}
+
+tasks.withType(Test::class.java) {
+    jvmArgs = listOf("-XX:MaxPermSize=256m")
+    testLogging {
+        events.addAll(listOf(TestLogEvent.PASSED, TestLogEvent.FAILED, TestLogEvent.SKIPPED))
+        showStandardStreams = true
+        exceptionFormat = TestExceptionFormat.FULL
+    }
+}
+
+val dialect: String by project
+
+setupDialectTest(dialect)
\ No newline at end of file
diff --git a/exposed-jdbc/build.gradle.kts b/exposed-jdbc/build.gradle.kts
index 36fefb13..bba8c83a 100644
--- a/exposed-jdbc/build.gradle.kts
+++ b/exposed-jdbc/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.exposed.gradle.setupDialectTest
 import tanvd.kosogor.proxy.publishJar
 
 plugins {
@@ -29,4 +32,17 @@ publishJar {
             license = "Apache-2.0"
         }
     }
-}
\ No newline at end of file
+}
+
+tasks.withType(Test::class.java) {
+    jvmArgs = listOf("-XX:MaxPermSize=256m")
+    testLogging {
+        events.addAll(listOf(TestLogEvent.PASSED, TestLogEvent.FAILED, TestLogEvent.SKIPPED))
+        showStandardStreams = true
+        exceptionFormat = TestExceptionFormat.FULL
+    }
+}
+
+val dialect: String by project
+
+setupDialectTest(dialect)
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 5865f3ae..83d1bd04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
 group=org.jetbrains.exposed
 version=0.17.1
-dialect=mariadb
+dialect=none