diff options
7 files changed, 11 insertions, 11 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java index 414c27a7e3d..65767958452 100644 --- a/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java +++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java @@ -23,9 +23,9 @@ import com.google.common.collect.ImmutableList; import org.sonar.server.db.migrations.v36.ViolationMigration; import org.sonar.server.db.migrations.v42.CompleteIssueMessageMigration; import org.sonar.server.db.migrations.v42.PackageKeysMigration; +import org.sonar.server.db.migrations.v43.ConvertIssueDebtToMinutesMigration; import org.sonar.server.db.migrations.v43.DevelopmentCostMeasuresMigration; import org.sonar.server.db.migrations.v43.IssueChangelogMigration; -import org.sonar.server.db.migrations.v43.IssueMigration; import org.sonar.server.db.migrations.v43.NotResolvedIssuesOnRemovedComponentsMigration; import org.sonar.server.db.migrations.v43.RequirementMeasuresMigration; import org.sonar.server.db.migrations.v43.TechnicalDebtMeasuresMigration; @@ -45,7 +45,7 @@ public interface DatabaseMigrations { PackageKeysMigration.class, CompleteIssueMessageMigration.class, // 4.3 - IssueMigration.class, + ConvertIssueDebtToMinutesMigration.class, IssueChangelogMigration.class, TechnicalDebtMeasuresMigration.class, DevelopmentCostMeasuresMigration.class, diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigration.java index 019c3c0ecfb..7739ea46910 100644 --- a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueMigration.java +++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigration.java @@ -37,18 +37,18 @@ import java.sql.Timestamp; * Used in the Active Record Migration 513 * @since 4.3 */ -public class IssueMigration implements DatabaseMigration { +public class ConvertIssueDebtToMinutesMigration implements DatabaseMigration { private final WorkDurationConvertor workDurationConvertor; private final System2 system2; private final Database db; - public IssueMigration(Database database, PropertiesDao propertiesDao) { + public ConvertIssueDebtToMinutesMigration(Database database, PropertiesDao propertiesDao) { this(database, propertiesDao, System2.INSTANCE); } @VisibleForTesting - IssueMigration(Database database, PropertiesDao propertiesDao, System2 system2) { + ConvertIssueDebtToMinutesMigration(Database database, PropertiesDao propertiesDao, System2 system2) { this.db = database; this.workDurationConvertor = new WorkDurationConvertor(propertiesDao); this.system2 = system2; diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_update_issue_debt_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb index 4c46e524e17..96a9ce3a080 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_update_issue_debt_to_minutes.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb @@ -22,9 +22,9 @@ # SonarQube 4.3 # SONAR-4996 # -class UpdateIssueDebtToMinutes < ActiveRecord::Migration +class ConvertIssueDebtToMinutes < ActiveRecord::Migration def self.up - Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.IssueMigration') + Java::OrgSonarServerUi::JRubyFacade.getInstance().databaseMigrator().executeMigration('org.sonar.server.db.migrations.v43.ConvertIssueDebtToMinutesMigration') end end diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueMigrationTest.java b/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest.java index 3b4eacebd02..ceaeafc9c99 100644 --- a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueMigrationTest.java +++ b/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest.java @@ -35,10 +35,10 @@ import org.sonar.core.properties.PropertyDto; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class IssueMigrationTest { +public class ConvertIssueDebtToMinutesMigrationTest { @ClassRule - public static TestDatabase db = new TestDatabase().schema(IssueMigrationTest.class, "schema.sql"); + public static TestDatabase db = new TestDatabase().schema(ConvertIssueDebtToMinutesMigrationTest.class, "schema.sql"); @Mock System2 system2; @@ -46,14 +46,14 @@ public class IssueMigrationTest { @Mock PropertiesDao propertiesDao; - IssueMigration migration; + ConvertIssueDebtToMinutesMigration migration; @Before public void setUp() throws Exception { when(system2.now()).thenReturn(DateUtils.parseDateTime("2014-02-19T19:10:03+0100").getTime()); when(propertiesDao.selectGlobalProperty(WorkDurationConvertor.HOURS_IN_DAY_PROPERTY)).thenReturn(new PropertyDto().setValue("8")); - migration = new IssueMigration(db.database(), propertiesDao, system2); + migration = new ConvertIssueDebtToMinutesMigration(db.database(), propertiesDao, system2); } @Test diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueMigrationTest/migrate_issues_debt.xml b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt.xml index 7717330b452..7717330b452 100644 --- a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueMigrationTest/migrate_issues_debt.xml +++ b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueMigrationTest/migrate_issues_debt_result.xml b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt_result.xml index c8d9eaecc06..c8d9eaecc06 100644 --- a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueMigrationTest/migrate_issues_debt_result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueMigrationTest/schema.sql b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/schema.sql index f3f71cfa229..f3f71cfa229 100644 --- a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueMigrationTest/schema.sql +++ b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/schema.sql |