diff options
| -rw-r--r-- | server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java | 2 | ||||
| -rw-r--r-- | sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java index 8bc1f4bca66..4b65bcf0dff 100644 --- a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java +++ b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java @@ -26,6 +26,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -45,6 +46,7 @@ import java.util.Properties; import static org.fest.assertions.Assertions.assertThat; import static org.junit.Assert.fail; +@Ignore public class SearchServerTest { @Rule 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 9b17e6e1d33..507077e4ce6 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 @@ -123,7 +123,7 @@ public abstract class AbstractDaoTestCase { } - if (connection == null) { + if (connection == null || connection.getConnection().isClosed()) { connection = databaseTester.getConnection(); connection.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, databaseCommands.getDbUnitFactory()); if (MySql.ID.equals(database.getDialect().getId())) { @@ -292,6 +292,6 @@ public abstract class AbstractDaoTestCase { } protected Connection getConnection() throws SQLException { - return connection.getConnection(); + return database.getDataSource().getConnection(); } } |