Make it impossible to use AbstractDbUnitTestCase for iBatis tests

2 files changed, 8 insertions, 8 deletions

diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java b/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java
index 1b501ee5d22..450c48a933d 100644
--- a/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java
@@ -50,42 +50,42 @@ public class RuleChangeTest extends AbstractDbUnitTestCase {
   public void testRuleActivated() {
     setupData("initialData");
     profilesManager.activated(2, 3, "admin");
-    checkTablesWithExcludedColumns("ruleActivated", new String[]{"change_date"}, "active_rule_changes");
+    checkTables("ruleActivated", new String[]{"change_date"}, "active_rule_changes");
   }
 
   @Test
   public void testRuleDeactivated() {
     setupData("initialData");
     profilesManager.deactivated(2, 3, "admin");
-    checkTablesWithExcludedColumns("ruleDeactivated", new String[]{"change_date"}, "active_rule_changes");
+    checkTables("ruleDeactivated", new String[]{"change_date"}, "active_rule_changes");
   }
 
   @Test
   public void testRuleParamChanged() {
     setupData("initialData");
     profilesManager.ruleParamChanged(2, 3, "param1", "20", "30", "admin");
-    checkTablesWithExcludedColumns("ruleParamChanged", new String[]{"change_date"}, "active_rule_changes", "active_rule_param_changes");
+    checkTables("ruleParamChanged", new String[]{"change_date"}, "active_rule_changes", "active_rule_param_changes");
   }
 
   @Test
   public void testRuleSeverityChanged() {
     setupData("initialData");
     profilesManager.ruleSeverityChanged(2, 3, RulePriority.BLOCKER, RulePriority.CRITICAL, "admin");
-    checkTablesWithExcludedColumns("ruleSeverityChanged", new String[]{"change_date"}, "active_rule_changes");
+    checkTables("ruleSeverityChanged", new String[]{"change_date"}, "active_rule_changes");
   }
 
   @Test
   public void testRuleReverted() {
     setupData("ruleReverted");
     profilesManager.revert(2, 3, "admin");
-    checkTablesWithExcludedColumns("ruleReverted", new String[]{"change_date"}, "active_rule_changes", "active_rule_param_changes");
+    checkTables("ruleReverted", new String[]{"change_date"}, "active_rule_changes", "active_rule_param_changes");
   }
 
   @Test
   public void testChangeParentProfile() {
     setupData("changeParentProfile");
     profilesManager.changeParentProfile(2, "parent", "admin");
-    checkTablesWithExcludedColumns("changeParentProfile", new String[]{"change_date"}, "active_rule_changes");
+    checkTables("changeParentProfile", new String[]{"change_date"}, "active_rule_changes");
   }
 
 
diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java
index 0fefc603f25..102905e97ca 100644
--- a/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java
@@ -22,8 +22,8 @@ package org.sonar.server.platform;
 import org.apache.commons.configuration.BaseConfiguration;
 import org.junit.Test;
 import org.sonar.api.config.PropertyDefinitions;
+import org.sonar.core.persistence.DaoTestCase;
 import org.sonar.core.properties.PropertiesDao;
-import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
 import java.io.File;
 import java.net.URISyntaxException;
@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
-public class ServerSettingsTest extends AbstractDbUnitTestCase {
+public class ServerSettingsTest extends DaoTestCase {
 
   private static File home = getHome();