Repository: incubator-groovy Updated Branches: refs/heads/master 2e1e733d5 -> 082c846a8
groovy-sql: update test dependency (no longer need jdk5 artifact) Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/082c846a Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/082c846a Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/082c846a Branch: refs/heads/master Commit: 082c846a84b387f84932bb3c3ab33da40a1ba48d Parents: 2e1e733 Author: Paul King <[email protected]> Authored: Sat Apr 18 08:55:56 2015 +1000 Committer: Paul King <[email protected]> Committed: Sat Apr 18 08:55:56 2015 +1000 ---------------------------------------------------------------------- subprojects/groovy-sql/build.gradle | 6 ++++-- subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/082c846a/subprojects/groovy-sql/build.gradle ---------------------------------------------------------------------- diff --git a/subprojects/groovy-sql/build.gradle b/subprojects/groovy-sql/build.gradle index 97eb73f..db40028 100644 --- a/subprojects/groovy-sql/build.gradle +++ b/subprojects/groovy-sql/build.gradle @@ -1,8 +1,10 @@ dependencies { compile rootProject -// testCompile 'hsqldb:hsqldb:1.8.0.10' - testCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.3.2', classifier: 'jdk5' + testCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.3.2' +// uncomment to test with other databases (requires changes elsewhere too) +// testCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.3.2', classifier: 'jdk5' // testCompile 'com.h2database:h2:1.3.164' +// testCompile 'hsqldb:hsqldb:1.8.0.10' testCompile project(':groovy-test') } http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/082c846a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy index eb249ce..40e237f 100644 --- a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy +++ b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy @@ -336,7 +336,7 @@ class SqlTest extends GroovyTestCase { def md = sql.connection.metaData assert md.driverName == 'HSQL Database Engine Driver' assert md.databaseProductVersion == '2.3.2' - assert ['JDBCMajorVersion', 'JDBCMinorVersion'].collect{ md[it] } == [3, 0] + assert ['JDBCMajorVersion', 'JDBCMinorVersion'].collect{ md[it] } == [4, 0] assert md.stringFunctions.tokenize(',').contains('CONCAT') def rs = md.getTables(null, null, 'AUTH%', null) assert rs.next()
