Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

Store original repository name in migration plan

Browse Source
This commit is contained in:
René Pfeuffer
2019-07-01 15:30:03 +02:00
parent cedf5019b0
commit c881a3eca7
6 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java
View File

@@ -131,6 +131,20 @@ class MigrationWizardServletTest {
.contains("id");
}
@Test
void shouldKeepOriginalName() {
when(updateStep.getRepositoriesWithoutMigrationStrategies()).thenReturn(
Collections.singletonList(new V1Repository("id", "git", "name"))
);
servlet.doGet(request, response);
assertThat(renderedModel.get("repositories"))
.asList()
.extracting("originalName")
.contains("name");
}
@Test
void shouldNotBeInvalidAtFirstRequest() {
when(updateStep.getRepositoriesWithoutMigrationStrategies()).thenReturn(
@@ -219,6 +233,6 @@ class MigrationWizardServletTest {
servlet.doPost(request, response);
verify(migrationStrategyDao).set("id", MigrationStrategy.COPY, "namespace", "name");
verify(migrationStrategyDao).set("id", "name", MigrationStrategy.COPY, "namespace", "name");
}
}

11
scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyDaoTest.java
View File

@@ -47,7 +47,7 @@ class MigrationStrategyDaoTest {
void shouldReturnNewValue() {
MigrationStrategyDao dao = new MigrationStrategyDao(storeFactory);
dao.set("id", INLINE, "space", "name");
dao.set("id", "originalName", INLINE, "space", "name");
Optional<RepositoryMigrationPlan.RepositoryMigrationEntry> entry = dao.get("id");
@@ -65,14 +65,14 @@ class MigrationStrategyDaoTest {
@Nested
class WithExistingDatabase {
@BeforeEach
void initExistingDatabase() throws JAXBException {
void initExistingDatabase() {
MigrationStrategyDao dao = new MigrationStrategyDao(storeFactory);
dao.set("id", INLINE, "space", "name");
dao.set("id", "originalName", INLINE, "space", "name");
}
@Test
void shouldFindExistingValue() throws JAXBException {
void shouldFindExistingValue() {
MigrationStrategyDao dao = new MigrationStrategyDao(storeFactory);
Optional<RepositoryMigrationPlan.RepositoryMigrationEntry> entry = dao.get("id");
@@ -86,6 +86,9 @@ class MigrationStrategyDaoTest {
Assertions.assertThat(entry)
.map(RepositoryMigrationPlan.RepositoryMigrationEntry::getNewName)
.contains("name");
Assertions.assertThat(entry)
.map(RepositoryMigrationPlan.RepositoryMigrationEntry::getOriginalName)
.contains("originalName");
}
}
}

2
scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java
View File

@@ -91,7 +91,7 @@ class XmlRepositoryV1UpdateStepTest {
void createMigrationPlan() {
Answer<Object> planAnswer = invocation -> {
String id = invocation.getArgument(0).toString();
return of(new RepositoryMigrationPlan.RepositoryMigrationEntry(id, MOVE, "namespace-" + id, "name-" + id));
return of(new RepositoryMigrationPlan.RepositoryMigrationEntry(id, "originalName", MOVE, "namespace-" + id, "name-" + id));
};
lenient().when(migrationStrategyDao.get("3b91caa5-59c3-448f-920b-769aaa56b761")).thenAnswer(planAnswer);