Fix (again) compatibility of test DatabaseUtilsTest with Oracle

1 files changed, 10 insertions, 6 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseUtilsTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseUtilsTest.java
index 4d53e9881ba..646eee05341 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseUtilsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseUtilsTest.java
@@ -54,11 +54,7 @@ public class DatabaseUtilsTest extends AbstractDaoTestCase {
   public void should_close_statement_and_resultset() throws SQLException {
     Connection connection = getConnection();
     try {
-      String sql = "SELECT 1";
-      if (Oracle.ID.equals(getDatabase().getDialect().getId())) {
-        sql = "SELECT 1 FROM DUAL";
-      }
-      PreparedStatement statement = connection.prepareStatement(sql);
+      PreparedStatement statement = connection.prepareStatement(selectDual());
       ResultSet rs = statement.executeQuery();
 
       DatabaseUtils.closeQuietly(rs);
@@ -109,7 +105,7 @@ public class DatabaseUtilsTest extends AbstractDaoTestCase {
    */
   private boolean isClosed(Connection c) {
     try {
-      c.createStatement().execute("SELECT 1");
+      c.createStatement().execute(selectDual());
       return false;
     } catch (Exception e) {
       return true;
@@ -139,4 +135,12 @@ public class DatabaseUtilsTest extends AbstractDaoTestCase {
       return true;
     }
   }
+
+  private String selectDual() {
+    String sql = "SELECT 1";
+    if (Oracle.ID.equals(getDatabase().getDialect().getId())) {
+      sql = "SELECT 1 FROM DUAL";
+    }
+    return sql;
+  }
 }