diff --git a/build.gradle b/build.gradle index 57cb768b50..779efc5984 100755 --- 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 index b8457fe622..73bb55a9d5 100644 --- 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 \ No newline at end of file +dialect=custom +db_version= \ No newline at end of file diff --git a/src/test-conf/compose/docker-compose-mysql.yml b/src/test-conf/compose/docker-compose-mysql.yml index 591e80a02e..ee78bf42b7 100644 --- 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 \ No newline at end of file diff --git a/src/test-conf/mysql56.gradle b/src/test-conf/mysql56.gradle index e4d8e4c03a..b53c559b35 100644 --- a/src/test-conf/mysql56.gradle +++ b/src/test-conf/mysql56.gradle @@ -1,3 +1,14 @@ dependencies { "mysql:mysql-connector-java:5.1.44" -} \ No newline at end of file +} + +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 index 7f67297ba0..9c4e97b704 100644 --- 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 { - 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() }