SONAR-18627 Drop overridden deprecated methods from DbTester

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/IsAliveMapperTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/IsAliveMapperTest.java
index 505d9ad49baa43d71e513d6edaf936d95d0d5d3e..a517c824c95eb3b6f7b0e7ad3aa24b2602fa0b9d 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/IsAliveMapperTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/IsAliveMapperTest.java
@@ -36,7 +36,7 @@ public class IsAliveMapperTest {
 
   @Before
   public void setUp() {
-    session = dbTester.myBatis().openSession(false);
+    session = dbTester.getSession();
     underTest = session.getMapper(IsAliveMapper.class);
   }
 

diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/DbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/DbTester.java
index 979ee39d690af64c2ae966a218eb2e7cc99587cf..dafd9db00d800d084ecd119a35da85d9c1c9cf9f 100644 (file)
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/DbTester.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/DbTester.java
@@ -21,7 +21,6 @@ package org.sonar.db;
 
 import com.zaxxer.hikari.HikariDataSource;
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -288,25 +287,6 @@ public class DbTester extends AbstractDbTester<TestDbImpl> {
     return super.selectFirst(selectSql, new DbSessionConnectionSupplier(dbSession));
   }
 
-  @Deprecated
-  public MyBatis myBatis() {
-    return db.getMyBatis();
-  }
-
-  @Deprecated
-  public Connection openConnection() throws SQLException {
-    return getConnection();
-  }
-
-  private Connection getConnection() throws SQLException {
-    return db.getDatabase().getDataSource().getConnection();
-  }
-
-  @Deprecated
-  public Database database() {
-    return db.getDatabase();
-  }
-
   public String getUrl() {
     return ((HikariDataSource) db.getDatabase().getDataSource()).getJdbcUrl();
   }