diff options
author | Eric Giffon <eric.giffon@sonarsource.com> | 2023-11-15 17:00:36 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2023-11-17 20:03:01 +0000 |
commit | 4a2b9ead33736817c9b5d4eb7a81349f70f73efa (patch) | |
tree | 511eac321e69a7daf7b2ba4e9ddc547f988f2773 /server/sonar-db-migration/src/test/java | |
parent | 80defaa50e05f78142f830f0a18d1f135659d137 (diff) | |
download | sonarqube-4a2b9ead33736817c9b5d4eb7a81349f70f73efa.tar.gz sonarqube-4a2b9ead33736817c9b5d4eb7a81349f70f73efa.zip |
SONAR-21002 Adapt migration tests for all db vendors
Co-authored-by: Léo Geoffroy <leo.geoffroy@sonarsource.com>
Diffstat (limited to 'server/sonar-db-migration/src/test/java')
117 files changed, 199 insertions, 339 deletions
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/MigrationDbTester.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/MigrationDbTester.java deleted file mode 100644 index 7b893400125..00000000000 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/MigrationDbTester.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.platform.db.migration; - -import java.sql.SQLException; -import javax.annotation.Nullable; -import org.sonar.db.AbstractDbTester; -import org.sonar.db.DatabaseTestUtils; -import org.sonar.server.platform.db.migration.step.MigrationStep; - -public class MigrationDbTester extends AbstractDbTester<MigrationTestDb> { - - private MigrationDbTester(@Nullable Class<? extends MigrationStep> migrationStepClass) { - super(new MigrationTestDb(migrationStepClass)); - } - - public static MigrationDbTester createEmpty() { - return new MigrationDbTester(null); - } - - public static MigrationDbTester createForMigrationStep(Class<? extends MigrationStep> migrationStepClass) { - return new MigrationDbTester(migrationStepClass); - } - - @Override - protected void before() { - db.start(); - - //Some DataChange steps might fill the tables with some data, data will be removed to ensure tests run on empty tables - truncateAllTables(); - } - - @Override - protected void after() { - db.stop(); - } - - public void truncateAllTables() { - try { - DatabaseTestUtils.truncateAllTables(db.getDatabase().getDataSource()); - } catch (SQLException e) { - throw new IllegalStateException("Fail to truncate db tables", e); - } - } -} diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/MigrationTestDb.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/MigrationTestDb.java deleted file mode 100644 index 5c93efd4bae..00000000000 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/MigrationTestDb.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.platform.db.migration; - -import com.sonar.orchestrator.config.Configuration; -import com.sonar.orchestrator.db.DatabaseClient; -import com.sonar.orchestrator.db.DatabaseFactory; -import javax.annotation.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.sonar.api.config.internal.MapSettings; -import org.sonar.api.config.internal.Settings; -import org.sonar.db.DefaultDatabase; -import org.sonar.db.SQDatabase; -import org.sonar.db.TestDb; -import org.sonar.server.platform.db.migration.step.MigrationStep; - -public class MigrationTestDb implements TestDb { - - private final DefaultDatabase database; - - public MigrationTestDb(@Nullable Class<? extends MigrationStep> migrationStepClass) { - Settings settings = new MapSettings().addProperties(System.getProperties()); - OrchestratorSettingsUtils.loadOrchestratorSettings(settings); - logJdbcSettings(settings); - - SQDatabase.Builder builder = new SQDatabase.Builder(); - - String dialect = settings.getString("sonar.jdbc.dialect"); - if (dialect == null || "h2".equals(dialect)) { - builder.asH2Database("sonar"); - } else { - createDatabase(settings); - builder.withSettings(settings); - } - - if (migrationStepClass != null) { - builder.createSchema(true).untilMigrationStep(migrationStepClass); - } - - database = builder.build(); - } - - private static void createDatabase(Settings settings) { - Configuration configuration = Configuration.builder() - .addProperties(settings.getProperties()) - .build(); - - DatabaseClient databaseClient = DatabaseFactory.create(configuration, configuration.locators()); - com.sonar.orchestrator.db.DefaultDatabase defaultDatabase = new com.sonar.orchestrator.db.DefaultDatabase(databaseClient); - defaultDatabase.start(); - } - - private void logJdbcSettings(Settings settings) { - Logger logger = LoggerFactory.getLogger(getClass()); - for (String key : settings.getKeysStartingWith("sonar.jdbc")) { - logger.info(key + ": " + settings.getString(key)); - } - } - - @Override - public void start() { - database.start(); - } - - @Override - public void stop() { - database.stop(); - } - - @Override - public DefaultDatabase getDatabase() { - return database; - } -} diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/MigrationHistoryTableImplTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/MigrationHistoryTableImplTest.java index 0dbb09fddf8..5df392f7d80 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/MigrationHistoryTableImplTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/MigrationHistoryTableImplTest.java @@ -25,7 +25,8 @@ import java.sql.Statement; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.db.CoreDbTester; +import org.sonar.db.dialect.MsSql; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +34,7 @@ public class MigrationHistoryTableImplTest { private static final String TABLE_SCHEMA_MIGRATIONS = "schema_migrations"; @Rule - public CoreDbTester dbTester = CoreDbTester.createEmpty(); + public MigrationDbTester dbTester = MigrationDbTester.createEmpty(); private MigrationHistoryTableImpl underTest = new MigrationHistoryTableImpl(dbTester.database()); @@ -46,7 +47,7 @@ public class MigrationHistoryTableImplTest { @Test public void start_does_not_fail_if_table_exists() throws SQLException { - executeDdl("create table " + TABLE_SCHEMA_MIGRATIONS + " (version varchar(255) not null)"); + executeDdl(String.format("create table %s (version %s(255) not null)", TABLE_SCHEMA_MIGRATIONS, getFieldType())); verifyTable(); underTest.start(); @@ -54,6 +55,13 @@ public class MigrationHistoryTableImplTest { verifyTable(); } + private String getFieldType() { + if (dbTester.database().getDialect().getId().equals(MsSql.ID)) { + return "nvarchar"; + } + return "varchar"; + } + private void executeDdl(String sql) throws SQLException { try (Connection connection = dbTester.database().getDataSource().getConnection()) { connection.setAutoCommit(false); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java index bf4a53d7f7c..4c85532d8fd 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java @@ -21,7 +21,7 @@ package org.sonar.server.platform.db.migration.history; import org.junit.Rule; import org.junit.Test; -import org.sonar.db.CoreDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; @@ -29,7 +29,7 @@ import static org.mockito.Mockito.verifyNoInteractions; public class NoTableMigrationHistoryImplTest { @Rule - public CoreDbTester dbTester = CoreDbTester.createEmpty(); + public MigrationDbTester dbTester = MigrationDbTester.createEmpty(); private MigrationHistoryMeddler migrationHistoryMeddler = mock(MigrationHistoryMeddler.class); private MigrationHistoryImpl underTest = new MigrationHistoryImpl(dbTester.database(), migrationHistoryMeddler); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderDbTesterTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderDbTesterTest.java index 83e6b87575a..10111b0167f 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderDbTesterTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderDbTesterTest.java @@ -22,8 +22,8 @@ package org.sonar.server.platform.db.migration.sql; import java.util.Map; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.db.CoreDbTester; import org.sonar.db.dialect.Dialect; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.def.TinyIntColumnDef; import org.sonar.server.platform.db.migration.def.VarcharColumnDef; @@ -39,9 +39,9 @@ import static org.sonar.server.platform.db.migration.sql.CreateTableBuilder.Colu public class CreateTableBuilderDbTesterTest { @ClassRule - public static final CoreDbTester dbTester = CoreDbTester.createEmpty(); + public static final MigrationDbTester dbTester = MigrationDbTester.createEmpty(); - private Dialect dialect = dbTester.database().getDialect(); + private final Dialect dialect = dbTester.database().getDialect(); private static int tableNameGenerator = 0; @Test diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchemaTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchemaTest.java index c0983143e22..a4cf3d94a85 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchemaTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchemaTest.java @@ -24,14 +24,17 @@ import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Set; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; public class CreateInitialSchemaTest { + private static final Set<String> SCHEMAS_TO_IGNORE = Set.of("INFORMATION_SCHEMA", "sys", "SYS", "SYSTEM", "CTXSYS", "MDSYS", "XDB"); + @Rule public final MigrationDbTester dbTester = MigrationDbTester.createForMigrationStep(CreateInitialSchema.class); @@ -47,7 +50,7 @@ public class CreateInitialSchemaTest { while (rs.next()) { String schema = rs.getString("TABLE_SCHEM"); - if (!"INFORMATION_SCHEMA".equalsIgnoreCase(schema)) { + if (!SCHEMAS_TO_IGNORE.contains(schema)) { tables.add(rs.getString("TABLE_NAME").toLowerCase(Locale.ENGLISH)); } } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/PopulateInitialSchemaTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/PopulateInitialSchemaTest.java index f8d905650ab..08da2eafe3c 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/PopulateInitialSchemaTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v00/PopulateInitialSchemaTest.java @@ -35,7 +35,7 @@ import org.sonar.api.utils.Version; import org.sonar.core.platform.SonarQubeVersion; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AddNclocToProjectsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AddNclocToProjectsTest.java index 0a839ac850c..4c60bd94988 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AddNclocToProjectsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AddNclocToProjectsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class AddNclocToProjectsTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateScimGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateScimGroupsTableTest.java index 07fe15e31cf..9ef20dba209 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateScimGroupsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateScimGroupsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateUniqueIndexForScimGroupsUuidTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateUniqueIndexForScimGroupsUuidTest.java index ba772e598b8..8d68b61ed6b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateUniqueIndexForScimGroupsUuidTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/CreateUniqueIndexForScimGroupsUuidTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v100; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.version.v100.CreateScimGroupsTable.TABLE_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidInComponentsTest.java index 38a6f282548..7d340d9f21c 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidInComponentsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropBModuleUuidInComponentsTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidPathInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidPathInComponentsTest.java index b427ebd7001..3007800f3b8 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidPathInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropBModuleUuidPathInComponentsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropBModuleUuidPathInComponentsTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsModuleUuidInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsModuleUuidInComponentsTest.java index ab6e5298639..c5e221bebdf 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsModuleUuidInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsModuleUuidInComponentsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v100; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropIndexProjectsModuleUuidInComponentsTest { @@ -44,7 +44,7 @@ public class DropIndexProjectsModuleUuidInComponentsTest { @Test public void execute_whenIndexNameWithPrefix_shouldStillDelete() throws SQLException { String alteredIndexName = "idx_1234567891345678916456789_" + INDEX_NAME; - db.executeUpdateSql(String.format("ALTER INDEX %s RENAME TO %s;", INDEX_NAME, alteredIndexName)); + db.renameIndex(TABLE_NAME, INDEX_NAME, alteredIndexName); db.assertIndexDoesNotExist(TABLE_NAME, INDEX_NAME); db.assertIndex(TABLE_NAME, alteredIndexName, COLUMN_NAME); underTest.execute(); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsRootUuidInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsRootUuidInComponentsTest.java index a73532d3b83..a020f6b7636 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsRootUuidInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropIndexProjectsRootUuidInComponentsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v100; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropIndexProjectsRootUuidInComponentsTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidInComponentsTest.java index 2c2113d2d18..afe3854ee48 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidInComponentsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropModuleUuidInComponentsTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidPathInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidPathInComponentsTest.java index f8e15302c0d..20b1fdd851b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidPathInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropModuleUuidPathInComponentsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropModuleUuidPathInComponentsTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropRootUuidInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropRootUuidInComponentsTest.java index 455c0c95159..0abca87daa9 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropRootUuidInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropRootUuidInComponentsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropRootUuidInComponentsTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropScimUserProvisioningTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropScimUserProvisioningTest.java index 1e47e7cab53..85e7a04a7d2 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropScimUserProvisioningTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropScimUserProvisioningTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v100; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropSonarScimEnabledPropertyTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropSonarScimEnabledPropertyTest.java index a29226861c0..d8a0db1e548 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropSonarScimEnabledPropertyTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/DropSonarScimEnabledPropertyTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; public class DropSonarScimEnabledPropertyTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java index ee914140e75..13e18222a68 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java @@ -25,7 +25,7 @@ import org.junit.Rule; import org.junit.Test; import org.slf4j.event.Level; import org.sonar.api.testfixtures.log.LogTester; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/MakeColumnUserLocalNotNullableInUsersTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/MakeColumnUserLocalNotNullableInUsersTest.java index f55ba570cee..56352082e16 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/MakeColumnUserLocalNotNullableInUsersTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/MakeColumnUserLocalNotNullableInUsersTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v100; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.BOOLEAN; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/PopulateNclocForForProjectsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/PopulateNclocForForProjectsTest.java index c2bd919b504..1f889830536 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/PopulateNclocForForProjectsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/PopulateNclocForForProjectsTest.java @@ -26,7 +26,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/RemoveOrphanRulesFromQualityProfilesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/RemoveOrphanRulesFromQualityProfilesTest.java index 3576262fbb1..98c062f3e8a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/RemoveOrphanRulesFromQualityProfilesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/RemoveOrphanRulesFromQualityProfilesTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.core.util.SequenceUuidFactory; import org.sonar.core.util.UuidFactory; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateUserLocalValueInUsersTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateUserLocalValueInUsersTest.java index cb5206a9f51..8d4b9f3811f 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateUserLocalValueInUsersTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateUserLocalValueInUsersTest.java @@ -26,7 +26,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; @@ -71,7 +71,7 @@ public class UpdateUserLocalValueInUsersTest { } private void assertUserLocalIsUpdatedCorrectly(String userUuid, boolean expected) { - String selectSql = String.format("select USER_LOCAL from users where uuid='%s'", userUuid); + String selectSql = String.format("select user_local from users where uuid='%s'", userUuid); assertThat(db.select(selectSql).stream() .map(row -> row.get("USER_LOCAL")) .toList()) diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddCodeVariantsColumnInIssuesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddCodeVariantsColumnInIssuesTableTest.java index 0bc302c5153..5ff81a9f979 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddCodeVariantsColumnInIssuesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddCodeVariantsColumnInIssuesTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest.java index 0ea75ced646..b8be2e52805 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.BOOLEAN; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSchedulesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSchedulesTableTest.java index ee4148d170a..92753a09a82 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSchedulesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSchedulesTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSubscriptionsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSubscriptionsTableTest.java index cd86d73e298..e91f406f6be 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSubscriptionsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddReportSubscriptionsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest.java index a4253a031ba..6a535290628 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.BOOLEAN; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateExternalGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateExternalGroupsTableTest.java index bc868716cef..9ce026c62a8 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateExternalGroupsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateExternalGroupsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest.java index 4b2e3db3083..daaf33ea5ab 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.sonar.server.platform.db.migration.version.v101.CreateIndexForEmailOnUsersTable.COLUMN_NAME; import static org.sonar.server.platform.db.migration.version.v101.CreateIndexForEmailOnUsersTable.INDEX_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest.java index 1267531a572..95b41149862 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.sonar.server.platform.db.migration.version.v101.CreateIndexForScmAccountOnScmAccountsTable.INDEX_NAME; import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.SCM_ACCOUNTS_TABLE_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexOnExternalIdAndIdentityOnExternalGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexOnExternalIdAndIdentityOnExternalGroupsTableTest.java index 8c0155f41f7..e64fb1beeea 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexOnExternalIdAndIdentityOnExternalGroupsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexOnExternalIdAndIdentityOnExternalGroupsTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.sonar.server.platform.db.migration.version.v101.CreateExternalGroupsTable.EXTERNAL_GROUP_ID_COLUMN_NAME; import static org.sonar.server.platform.db.migration.version.v101.CreateExternalGroupsTable.EXTERNAL_IDENTITY_PROVIDER_COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateProjectUuidInUserTokensTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateProjectUuidInUserTokensTest.java index 708bae745e0..f778472f259 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateProjectUuidInUserTokensTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateProjectUuidInUserTokensTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTableTest.java index e3b27e8b085..34e98672ac0 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.USER_UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSchedulesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSchedulesTableTest.java index a3f1427a561..6dc33a750c0 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSchedulesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSchedulesTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.sonar.server.platform.db.migration.version.v101.AddReportSchedulesTable.TABLE_NAME; import static org.sonar.server.platform.db.migration.version.v101.CreateUniqueIndexForReportSchedulesTable.COLUMN_NAME_BRANCH; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSubscriptionsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSubscriptionsTableTest.java index 50bd0ba9f77..7a76d46b6aa 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSubscriptionsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateUniqueIndexForReportSubscriptionsTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.sonar.server.platform.db.migration.version.v101.AddReportSubscriptionsTable.TABLE_NAME; import static org.sonar.server.platform.db.migration.version.v101.CreateUniqueIndexForReportSubscriptionsTable.COLUMN_NAME_BRANCH; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropProjectKeyInUserTokensTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropProjectKeyInUserTokensTest.java index 8d59ce27dce..82bcdddbb55 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropProjectKeyInUserTokensTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropProjectKeyInUserTokensTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.version.v101.DropProjectKeyInUserTokens.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest.java index 9758140ef62..aad4e6aa763 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.version.v101.DropScmAccountsInUsers.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/FixDifferentUuidsForSubportfoliosTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/FixDifferentUuidsForSubportfoliosTest.java index d45c4e1f3d7..a320804c413 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/FixDifferentUuidsForSubportfoliosTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/FixDifferentUuidsForSubportfoliosTest.java @@ -28,7 +28,7 @@ import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.sonar.api.resources.Qualifiers; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.util.stream.Collectors.toSet; @@ -53,9 +53,9 @@ public class FixDifferentUuidsForSubportfoliosTest { underTest.execute(); - Assertions.assertThat(findValueIn("portfolios", "UUID")).containsExactlyInAnyOrder(PF_UUID, NEW_SUBPF_UUID); - Assertions.assertThat(findValueIn("portfolio_projects", "PORTFOLIO_UUID")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); - Assertions.assertThat(findValueIn("portfolio_references", "PORTFOLIO_UUID")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolios", "uuid")).containsExactlyInAnyOrder(PF_UUID, NEW_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolio_projects", "portfolio_uuid")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolio_references", "portfolio_uuid")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); } @Test @@ -69,9 +69,9 @@ public class FixDifferentUuidsForSubportfoliosTest { underTest.execute(); underTest.execute(); - Assertions.assertThat(findValueIn("portfolios", "UUID")).containsExactlyInAnyOrder(PF_UUID, NEW_SUBPF_UUID); - Assertions.assertThat(findValueIn("portfolio_projects", "PORTFOLIO_UUID")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); - Assertions.assertThat(findValueIn("portfolio_references", "PORTFOLIO_UUID")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolios", "uuid")).containsExactlyInAnyOrder(PF_UUID, NEW_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolio_projects", "portfolio_uuid")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolio_references", "portfolio_uuid")).containsExactlyInAnyOrder(NEW_SUBPF_UUID); } @Test @@ -88,10 +88,10 @@ public class FixDifferentUuidsForSubportfoliosTest { underTest.execute(); - Assertions.assertThat(findValueIn("portfolios", "UUID")).containsExactlyInAnyOrder(PF_UUID, NEW_SUBPF_UUID, NEW_CHILD_SUBPF_UUID); - Assertions.assertThat(findValueIn("portfolios", "PARENT_UUID")).containsExactlyInAnyOrder(null, PF_UUID, NEW_SUBPF_UUID); - Assertions.assertThat(findValueIn("portfolio_projects", "PORTFOLIO_UUID")).containsExactlyInAnyOrder(NEW_CHILD_SUBPF_UUID); - Assertions.assertThat(findValueIn("portfolio_references", "PORTFOLIO_UUID")).containsExactlyInAnyOrder(NEW_CHILD_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolios", "uuid")).containsExactlyInAnyOrder(PF_UUID, NEW_SUBPF_UUID, NEW_CHILD_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolios", "parent_uuid")).containsExactlyInAnyOrder(null, PF_UUID, NEW_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolio_projects", "portfolio_uuid")).containsExactlyInAnyOrder(NEW_CHILD_SUBPF_UUID); + Assertions.assertThat(findValueIn("portfolio_references", "portfolio_uuid")).containsExactlyInAnyOrder(NEW_CHILD_SUBPF_UUID); } private Set<String> findValueIn(String table, String field) { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseKeeColumnSizeInInternalPropertiesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseKeeColumnSizeInInternalPropertiesTest.java index a6b19ca9bf4..85b0a3fcba5 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseKeeColumnSizeInInternalPropertiesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseKeeColumnSizeInInternalPropertiesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; import static org.sonar.server.platform.db.migration.version.v101.IncreaseKeeColumnSizeInInternalProperties.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeActivityTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeActivityTest.java index 50157370c6b..9a339bdf102 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeActivityTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeActivityTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; import static org.sonar.server.platform.db.migration.version.v101.IncreaseTaskTypeColumnSizeInCeActivity.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeQueueTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeQueueTest.java index 9a6f4c3c70e..d609734a5db 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeQueueTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/IncreaseTaskTypeColumnSizeInCeQueueTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; import static org.sonar.server.platform.db.migration.version.v101.IncreaseTaskTypeColumnSizeInCeQueue.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest.java index 253caba1d1f..f9988ef088b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest.java @@ -29,7 +29,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import org.sonar.server.platform.db.migration.version.v101.MigrateScmAccountsFromUsersToScmAccounts.ScmAccountRow; @@ -154,9 +154,9 @@ public class MigrateScmAccountsFromUsersToScmAccountsTest { private Set<ScmAccountRow> findAllScmAccounts() { - Set<ScmAccountRow> scmAccounts = db.select("select user_uuid USERUUID, scm_account SCMACCOUNT from scm_accounts") + Set<ScmAccountRow> scmAccounts = db.select("select user_uuid, scm_account from scm_accounts") .stream() - .map(row -> new ScmAccountRow((String) row.get("USERUUID"), (String) row.get("SCMACCOUNT"))) + .map(row -> new ScmAccountRow((String) row.get("user_uuid"), (String) row.get("scm_account"))) .collect(toSet()); return scmAccounts; } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateProjectUuidInUserTokensTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateProjectUuidInUserTokensTest.java index e3de132093a..cf34d995487 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateProjectUuidInUserTokensTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateProjectUuidInUserTokensTest.java @@ -27,7 +27,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSchedulesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSchedulesTest.java index 0783dfbec2d..50a25d72cad 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSchedulesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSchedulesTest.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; @@ -114,8 +114,8 @@ public class PopulateReportSchedulesTest { "project_uuid", "project_" + uuid, "kee", "kee_" + uuid, "branch_type", "BRANCH", - "created_at", "1000", - "updated_at", "1000", + "created_at", 1000, + "updated_at", 1000, "need_issue_sync", false, "is_main", true ); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSubscriptionsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSubscriptionsTest.java index 1216f04ec5c..0a003a9536d 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSubscriptionsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/PopulateReportSubscriptionsTest.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; @@ -112,8 +112,8 @@ public class PopulateReportSubscriptionsTest { "project_uuid", "project_" + uuid, "kee", "kee_" + uuid, "branch_type", "BRANCH", - "created_at", "1000", - "updated_at", "1000", + "created_at", 1000, + "updated_at", 1000, "need_issue_sync", false, "is_main", true ); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveOrphanUserTokensTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveOrphanUserTokensTest.java index d1e4f335862..dd3cafed866 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveOrphanUserTokensTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveOrphanUserTokensTest.java @@ -27,7 +27,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveReportPropertiesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveReportPropertiesTest.java index efa656ea371..3b6bc15ff74 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveReportPropertiesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RemoveReportPropertiesTest.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RenameColumnComponentUuidInPropertiesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RenameColumnComponentUuidInPropertiesTest.java index ea3d4c0cb40..ed6a9d81e4e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RenameColumnComponentUuidInPropertiesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/RenameColumnComponentUuidInPropertiesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranchesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranchesTest.java index d265a4dfd8e..e2fed55d384 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranchesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranchesTest.java @@ -26,7 +26,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddCleanCodeAttributeInRulesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddCleanCodeAttributeInRulesTest.java index d5f21f1e094..f7606a598e4 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddCleanCodeAttributeInRulesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddCleanCodeAttributeInRulesTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; public class AddCleanCodeAttributeInRulesTest { private static final String TABLE_NAME = "rules"; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddUserConsentRequiredIfGithubAutoProvisioningEnabledTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddUserConsentRequiredIfGithubAutoProvisioningEnabledTest.java index 3e8ec137f6d..a64c82b065a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddUserConsentRequiredIfGithubAutoProvisioningEnabledTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/AddUserConsentRequiredIfGithubAutoProvisioningEnabledTest.java @@ -27,7 +27,7 @@ import org.slf4j.event.Level; import org.sonar.api.testfixtures.log.LogTester; import org.sonar.api.utils.System2; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateAnticipatedTransitionsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateAnticipatedTransitionsTableTest.java index b037366fbc2..312d47653d7 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateAnticipatedTransitionsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateAnticipatedTransitionsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.MAX_SIZE; @@ -49,7 +49,7 @@ public class CreateAnticipatedTransitionsTableTest { db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "user_uuid", Types.VARCHAR, USER_UUID_SIZE, false); db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "transition", Types.VARCHAR, 20, false); db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "transition_comment", Types.VARCHAR, MAX_SIZE, true); - db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "line", Types.INTEGER, 11, true); + db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "line", Types.INTEGER, null, true); db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "message", Types.VARCHAR, MAX_SIZE, true); db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "line_hash", Types.VARCHAR, 255, true); db.assertColumnDefinition(ANTICIPATED_TRANSITIONS_TABLE_NAME, "rule_key", Types.VARCHAR, 200, false); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateBooleanPurgedColumnInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateBooleanPurgedColumnInSnapshotsTest.java index 23ceb1e75aa..233a60d60d7 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateBooleanPurgedColumnInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateBooleanPurgedColumnInSnapshotsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.BOOLEAN; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateGithubOrganizationsGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateGithubOrganizationsGroupsTableTest.java index 45598505114..037e2b8f250 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateGithubOrganizationsGroupsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateGithubOrganizationsGroupsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexCreatedAtInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexCreatedAtInWebhookDeliveriesTest.java index 4b308af433c..cba75946536 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexCreatedAtInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexCreatedAtInWebhookDeliveriesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class CreateIndexCreatedAtInWebhookDeliveriesTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeActivityTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeActivityTest.java index 7707c5034f9..985467477b2 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeActivityTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeActivityTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; public class CreateIndexEntityUuidInCeActivityTest { @Rule diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeQueueTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeQueueTest.java index e48777c1b60..f9823a4b887 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeQueueTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInCeQueueTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; public class CreateIndexEntityUuidInCeQueueTest { @Rule diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInGroupRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInGroupRolesTest.java index ef2cbfa0689..0bbf74a34d1 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInGroupRolesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInGroupRolesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; public class CreateIndexEntityUuidInGroupRolesTest { @Rule diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInUserRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInUserRolesTest.java index 7a023cf5098..5bcba341adc 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInUserRolesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexEntityUuidInUserRolesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; public class CreateIndexEntityUuidInUserRolesTest { @Rule diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidCreatedAtInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidCreatedAtInWebhookDeliveriesTest.java index 919d25df659..dd7d32ccd2e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidCreatedAtInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidCreatedAtInWebhookDeliveriesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class CreateIndexProjectUuidCreatedAtInWebhookDeliveriesTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidInProjectBranchesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidInProjectBranchesTest.java index b5682394e8c..050f215b139 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidInProjectBranchesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexProjectUuidInProjectBranchesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexRootComponentUuidInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexRootComponentUuidInSnapshotsTest.java index 851addf81a3..35651df72fd 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexRootComponentUuidInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexRootComponentUuidInSnapshotsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexTaskUuidCreatedAtInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexTaskUuidCreatedAtInWebhookDeliveriesTest.java index 436dcc0fa5b..8f22537d299 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexTaskUuidCreatedAtInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexTaskUuidCreatedAtInWebhookDeliveriesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class CreateIndexTaskUuidCreatedAtInWebhookDeliveriesTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexWebhookUuidCreatedAtInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexWebhookUuidCreatedAtInWebhookDeliveriesTest.java index 1bea69bc2a2..1d31a4bb1af 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexWebhookUuidCreatedAtInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIndexWebhookUuidCreatedAtInWebhookDeliveriesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class CreateIndexWebhookUuidCreatedAtInWebhookDeliveriesTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIssueImpactsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIssueImpactsTableTest.java index 29b55c63d3a..f5e15c8a932 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIssueImpactsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateIssueImpactsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class CreateIssueImpactsTableTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreatePreviousNonCompliantValueInNewCodePeriodsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreatePreviousNonCompliantValueInNewCodePeriodsTest.java index a0be5de46fb..cd07919da36 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreatePreviousNonCompliantValueInNewCodePeriodsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreatePreviousNonCompliantValueInNewCodePeriodsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateRulesDefaultImpactsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateRulesDefaultImpactsTableTest.java index 8226fe7eb7e..d4c254716f3 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateRulesDefaultImpactsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateRulesDefaultImpactsTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnIssuesImpactsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnIssuesImpactsTest.java index af6f26312c6..8ca49f8c071 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnIssuesImpactsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnIssuesImpactsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnRulesDefaultImpactsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnRulesDefaultImpactsTest.java index de5fe0beb74..b64e50e414c 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnRulesDefaultImpactsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/CreateUniqueConstraintOnRulesDefaultImpactsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; @@ -49,4 +49,3 @@ public class CreateUniqueConstraintOnRulesDefaultImpactsTest { db.assertUniqueIndex("rules_default_impacts", "uniq_rul_uuid_sof_qual", "rule_uuid", "software_quality"); } } - diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInGroupRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInGroupRolesTest.java index 869cd74f616..8959c0f329d 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInGroupRolesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInGroupRolesTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInSnapshotsTest.java index 7e3590efc8e..49bbe07d058 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInSnapshotsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInUserRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInUserRolesTest.java index 417eb1d2005..f3da16e7f1e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInUserRolesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInUserRolesTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInWebhookDeliveriesTest.java index 995782ba52e..73bdd332da0 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexComponentUuidInWebhookDeliveriesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeActivityTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeActivityTest.java index 7695b874002..a7f27a00497 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeActivityTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeActivityTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeQueueTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeQueueTest.java index 0d1bb2ada7e..ae6d8429bd6 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeQueueTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexMainComponentUuidInCeQueueTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexOnMainBranchProjectUuidTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexOnMainBranchProjectUuidTest.java index 855d2a79b97..3848fb78e2a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexOnMainBranchProjectUuidTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexOnMainBranchProjectUuidTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropIndexOnMainBranchProjectUuidTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexProjectUuidInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexProjectUuidInWebhookDeliveriesTest.java index 35d031b8022..b7f33fc7add 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexProjectUuidInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexProjectUuidInWebhookDeliveriesTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropIndexProjectUuidInWebhookDeliveriesTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexTaskUuidInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexTaskUuidInWebhookDeliveriesTest.java index c42c97cc9d7..dc1d926c50f 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexTaskUuidInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexTaskUuidInWebhookDeliveriesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropIndexTaskUuidInWebhookDeliveriesTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexWebhookUuidInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexWebhookUuidInWebhookDeliveriesTest.java index fc66cded4b0..bf422d9da0b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexWebhookUuidInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropIndexWebhookUuidInWebhookDeliveriesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; public class DropIndexWebhookUuidInWebhookDeliveriesTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropMainBranchProjectUuidInComponentsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropMainBranchProjectUuidInComponentsTest.java index bd06d1ed3b3..f8878f4b1c8 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropMainBranchProjectUuidInComponentsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropMainBranchProjectUuidInComponentsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.version.v102.DropMainBranchProjectUuidInComponents.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropPurgeStatusColumnInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropPurgeStatusColumnInSnapshotsTest.java index b48b0b2bfa1..054745a5d6a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropPurgeStatusColumnInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropPurgeStatusColumnInSnapshotsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropTableProjectMappingsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropTableProjectMappingsTest.java index 54e9f4da91e..8c908eae891 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropTableProjectMappingsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/DropTableProjectMappingsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/FixSqaleIndexMetricDescriptionTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/FixSqaleIndexMetricDescriptionTest.java index 9565362d84d..3d836dc199c 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/FixSqaleIndexMetricDescriptionTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/FixSqaleIndexMetricDescriptionTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; @@ -59,7 +59,7 @@ public class FixSqaleIndexMetricDescriptionTest { } private String select() { - return (String) db.selectFirst("SELECT DESCRIPTION FROM metrics WHERE NAME = 'sqale_index'").get("DESCRIPTION"); + return (String) db.selectFirst("SELECT description FROM metrics WHERE name = 'sqale_index'").get("description"); } } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseIsLastKeyInCeActivityTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseIsLastKeyInCeActivityTest.java index 5e999cff16e..088ca308103 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseIsLastKeyInCeActivityTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseIsLastKeyInCeActivityTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; import static org.sonar.server.platform.db.migration.version.v102.IncreaseIsLastKeyInCeActivity.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseMainIsLastKeyInCeActivityTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseMainIsLastKeyInCeActivityTest.java index cb3fa740746..03cfd188eb9 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseMainIsLastKeyInCeActivityTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/IncreaseMainIsLastKeyInCeActivityTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; import static org.sonar.server.platform.db.migration.version.v102.IncreaseMainIsLastKeyInCeActivity.COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakeProjectUuidNullableInUserDismissedMessagesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakeProjectUuidNullableInUserDismissedMessagesTest.java index 3f34aece189..2dc4e8bc640 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakeProjectUuidNullableInUserDismissedMessagesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakeProjectUuidNullableInUserDismissedMessagesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakePurgedColumnNotNullableInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakePurgedColumnNotNullableInSnapshotsTest.java index c341a19dfb7..84f9cd4befc 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakePurgedColumnNotNullableInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/MakePurgedColumnNotNullableInSnapshotsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.BOOLEAN; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateCleanCodeAttributeColumnInRulesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateCleanCodeAttributeColumnInRulesTest.java index 2b36cca3e58..b9ac4edfacc 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateCleanCodeAttributeColumnInRulesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateCleanCodeAttributeColumnInRulesTest.java @@ -25,7 +25,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.rules.CleanCodeAttribute; import org.sonar.api.rules.RuleType; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -47,8 +47,9 @@ public class PopulateCleanCodeAttributeColumnInRulesTest { public void execute_whenRuleWithUndefinedCleanCodeAttribute_shouldUpdate() throws SQLException { insertRule("1", null); underTest.execute(); - assertThat(db.select("select UUID, CLEAN_CODE_ATTRIBUTE from rules")) - .extracting(stringObjectMap -> stringObjectMap.get("CLEAN_CODE_ATTRIBUTE")).containsExactly(CleanCodeAttribute.CONVENTIONAL.name()); + assertThat(db.select("select uuid, clean_code_attribute from rules")) + .extracting(stringObjectMap -> stringObjectMap.get("clean_code_attribute")) + .containsExactly(CleanCodeAttribute.CONVENTIONAL.name()); } @Test @@ -56,32 +57,36 @@ public class PopulateCleanCodeAttributeColumnInRulesTest { insertRule("1", null); underTest.execute(); underTest.execute(); - assertThat(db.select("select UUID, CLEAN_CODE_ATTRIBUTE from rules")) - .extracting(stringObjectMap -> stringObjectMap.get("CLEAN_CODE_ATTRIBUTE")).containsExactly(CleanCodeAttribute.CONVENTIONAL.name()); + assertThat(db.select("select uuid, clean_code_attribute from rules")) + .extracting(stringObjectMap -> stringObjectMap.get("clean_code_attribute")) + .containsExactly(CleanCodeAttribute.CONVENTIONAL.name()); } @Test public void execute_whenRuleWithDefinedCleanCodeAttribute_shouldNotUpdate() throws SQLException { insertRule("1", CleanCodeAttribute.FOCUSED); underTest.execute(); - assertThat(db.select("select UUID, CLEAN_CODE_ATTRIBUTE from rules")) - .extracting(stringObjectMap -> stringObjectMap.get("CLEAN_CODE_ATTRIBUTE")).containsExactly(CleanCodeAttribute.FOCUSED.name()); + assertThat(db.select("select uuid, clean_code_attribute from rules")) + .extracting(stringObjectMap -> stringObjectMap.get("clean_code_attribute")) + .containsExactly(CleanCodeAttribute.FOCUSED.name()); } @Test public void execute_whenRuleIsHotspot_shouldNotUpdate() throws SQLException { insertRule("1", RuleType.SECURITY_HOTSPOT, null, null); underTest.execute(); - assertThat(db.select("select UUID, CLEAN_CODE_ATTRIBUTE from rules")) - .extracting(stringObjectMap -> stringObjectMap.get("CLEAN_CODE_ATTRIBUTE")).containsOnlyNulls(); + assertThat(db.select("select uuid, clean_code_attribute from rules")) + .extracting(stringObjectMap -> stringObjectMap.get("clean_code_attribute")) + .containsOnlyNulls(); } @Test public void execute_whenAdhocRuleIsHotspot_shouldNotUpdate() throws SQLException { insertRule("1", null, RuleType.SECURITY_HOTSPOT, null); underTest.execute(); - assertThat(db.select("select UUID, CLEAN_CODE_ATTRIBUTE from rules")) - .extracting(stringObjectMap -> stringObjectMap.get("CLEAN_CODE_ATTRIBUTE")).containsOnlyNulls(); + assertThat(db.select("select uuid, clean_code_attribute from rules")) + .extracting(stringObjectMap -> stringObjectMap.get("clean_code_attribute")) + .containsOnlyNulls(); } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateDefaultImpactsInRulesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateDefaultImpactsInRulesTest.java index 5d676abd4a0..986b78cdc53 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateDefaultImpactsInRulesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulateDefaultImpactsInRulesTest.java @@ -28,7 +28,7 @@ import org.sonar.api.issue.impact.SoftwareQuality; import org.sonar.api.rules.RuleType; import org.sonar.api.testfixtures.log.LogTester; import org.sonar.core.util.Uuids; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -54,9 +54,9 @@ public class PopulateDefaultImpactsInRulesTest { insertRuleWithType("uuid", RuleType.CODE_SMELL, Severity.MAJOR); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) - .extracting(stringObjectMap -> stringObjectMap.get("SOFTWARE_QUALITY"), - stringObjectMap -> stringObjectMap.get("SEVERITY")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) + .extracting(stringObjectMap -> stringObjectMap.get("software_quality"), + stringObjectMap -> stringObjectMap.get("severity")) .containsExactly(tuple(SoftwareQuality.MAINTAINABILITY.name(), org.sonar.api.issue.impact.Severity.MEDIUM.name())); } @@ -66,10 +66,10 @@ public class PopulateDefaultImpactsInRulesTest { underTest.execute(); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .hasSize(1) - .extracting(stringObjectMap -> stringObjectMap.get("SOFTWARE_QUALITY"), - stringObjectMap -> stringObjectMap.get("SEVERITY")) + .extracting(stringObjectMap -> stringObjectMap.get("software_quality"), + stringObjectMap -> stringObjectMap.get("severity")) .containsExactly(tuple(SoftwareQuality.MAINTAINABILITY.name(), org.sonar.api.issue.impact.Severity.MEDIUM.name())); } @@ -79,10 +79,10 @@ public class PopulateDefaultImpactsInRulesTest { insertRuleWithAdHocType("uuid", RuleType.CODE_SMELL, Severity.MAJOR); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .hasSize(1) - .extracting(stringObjectMap -> stringObjectMap.get("SOFTWARE_QUALITY"), - stringObjectMap -> stringObjectMap.get("SEVERITY")) + .extracting(stringObjectMap -> stringObjectMap.get("software_quality"), + stringObjectMap -> stringObjectMap.get("severity")) .containsExactly(tuple(SoftwareQuality.MAINTAINABILITY.name(), org.sonar.api.issue.impact.Severity.MEDIUM.name())); } @@ -93,10 +93,10 @@ public class PopulateDefaultImpactsInRulesTest { insertImpact("uuid", SoftwareQuality.SECURITY, org.sonar.api.issue.impact.Severity.HIGH); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .hasSize(1) - .extracting(stringObjectMap -> stringObjectMap.get("SOFTWARE_QUALITY"), - stringObjectMap -> stringObjectMap.get("SEVERITY")) + .extracting(stringObjectMap -> stringObjectMap.get("software_quality"), + stringObjectMap -> stringObjectMap.get("severity")) .containsExactly(tuple(SoftwareQuality.SECURITY.name(), org.sonar.api.issue.impact.Severity.HIGH.name())); } @@ -106,7 +106,7 @@ public class PopulateDefaultImpactsInRulesTest { insertRuleWithType("uuid", null, null); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .isEmpty(); } @@ -116,7 +116,7 @@ public class PopulateDefaultImpactsInRulesTest { insertInvalidRule("uuid"); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .isEmpty(); assertThat(logTester.logs()).contains("Error while mapping type to impact for rule 'uuid'"); @@ -127,7 +127,7 @@ public class PopulateDefaultImpactsInRulesTest { insertRuleWithType("uuid", RuleType.SECURITY_HOTSPOT, Severity.MAJOR); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .isEmpty(); assertThat(logTester.logs()).doesNotContain("Error while mapping type to impact for rule 'uuid'"); } @@ -137,10 +137,10 @@ public class PopulateDefaultImpactsInRulesTest { insertPlaceholderAdhocRule("uuid"); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .hasSize(1) - .extracting(stringObjectMap -> stringObjectMap.get("SOFTWARE_QUALITY"), - stringObjectMap -> stringObjectMap.get("SEVERITY")) + .extracting(stringObjectMap -> stringObjectMap.get("software_quality"), + stringObjectMap -> stringObjectMap.get("severity")) .containsExactly(tuple(SoftwareQuality.MAINTAINABILITY.name(), org.sonar.api.issue.impact.Severity.MEDIUM.name())); } @@ -149,10 +149,10 @@ public class PopulateDefaultImpactsInRulesTest { insertRule("uuid", RuleType.CODE_SMELL, Severity.CRITICAL, RuleType.VULNERABILITY, Severity.MINOR, true); underTest.execute(); - assertThat(db.select("select SOFTWARE_QUALITY, SEVERITY from rules_default_impacts")) + assertThat(db.select("select software_quality, severity from rules_default_impacts")) .hasSize(1) - .extracting(stringObjectMap -> stringObjectMap.get("SOFTWARE_QUALITY"), - stringObjectMap -> stringObjectMap.get("SEVERITY")) + .extracting(stringObjectMap -> stringObjectMap.get("software_quality"), + stringObjectMap -> stringObjectMap.get("severity")) .containsExactly(tuple(SoftwareQuality.SECURITY.name(), org.sonar.api.issue.impact.Severity.LOW.name())); } @@ -190,9 +190,9 @@ public class PopulateDefaultImpactsInRulesTest { "PLUGIN_RULE_KEY", "key", "PLUGIN_NAME", "name", "SCOPE", "1", - "RULE_TYPE", "-1", - "PRIORITY", "-1", - "AD_HOC_TYPE", "-1", + "RULE_TYPE", 100, + "PRIORITY", -1, + "AD_HOC_TYPE", 100, "AD_HOC_SEVERITY", "-1", "IS_TEMPLATE", false, "IS_AD_HOC", false, diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulatePurgedColumnInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulatePurgedColumnInSnapshotsTest.java index d772c41965d..155d55fd07a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulatePurgedColumnInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/PopulatePurgedColumnInSnapshotsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -51,8 +51,8 @@ public class PopulatePurgedColumnInSnapshotsTest { underTest.execute(); - assertThat(db.select("select UUID, PURGED from snapshots")) - .extracting(stringObjectMap -> stringObjectMap.get("UUID"), stringObjectMap -> stringObjectMap.get("PURGED")) + assertThat(db.select("select uuid, purged from snapshots")) + .extracting(stringObjectMap -> stringObjectMap.get("uuid"), stringObjectMap -> stringObjectMap.get("purged")) .containsExactlyInAnyOrder( tuple("uuid-1", false), tuple("uuid-2", true), @@ -63,8 +63,8 @@ public class PopulatePurgedColumnInSnapshotsTest { private void insertSnapshot(String uuid, @Nullable Integer status) { db.executeInsert(TABLE_NAME, "UUID", uuid, - "ROOT_COMPONENT_UUID", "", - "STATUS", "", + "ROOT_COMPONENT_UUID", "r_c_uuid", + "STATUS", "s", "ISLAST", true, "PURGE_STATUS", status, "PURGED", null); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameBuildDateInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameBuildDateInSnapshotsTest.java index 5cd135211f5..e7cd21a0627 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameBuildDateInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameBuildDateInSnapshotsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInGroupRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInGroupRolesTest.java index 5961204794c..426c89f4de1 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInGroupRolesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInGroupRolesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInSnapshotsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInSnapshotsTest.java index f189cdd4586..2b2edad145e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInSnapshotsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInSnapshotsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInUserRolesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInUserRolesTest.java index 338f4e46c2f..20f23c3baec 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInUserRolesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInUserRolesTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInWebhookDeliveriesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInWebhookDeliveriesTest.java index e383e5d2286..bbe364a08fd 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInWebhookDeliveriesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameComponentUuidInWebhookDeliveriesTest.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.db.AbstractDbTester; import org.sonar.db.TestDb; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.RenameVarcharColumnChange; import org.sonar.server.platform.db.migration.version.RenameVarcharColumnAbstractTest; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeActivityTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeActivityTest.java index 88edcc996ac..45c9494c675 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeActivityTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeActivityTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeQueueTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeQueueTest.java index d0d782750f8..f7e64b072a8 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeQueueTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/RenameMainComponentUuidInCeQueueTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v102; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/UpdateValueAndPopulatePreviousNonCompliantValueInNewCodePeriodsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/UpdateValueAndPopulatePreviousNonCompliantValueInNewCodePeriodsTest.java index 039d7e5d1b2..74a94b36e5b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/UpdateValueAndPopulatePreviousNonCompliantValueInNewCodePeriodsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v102/UpdateValueAndPopulatePreviousNonCompliantValueInNewCodePeriodsTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; @@ -46,9 +46,9 @@ public class UpdateValueAndPopulatePreviousNonCompliantValueInNewCodePeriodsTest underTest.execute(); - assertThat(db.select("select UUID, VALUE, PREVIOUS_NON_COMPLIANT_VALUE from new_code_periods")) - .extracting(stringObjectMap -> stringObjectMap.get("UUID"), stringObjectMap -> stringObjectMap.get("VALUE"), - stringObjectMap -> stringObjectMap.get("PREVIOUS_NON_COMPLIANT_VALUE")) + assertThat(db.select("select uuid, value, previous_non_compliant_value from new_code_periods")) + .extracting(stringObjectMap -> stringObjectMap.get("uuid"), stringObjectMap -> stringObjectMap.get("value"), + stringObjectMap -> stringObjectMap.get("previous_non_compliant_value")) .containsExactlyInAnyOrder( tuple("uuid-1", null, null), tuple("uuid-2", "90", null), @@ -67,4 +67,3 @@ public class UpdateValueAndPopulatePreviousNonCompliantValueInNewCodePeriodsTest } } - diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCleanCodeAttributeColumnInIssuesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCleanCodeAttributeColumnInIssuesTableTest.java index 8356355d35e..05905706ce5 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCleanCodeAttributeColumnInIssuesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCleanCodeAttributeColumnInIssuesTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCreationMethodColumnInProjectsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCreationMethodColumnInProjectsTableTest.java index cbf0da11d8d..9650b160c61 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCreationMethodColumnInProjectsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddCreationMethodColumnInProjectsTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v103; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddRuleChangesUuidColumnInQProfileChangesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddRuleChangesUuidColumnInQProfileChangesTest.java index 3312f422f39..2e9a2f5a0c4 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddRuleChangesUuidColumnInQProfileChangesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddRuleChangesUuidColumnInQProfileChangesTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddSqVersionColumnInQprofileChangesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddSqVersionColumnInQprofileChangesTableTest.java index cf12a687909..7bbb739be79 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddSqVersionColumnInQprofileChangesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/AddSqVersionColumnInQprofileChangesTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateGithubPermissionsMappingTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateGithubPermissionsMappingTableTest.java index b06bc3569fd..b988f46d663 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateGithubPermissionsMappingTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateGithubPermissionsMappingTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest.java index 3134d072901..808aaf679a6 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v103; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleChangesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleChangesTableTest.java index 30466b3ef52..505bef45ef4 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleChangesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleChangesTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleImpactChangesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleImpactChangesTableTest.java index c1b005fa59e..c4c74b21365 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleImpactChangesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateRuleImpactChangesTableTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForGithubPermissionsMappingTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForGithubPermissionsMappingTableTest.java index 9af396ea639..a88d9013736 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForGithubPermissionsMappingTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForGithubPermissionsMappingTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v103; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.sonar.server.platform.db.migration.version.v103.CreateGithubPermissionsMappingTable.GITHUB_PERMISSIONS_MAPPING_TABLE_NAME; import static org.sonar.server.platform.db.migration.version.v103.CreateGithubPermissionsMappingTable.GITHUB_ROLE_COLUMN; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForPropertiesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForPropertiesTableTest.java index e7102b227e2..4eb1b82a472 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForPropertiesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForPropertiesTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v103; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.sonar.server.platform.db.migration.version.v103.CreateUniqueIndexForPropertiesTable.INDEX_NAME; import static org.sonar.server.platform.db.migration.version.v103.CreateUniqueIndexForPropertiesTable.PROPERTIES_TABLE_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/DeduplicatePropertiesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/DeduplicatePropertiesTableTest.java index ad572e92cb6..756f64cb7f6 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/DeduplicatePropertiesTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/DeduplicatePropertiesTableTest.java @@ -25,7 +25,7 @@ import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.sonar.core.util.Uuids; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/MakeCreationMethodColumnInProjectsNotNullableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/MakeCreationMethodColumnInProjectsNotNullableTest.java index 2d9347187b1..b2d2cbcfc5c 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/MakeCreationMethodColumnInProjectsNotNullableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/MakeCreationMethodColumnInProjectsNotNullableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v103; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static java.sql.Types.VARCHAR; import static org.sonar.server.platform.db.migration.version.v103.AddCreationMethodColumnInProjectsTable.PROJECTS_CREATION_METHOD_COLUMN_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateCreationMethodColumnInProjectsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateCreationMethodColumnInProjectsTableTest.java index 6b2c2761915..fc5668fd43c 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateCreationMethodColumnInProjectsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateCreationMethodColumnInProjectsTableTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v103; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.server.platform.db.migration.version.v103.AddCreationMethodColumnInProjectsTable.PROJECTS_TABLE_NAME; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateGithubPermissionsMappingTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateGithubPermissionsMappingTest.java index 28f068b4d73..e7130ed6e31 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateGithubPermissionsMappingTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/PopulateGithubPermissionsMappingTest.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.testfixtures.log.LogTester; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/SetAllowQualityProfileDisableInheritedRulesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/SetAllowQualityProfileDisableInheritedRulesTest.java index 86ca8e7124a..9b13313acce 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/SetAllowQualityProfileDisableInheritedRulesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/SetAllowQualityProfileDisableInheritedRulesTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.sonar.api.impl.utils.TestSystem2; import org.sonar.api.utils.System2; import org.sonar.core.util.UuidFactoryFast; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/DeleteRedundantFailedAlertsForApplicationsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/DeleteRedundantFailedAlertsForApplicationsTest.java index 7d72d4437ee..cf1322bd774 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/DeleteRedundantFailedAlertsForApplicationsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/DeleteRedundantFailedAlertsForApplicationsTest.java @@ -24,7 +24,7 @@ import java.util.Map; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/RenameWontFixIssuesMetricTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/RenameWontFixIssuesMetricTest.java index 592b738fde1..94a28aca8eb 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/RenameWontFixIssuesMetricTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v104/RenameWontFixIssuesMetricTest.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v104; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.platform.db.migration.MigrationDbTester; +import org.sonar.db.MigrationDbTester; import static org.assertj.core.api.Assertions.assertThat; @@ -69,7 +69,7 @@ public class RenameWontFixIssuesMetricTest { db.executeInsert("metrics", "NAME", name, "DESCRIPTION", "description " + name, - "DIRECTION", "-1", + "DIRECTION", -1, "DOMAIN", "Issues", "SHORT_NAME", name, "QUALITATIVE", true, |