Test rework to cover more database/driver versions / #2

JetBrains · Mar 21, 2018 · b5dddc8 · b5dddc8
1 parent 36c2880
commit b5dddc8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,16 +56,17 @@ task mysql56Test(type: Test) {
 //    composeUp.execute()
 //    exposedDialectTestWithDocker.execute()
     println "MYSQL"
-//    environment 'DB_VERSION' "5.6"
+    project.setProperty('db_version', '5.6')
+//    env
 }
 
 dockerCompose {
 //    def dialectProp = System.getProperty("dialect", "")
 //    println dialectProp
 //    println ext.dialect
-    mysql {
-        environment.put 'DB_VERSION', '5.6'
 
+    mysql {
+        environment.put 'DB_VERSION', project.property('db_version')
         useComposeFiles = ['src/test-conf/compose/docker-compose-mysql.yml']
         isRequiredBy(project.tasks.mysql56Test)
     }
@@ -117,6 +118,7 @@ dependencies {
 
 test {
     jvmArgs "-XX:MaxPermSize=256m"
+
     testLogging {
         events "PASSED", "FAILED", "SKIPPED"
         showStandardStreams = true

diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,5 @@ group=org.jetbrains.exposed
 version=0.10.2-SNAPSHOT
 kotlin_version=1.2.30
 spring_version=4.3.7.RELEASE
-dialect=custom
+dialect=custom
+db_version=
diff --git a/src/test-conf/compose/docker-compose-mysql.yml b/src/test-conf/compose/docker-compose-mysql.yml
@@ -3,6 +3,8 @@ version: '3.5'
 services:
   mysql:
     image: "mysql:${DB_VERSION:-latest}"
+    ports:
+      - "3306:3306"
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: password
diff --git a/src/test-conf/mysql56.gradle b/src/test-conf/mysql56.gradle
@@ -1,3 +1,14 @@
 dependencies {
     "mysql:mysql-connector-java:5.1.44"
-}
+}
+
+mysql56Test.doFirst {
+    println('INIT')
+//tasks.withType(Test) {
+//    def containerInfo = dockerCompose.servicesInfos['mysql']
+    def url = "jdbc:mysql://localhost:3306" //+ containerInfo.host + ':' + containerInfo.ports['3306']
+    systemProperty 'exposed.test.dialects', dialect
+    systemProperty 'exposed.test.custom.dialect', 'mysql'
+    systemProperty 'exposed.test.custom.driver', 'com.mysql.jdbc.Driver'
+    systemProperty 'exposed.test.custom.url', url
+}
diff --git a/src/test/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt b/src/test/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt
@@ -59,8 +59,8 @@ enum class TestDB(val connection: String, val driver: String, val user: String =
 
     CUSTOM(System.getProperty("exposed.test.custom.url", ""),
             System.getProperty("exposed.test.custom.driver", ""),
-            System.getProperty("exposed.test.custom.user", ""),
-            System.getProperty("exposed.test.custom.pass", "")
+            System.getProperty("exposed.test.custom.user", "root"),
+            System.getProperty("exposed.test.custom.pass", "password")
             );
 
     fun connect() = Database.connect(connection, user = user, password = pass, driver = driver).also { db ->
@@ -73,7 +73,7 @@ enum class TestDB(val connection: String, val driver: String, val user: String =
 
     companion object {
         fun enabledInTests(): List<TestDB> {
-            val embeddedTests = (TestDB.values().toList() - ORACLE - SQLSERVER).joinToString()
+            val embeddedTests = (TestDB.values().toList() - ORACLE - SQLSERVER - CUSTOM).joinToString()
             val concreteDialects = System.getProperty("exposed.test.dialects", embeddedTests).let {
                 if (it == "") emptyList()
                 else it.split(',').map { it.trim().toUpperCase() }