From 550dcbf9da08a3a77f4ab8e846525df952b5b3a1 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Tue, 12 Aug 2014 23:24:54 +0200 Subject: [PATCH] improved test performances for sq #2 (use sonar.jdbc.schema property to explicit schema for DBUnit) --- .../sonar/core/persistence/AbstractDaoTestCase.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java index aac92fb380d..998d8963bc6 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java +++ b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java @@ -70,6 +70,10 @@ public abstract class AbstractDaoTestCase { super(dataSource); } + public MyDBTester(DataSource dataSource, String schema) { + super(dataSource, schema); + } + @Override public void closeConnection(IDatabaseConnection connection) throws Exception { @@ -104,7 +108,13 @@ public abstract class AbstractDaoTestCase { LOG.info("Test Database: " + database); databaseCommands = DatabaseCommands.forDialect(database.getDialect()); - databaseTester = new MyDBTester(database.getDataSource()); + + boolean hasSchema = settings.hasKey("sonar.jdbc.schema"); + if (hasSchema) { + databaseTester = new MyDBTester(database.getDataSource(), settings.getString("sonar.jdbc.schema")); + } else { + databaseTester = new MyDBTester(database.getDataSource()); + } myBatis = new MyBatis(database, new Logback(), queue); myBatis.start(); -- 2.39.5