From 0be816dd28ccf63b86c6d45b56fd188abb9743d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 3 Jun 2019 14:22:57 +0200
Subject: [PATCH 1/4] Extract properties from users and groups in v1 into own
 file

---
 .../group/update/XmlGroupV1UpdateStep.java    | 32 +++++++++++--
 .../scm/user/update/XmlUserV1UpdateStep.java  | 23 ++++++++-
 .../update/XmlGroupV1UpdateStepTest.java      | 32 ++++++++++---
 .../user/update/XmlUserV1UpdateStepTest.java  | 47 +++++++++++++++----
 .../sonia/scm/group/update/groups.xml         |  7 ++-
 .../resources/sonia/scm/user/update/users.xml | 11 ++++-
 6 files changed, 131 insertions(+), 21 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java
index 146a709e7f..7589fe5db7 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java
@@ -8,6 +8,8 @@ import sonia.scm.group.xml.XmlGroupDAO;
 import sonia.scm.migration.UpdateException;
 import sonia.scm.migration.UpdateStep;
 import sonia.scm.plugin.Extension;
+import sonia.scm.store.ConfigurationEntryStore;
+import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.StoreConstants;
 import sonia.scm.version.Version;
 
@@ -37,11 +39,20 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
 
   private final SCMContextProvider contextProvider;
   private final XmlGroupDAO groupDAO;
+  private final ConfigurationEntryStore<V1Properties> propertyStore;
 
   @Inject
-  public XmlGroupV1UpdateStep(SCMContextProvider contextProvider, XmlGroupDAO groupDAO) {
+  public XmlGroupV1UpdateStep(
+    SCMContextProvider contextProvider,
+    XmlGroupDAO groupDAO,
+    ConfigurationEntryStoreFactory configurationEntryStoreFactory
+  ) {
     this.contextProvider = contextProvider;
     this.groupDAO = groupDAO;
+    this.propertyStore = configurationEntryStoreFactory
+      .withType(V1Properties.class)
+      .withName("group-properties-v1")
+      .build();
   }
 
   @Override
@@ -52,7 +63,7 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
       return;
     }
     XmlGroupV1UpdateStep.V1GroupDatabase v1Database = readV1Database(v1GroupsFile.get());
-    v1Database.groupList.groups.forEach(group -> update(group));
+    v1Database.groupList.groups.forEach(this::update);
   }
 
   @Override
@@ -75,6 +86,8 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
     group.setCreationDate(v1Group.creationDate);
     group.setLastModified(v1Group.lastModified);
     groupDAO.add(group);
+
+    propertyStore.put(v1Group.name, v1Group.properties);
   }
 
   private XmlGroupV1UpdateStep.V1GroupDatabase readV1Database(Path v1GroupsFile) throws JAXBException {
@@ -105,7 +118,7 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
   @XmlAccessorType(XmlAccessType.FIELD)
   @XmlRootElement(name = "group")
   private static class V1Group {
-    private Map<String, String> properties;
+    private V1Properties properties;
     private long creationDate;
     private String description;
     private Long lastModified;
@@ -127,6 +140,19 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
     }
   }
 
+  @XmlAccessorType(XmlAccessType.FIELD)
+  private static class V1Property {
+    private String key;
+    private String value;
+  }
+
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlRootElement(name = "properties")
+  private static class V1Properties {
+    @XmlElement(name = "item")
+    private List<V1Property> properties;
+  }
+
   private static class GroupList {
     @XmlElement(name = "group")
     private List<V1Group> groups;
diff --git a/scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java
index 8c5e760710..d02de8067d 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java
@@ -26,7 +26,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 import static java.util.Optional.empty;
@@ -41,12 +40,17 @@ public class XmlUserV1UpdateStep implements UpdateStep {
   private final SCMContextProvider contextProvider;
   private final XmlUserDAO userDAO;
   private final ConfigurationEntryStoreFactory configurationEntryStoreFactory;
+  private final ConfigurationEntryStore<V1Properties> propertyStore;
 
   @Inject
   public XmlUserV1UpdateStep(SCMContextProvider contextProvider, XmlUserDAO userDAO, ConfigurationEntryStoreFactory configurationEntryStoreFactory) {
     this.contextProvider = contextProvider;
     this.userDAO = userDAO;
     this.configurationEntryStoreFactory = configurationEntryStoreFactory;
+    this.propertyStore = configurationEntryStoreFactory
+      .withType(V1Properties.class)
+      .withName("user-properties-v1")
+      .build();
   }
 
   @Override
@@ -88,6 +92,8 @@ public class XmlUserV1UpdateStep implements UpdateStep {
       LOG.debug("setting admin permissions for user {}", v1User.name);
       securityStore.put(new AssignedPermission(v1User.name, "*"));
     }
+
+    propertyStore.put(v1User.name, v1User.properties);
   }
 
   private XmlUserV1UpdateStep.V1UserDatabase readV1Database(Path v1UsersFile) throws JAXBException {
@@ -119,10 +125,23 @@ public class XmlUserV1UpdateStep implements UpdateStep {
     return new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME).toPath();
   }
 
+  @XmlAccessorType(XmlAccessType.FIELD)
+  private static class V1Property {
+    private String key;
+    private String value;
+  }
+
+  @XmlAccessorType(XmlAccessType.FIELD)
+  @XmlRootElement(name = "properties")
+  private static class V1Properties {
+    @XmlElement(name = "item")
+    private List<V1Property> properties;
+  }
+
   @XmlAccessorType(XmlAccessType.FIELD)
   @XmlRootElement(name = "user")
   private static class V1User {
-    private Map<String, String> properties;
+    private V1Properties properties;
     private boolean admin;
     private long creationDate;
     private String displayName;
diff --git a/scm-webapp/src/test/java/sonia/scm/group/update/XmlGroupV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/group/update/XmlGroupV1UpdateStepTest.java
index 552298ed77..ab82771304 100644
--- a/scm-webapp/src/test/java/sonia/scm/group/update/XmlGroupV1UpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/group/update/XmlGroupV1UpdateStepTest.java
@@ -13,9 +13,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.group.Group;
 import sonia.scm.group.xml.XmlGroupDAO;
-import sonia.scm.security.AssignedPermission;
-import sonia.scm.store.ConfigurationEntryStore;
-import sonia.scm.store.InMemoryConfigurationEntryStore;
+import sonia.scm.security.DefaultKeyGenerator;
+import sonia.scm.store.ConfigurationEntryStoreFactory;
+import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
 
 import javax.xml.bind.JAXBException;
 import java.io.IOException;
@@ -26,6 +26,7 @@ import java.util.Optional;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.linesOf;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
@@ -45,13 +46,14 @@ class XmlGroupV1UpdateStepTest {
   ArgumentCaptor<Group> groupCaptor;
 
   XmlGroupV1UpdateStep updateStep;
-  ConfigurationEntryStore<AssignedPermission> assignedPermissionStore;
+
+  ConfigurationEntryStoreFactory storeFactory;
 
   @BeforeEach
   void mockScmHome(@TempDirectory.TempDir Path tempDir) {
     when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
-    assignedPermissionStore = new InMemoryConfigurationEntryStore<>();
-    updateStep = new XmlGroupV1UpdateStep(contextProvider, groupDAO);
+    storeFactory = new JAXBConfigurationEntryStoreFactory(contextProvider, null, new DefaultKeyGenerator());
+    updateStep = new XmlGroupV1UpdateStep(contextProvider, groupDAO, storeFactory);
   }
 
   @Nested
@@ -88,6 +90,24 @@ class XmlGroupV1UpdateStepTest {
         .hasFieldOrPropertyWithValue("lastModified", 1559550955883L)
         .hasFieldOrPropertyWithValue("creationDate", 1559548942457L);
     }
+
+    @Test
+    void shouldExtractProperties(@TempDirectory.TempDir Path tempDir) throws JAXBException {
+      updateStep.doUpdate();
+      Path propertiesFile = tempDir.resolve("config").resolve("group-properties-v1.xml");
+      assertThat(propertiesFile)
+        .exists();
+      assertThat(linesOf(propertiesFile.toFile()))
+        .extracting(String::trim)
+        .containsSequence(
+          "<key>normals</key>",
+          "<value>",
+          "<item>",
+          "<key>mostly</key>",
+          "<value>humans</value>",
+          "</item>",
+          "</value>");
+    }
   }
 
   private void copyTestDatabaseFile(Path configDir, String groupsFileName) throws IOException {
diff --git a/scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java
index 764fda2c5d..0d0920620c 100644
--- a/scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java
@@ -12,10 +12,9 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.security.AssignedPermission;
-import sonia.scm.store.ConfigurationEntryStore;
+import sonia.scm.security.DefaultKeyGenerator;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
-import sonia.scm.store.InMemoryConfigurationEntryStore;
-import sonia.scm.store.InMemoryConfigurationEntryStoreFactory;
+import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
 import sonia.scm.user.User;
 import sonia.scm.user.xml.XmlUserDAO;
 
@@ -27,6 +26,7 @@ import java.nio.file.Path;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.linesOf;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
@@ -46,14 +46,14 @@ class XmlUserV1UpdateStepTest {
   ArgumentCaptor<User> userCaptor;
 
   XmlUserV1UpdateStep updateStep;
-  ConfigurationEntryStore<AssignedPermission> assignedPermissionStore;
+
+  ConfigurationEntryStoreFactory storeFactory;
 
   @BeforeEach
   void mockScmHome(@TempDirectory.TempDir Path tempDir) {
     when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
-    assignedPermissionStore = new InMemoryConfigurationEntryStore<>();
-    ConfigurationEntryStoreFactory inMemoryConfigurationEntryStoreFactory = new InMemoryConfigurationEntryStoreFactory(assignedPermissionStore);
-    updateStep = new XmlUserV1UpdateStep(contextProvider, userDAO, inMemoryConfigurationEntryStoreFactory);
+    storeFactory = new JAXBConfigurationEntryStoreFactory(contextProvider, null, new DefaultKeyGenerator());
+    updateStep = new XmlUserV1UpdateStep(contextProvider, userDAO, storeFactory);
   }
 
   @Nested
@@ -74,7 +74,16 @@ class XmlUserV1UpdateStepTest {
     @Test
     void shouldCreateNewPermissionsForV1AdminUser() throws JAXBException {
       updateStep.doUpdate();
-      Optional<AssignedPermission> assignedPermission = assignedPermissionStore.getAll().values().stream().filter(a -> a.getName().equals("scmadmin")).findFirst();
+      Optional<AssignedPermission> assignedPermission =
+        storeFactory
+          .withType(AssignedPermission.class)
+          .withName("security")
+          .build()
+          .getAll()
+          .values()
+          .stream()
+          .filter(a -> a.getName().equals("scmadmin"))
+          .findFirst();
       assertThat(assignedPermission.get().getPermission().getValue()).contains("*");
       assertThat(assignedPermission.get().isGroupPermission()).isFalse();
     }
@@ -100,6 +109,28 @@ class XmlUserV1UpdateStepTest {
         .hasFieldOrPropertyWithValue("lastModified", 1558597367492L)
         .hasFieldOrPropertyWithValue("creationDate", 1558597074732L);
     }
+
+    @Test
+    void shouldExtractProperties(@TempDirectory.TempDir Path tempDir) throws JAXBException {
+      updateStep.doUpdate();
+      Path propertiesFile = tempDir.resolve("config").resolve("user-properties-v1.xml");
+      assertThat(propertiesFile)
+        .exists();
+      assertThat(linesOf(propertiesFile.toFile()))
+        .extracting(String::trim)
+        .containsSequence(
+          "<key>dent</key>",
+          "<value>",
+          "<item>",
+          "<key>born.on</key>",
+          "<value>earth</value>",
+          "</item>",
+          "<item>",
+          "<key>last.seen</key>",
+          "<value>end of the universe</value>",
+          "</item>",
+          "</value>");
+    }
   }
 
   private void copyTestDatabaseFile(Path configDir, String usersFileName) throws IOException {
diff --git a/scm-webapp/src/test/resources/sonia/scm/group/update/groups.xml b/scm-webapp/src/test/resources/sonia/scm/group/update/groups.xml
index f058a01e7a..97cd98c17c 100644
--- a/scm-webapp/src/test/resources/sonia/scm/group/update/groups.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/group/update/groups.xml
@@ -11,7 +11,12 @@
             <type>xml</type>
         </group>
         <group>
-            <properties/>
+            <properties>
+              <item>
+                <key>mostly</key>
+                <value>humans</value>
+              </item>
+            </properties>
             <creationDate>1559548942457</creationDate>
             <description>Normal people</description>
             <name>normals</name>
diff --git a/scm-webapp/src/test/resources/sonia/scm/user/update/users.xml b/scm-webapp/src/test/resources/sonia/scm/user/update/users.xml
index f586996384..d82b2fcb1d 100644
--- a/scm-webapp/src/test/resources/sonia/scm/user/update/users.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/user/update/users.xml
@@ -24,7 +24,16 @@
             <type>xml</type>
         </user>
         <user>
-            <properties/>
+            <properties>
+                <item>
+                    <key>born.on</key>
+                    <value>earth</value>
+                </item>
+                <item>
+                    <key>last.seen</key>
+                    <value>end of the universe</value>
+                </item>
+            </properties>
             <admin>false</admin>
             <creationDate>1558597107621</creationDate>
             <displayName>Arthur Dent</displayName>

From 7c50ad07ec5d8b19ca2e776135961f39f0fd2742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 3 Jun 2019 15:24:19 +0200
Subject: [PATCH 2/4] Extract common code

---
 .../group}/XmlGroupV1UpdateStep.java          |  17 +----
 .../scm/update/properties/V1Properties.java   |  14 ++++
 .../scm/update/properties/V1Property.java     |  10 +++
 .../repository}/BaseMigrationStrategy.java    |   2 +-
 .../repository}/CopyMigrationStrategy.java    |   2 +-
 .../repository}/InlineMigrationStrategy.java  |   2 +-
 .../repository}/MigrationStrategy.java        |   2 +-
 .../repository}/MigrationStrategyDao.java     |   2 +-
 .../repository}/MoveMigrationStrategy.java    |   2 +-
 .../repository}/RepositoryMigrationPlan.java  |   2 +-
 .../XmlRepositoryFileNameUpdateStep.java      |   2 +-
 .../XmlRepositoryV1UpdateStep.java            |  16 +----
 .../security}/XmlSecurityV1UpdateStep.java    |   2 +-
 .../user}/XmlUserV1UpdateStep.java            |  16 +----
 .../sonia/scm/update/UpdateStepTestUtil.java  |  63 ++++++++++++++++++
 .../group}/XmlGroupV1UpdateStepTest.java      |  36 +++-------
 .../CopyMigrationStrategyTest.java            |   2 +-
 .../InlineMigrationStrategyTest.java          |   2 +-
 .../repository}/MigrationStrategyDaoTest.java |   6 +-
 .../repository}/MigrationStrategyMock.java    |   4 +-
 .../MoveMigrationStrategyTest.java            |   2 +-
 .../repository}/V1RepositoryFileSystem.java   |   4 +-
 .../XmlRepositoryFileNameUpdateStepTest.java  |   4 +-
 .../XmlRepositoryV1UpdateStepTest.java        |  10 +--
 .../XmlSecurityV1UpdateStepTest.java          |   5 +-
 .../user}/XmlUserV1UpdateStepTest.java        |  40 +++--------
 .../scm/repository/update/scm-home.v1.zip     | Bin 13412 -> 0 bytes
 .../{group/update => update/group}/groups.xml |   0
 .../repository}/formerV2RepositoryFile.xml    |   0
 .../scm/update/repository/scm-home.v1.zip     | Bin 0 -> 13593 bytes
 .../update => update/security}/config.xml     |   0
 .../{user/update => update/user}/users.xml    |   0
 32 files changed, 143 insertions(+), 126 deletions(-)
 rename scm-webapp/src/main/java/sonia/scm/{group/update => update/group}/XmlGroupV1UpdateStep.java (92%)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/update/properties/V1Properties.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/update/properties/V1Property.java
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/BaseMigrationStrategy.java (97%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/CopyMigrationStrategy.java (97%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/InlineMigrationStrategy.java (97%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/MigrationStrategy.java (93%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/MigrationStrategyDao.java (95%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/MoveMigrationStrategy.java (98%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/RepositoryMigrationPlan.java (98%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/XmlRepositoryFileNameUpdateStep.java (98%)
 rename scm-webapp/src/main/java/sonia/scm/{repository/update => update/repository}/XmlRepositoryV1UpdateStep.java (96%)
 rename scm-webapp/src/main/java/sonia/scm/{security/update => update/security}/XmlSecurityV1UpdateStep.java (99%)
 rename scm-webapp/src/main/java/sonia/scm/{user/update => update/user}/XmlUserV1UpdateStep.java (94%)
 create mode 100644 scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java
 rename scm-webapp/src/test/java/sonia/scm/{group/update => update/group}/XmlGroupV1UpdateStepTest.java (66%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/CopyMigrationStrategyTest.java (98%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/InlineMigrationStrategyTest.java (97%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/MigrationStrategyDaoTest.java (90%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/MigrationStrategyMock.java (85%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/MoveMigrationStrategyTest.java (98%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/V1RepositoryFileSystem.java (96%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/XmlRepositoryFileNameUpdateStepTest.java (93%)
 rename scm-webapp/src/test/java/sonia/scm/{repository/update => update/repository}/XmlRepositoryV1UpdateStepTest.java (96%)
 rename scm-webapp/src/test/java/sonia/scm/{security/update => update/security}/XmlSecurityV1UpdateStepTest.java (95%)
 rename scm-webapp/src/test/java/sonia/scm/{user/update => update/user}/XmlUserV1UpdateStepTest.java (69%)
 delete mode 100644 scm-webapp/src/test/resources/sonia/scm/repository/update/scm-home.v1.zip
 rename scm-webapp/src/test/resources/sonia/scm/{group/update => update/group}/groups.xml (100%)
 rename scm-webapp/src/test/resources/sonia/scm/{repository/update => update/repository}/formerV2RepositoryFile.xml (100%)
 create mode 100644 scm-webapp/src/test/resources/sonia/scm/update/repository/scm-home.v1.zip
 rename scm-webapp/src/test/resources/sonia/scm/{security/update => update/security}/config.xml (100%)
 rename scm-webapp/src/test/resources/sonia/scm/{user/update => update/user}/users.xml (100%)

diff --git a/scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java
similarity index 92%
rename from scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java
rename to scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java
index 7589fe5db7..3f3b25352d 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java
@@ -1,4 +1,4 @@
-package sonia.scm.group.update;
+package sonia.scm.update.group;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,6 +11,7 @@ import sonia.scm.plugin.Extension;
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.StoreConstants;
+import sonia.scm.update.properties.V1Properties;
 import sonia.scm.version.Version;
 
 import javax.inject.Inject;
@@ -25,7 +26,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 import static java.util.Optional.empty;
@@ -140,19 +140,6 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
     }
   }
 
-  @XmlAccessorType(XmlAccessType.FIELD)
-  private static class V1Property {
-    private String key;
-    private String value;
-  }
-
-  @XmlAccessorType(XmlAccessType.FIELD)
-  @XmlRootElement(name = "properties")
-  private static class V1Properties {
-    @XmlElement(name = "item")
-    private List<V1Property> properties;
-  }
-
   private static class GroupList {
     @XmlElement(name = "group")
     private List<V1Group> groups;
diff --git a/scm-webapp/src/main/java/sonia/scm/update/properties/V1Properties.java b/scm-webapp/src/main/java/sonia/scm/update/properties/V1Properties.java
new file mode 100644
index 0000000000..3c8555a76e
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/update/properties/V1Properties.java
@@ -0,0 +1,14 @@
+package sonia.scm.update.properties;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "properties")
+public class V1Properties {
+  @XmlElement(name = "item")
+  private List<V1Property> properties;
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/update/properties/V1Property.java b/scm-webapp/src/main/java/sonia/scm/update/properties/V1Property.java
new file mode 100644
index 0000000000..c92c15188d
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/update/properties/V1Property.java
@@ -0,0 +1,10 @@
+package sonia.scm.update.properties;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class V1Property {
+  private String key;
+  private String value;
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/BaseMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java
similarity index 97%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/BaseMigrationStrategy.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java
index 3ac0a6fd68..adb903af51 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/BaseMigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import sonia.scm.SCMContextProvider;
 import sonia.scm.migration.UpdateException;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/update/repository/CopyMigrationStrategy.java
similarity index 97%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/CopyMigrationStrategy.java
index c5550b29af..060ed6704e 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/CopyMigrationStrategy.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import sonia.scm.SCMContextProvider;
 import sonia.scm.repository.RepositoryDirectoryHandler;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/update/repository/InlineMigrationStrategy.java
similarity index 97%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/InlineMigrationStrategy.java
index ace6a63ab8..62dd67d86a 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/InlineMigrationStrategy.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import sonia.scm.SCMContextProvider;
 import sonia.scm.repository.RepositoryDirectoryHandler;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategy.java
similarity index 93%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategy.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategy.java
index 6ff631208c..c7bb2cba86 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategy.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import com.google.inject.Injector;
 
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategyDao.java b/scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java
similarity index 95%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategyDao.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java
index f98e697468..15c931bf31 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategyDao.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import sonia.scm.store.ConfigurationStore;
 import sonia.scm.store.ConfigurationStoreFactory;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/update/repository/MoveMigrationStrategy.java
similarity index 98%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/MoveMigrationStrategy.java
index e42d4138bb..08d71dd376 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/MoveMigrationStrategy.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/RepositoryMigrationPlan.java b/scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java
similarity index 98%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/RepositoryMigrationPlan.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java
index 126bca8a23..f2b2dc9788 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/RepositoryMigrationPlan.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryFileNameUpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryFileNameUpdateStep.java
similarity index 98%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryFileNameUpdateStep.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryFileNameUpdateStep.java
index 765f3c6317..62902713f0 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryFileNameUpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryFileNameUpdateStep.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
similarity index 96%
rename from scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryV1UpdateStep.java
rename to scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
index 813d42818f..a3b511a06b 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import com.google.inject.Injector;
 import org.slf4j.Logger;
@@ -13,6 +13,7 @@ import sonia.scm.repository.xml.XmlRepositoryDAO;
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.StoreConstants;
+import sonia.scm.update.properties.V1Properties;
 import sonia.scm.version.Version;
 
 import javax.inject.Inject;
@@ -199,19 +200,6 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
     private String type;
   }
 
-  @XmlAccessorType(XmlAccessType.FIELD)
-  private static class V1Property {
-    private String key;
-    private String value;
-  }
-
-  @XmlAccessorType(XmlAccessType.FIELD)
-  @XmlRootElement(name = "properties")
-  private static class V1Properties {
-    @XmlElement(name = "item")
-    private List<V1Property> properties;
-  }
-
   @XmlAccessorType(XmlAccessType.FIELD)
   @XmlRootElement(name = "repositories")
   private static class V1Repository {
diff --git a/scm-webapp/src/main/java/sonia/scm/security/update/XmlSecurityV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/security/XmlSecurityV1UpdateStep.java
similarity index 99%
rename from scm-webapp/src/main/java/sonia/scm/security/update/XmlSecurityV1UpdateStep.java
rename to scm-webapp/src/main/java/sonia/scm/update/security/XmlSecurityV1UpdateStep.java
index 52bf8124e3..f62b81b5df 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/update/XmlSecurityV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/security/XmlSecurityV1UpdateStep.java
@@ -1,4 +1,4 @@
-package sonia.scm.security.update;
+package sonia.scm.update.security;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java
similarity index 94%
rename from scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java
rename to scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java
index d02de8067d..9878304585 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java
@@ -1,4 +1,4 @@
-package sonia.scm.user.update;
+package sonia.scm.update.user;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,6 +10,7 @@ import sonia.scm.security.AssignedPermission;
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.StoreConstants;
+import sonia.scm.update.properties.V1Properties;
 import sonia.scm.user.User;
 import sonia.scm.user.xml.XmlUserDAO;
 import sonia.scm.version.Version;
@@ -125,19 +126,6 @@ public class XmlUserV1UpdateStep implements UpdateStep {
     return new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME).toPath();
   }
 
-  @XmlAccessorType(XmlAccessType.FIELD)
-  private static class V1Property {
-    private String key;
-    private String value;
-  }
-
-  @XmlAccessorType(XmlAccessType.FIELD)
-  @XmlRootElement(name = "properties")
-  private static class V1Properties {
-    @XmlElement(name = "item")
-    private List<V1Property> properties;
-  }
-
   @XmlAccessorType(XmlAccessType.FIELD)
   @XmlRootElement(name = "user")
   private static class V1User {
diff --git a/scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java b/scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java
new file mode 100644
index 0000000000..f077d783b3
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java
@@ -0,0 +1,63 @@
+package sonia.scm.update;
+
+import com.google.common.io.Resources;
+import org.mockito.Mockito;
+import sonia.scm.SCMContextProvider;
+import sonia.scm.security.AssignedPermission;
+import sonia.scm.security.DefaultKeyGenerator;
+import sonia.scm.store.ConfigurationEntryStore;
+import sonia.scm.store.ConfigurationEntryStoreFactory;
+import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.mockito.Mockito.when;
+
+public class UpdateStepTestUtil {
+
+private final SCMContextProvider contextProvider;
+
+  private final Path tempDir;
+  private final ConfigurationEntryStoreFactory storeFactory;
+
+  public UpdateStepTestUtil(Path tempDir) {
+    this.tempDir = tempDir;
+    contextProvider = Mockito.mock(SCMContextProvider.class);
+    storeFactory = new JAXBConfigurationEntryStoreFactory(contextProvider, null, new DefaultKeyGenerator());
+    when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
+  }
+
+  public SCMContextProvider getContextProvider() {
+    return contextProvider;
+  }
+
+  public ConfigurationEntryStoreFactory getStoreFactory() {
+    return storeFactory;
+  }
+
+  public void copyConfigFile(String fileName) throws IOException {
+    Path configDir = tempDir.resolve("config");
+    Files.createDirectories(configDir);
+    copyTestDatabaseFile(configDir, fileName);
+  }
+
+  public ConfigurationEntryStore<AssignedPermission> getStoreForConfigFile(String name) {
+    return storeFactory
+      .withType(AssignedPermission.class)
+      .withName(name)
+      .build();
+  }
+
+  public Path getFile(String name) {
+    return tempDir.resolve("config").resolve(name);
+  }
+
+  private void copyTestDatabaseFile(Path configDir, String fileName) throws IOException {
+    URL url = Resources.getResource(fileName);
+    Files.copy(url.openStream(), configDir.resolve(Paths.get(fileName).getFileName()));
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/group/update/XmlGroupV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/update/group/XmlGroupV1UpdateStepTest.java
similarity index 66%
rename from scm-webapp/src/test/java/sonia/scm/group/update/XmlGroupV1UpdateStepTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/group/XmlGroupV1UpdateStepTest.java
index ab82771304..394dc44109 100644
--- a/scm-webapp/src/test/java/sonia/scm/group/update/XmlGroupV1UpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/group/XmlGroupV1UpdateStepTest.java
@@ -1,6 +1,5 @@
-package sonia.scm.group.update;
+package sonia.scm.update.group;
 
-import com.google.common.io.Resources;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -10,17 +9,12 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import sonia.scm.SCMContextProvider;
 import sonia.scm.group.Group;
 import sonia.scm.group.xml.XmlGroupDAO;
-import sonia.scm.security.DefaultKeyGenerator;
-import sonia.scm.store.ConfigurationEntryStoreFactory;
-import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
+import sonia.scm.update.UpdateStepTestUtil;
 
 import javax.xml.bind.JAXBException;
 import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
 
@@ -31,14 +25,11 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 @ExtendWith(TempDirectory.class)
 class XmlGroupV1UpdateStepTest {
 
-  @Mock
-  SCMContextProvider contextProvider;
   @Mock
   XmlGroupDAO groupDAO;
 
@@ -47,13 +38,13 @@ class XmlGroupV1UpdateStepTest {
 
   XmlGroupV1UpdateStep updateStep;
 
-  ConfigurationEntryStoreFactory storeFactory;
+  private UpdateStepTestUtil testUtil;
+
 
   @BeforeEach
   void mockScmHome(@TempDirectory.TempDir Path tempDir) {
-    when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
-    storeFactory = new JAXBConfigurationEntryStoreFactory(contextProvider, null, new DefaultKeyGenerator());
-    updateStep = new XmlGroupV1UpdateStep(contextProvider, groupDAO, storeFactory);
+    testUtil = new UpdateStepTestUtil(tempDir);
+    updateStep = new XmlGroupV1UpdateStep(testUtil.getContextProvider(), groupDAO, testUtil.getStoreFactory());
   }
 
   @Nested
@@ -65,10 +56,8 @@ class XmlGroupV1UpdateStepTest {
     }
 
     @BeforeEach
-    void createGroupV1XML(@TempDirectory.TempDir Path tempDir) throws IOException {
-      Path configDir = tempDir.resolve("config");
-      Files.createDirectories(configDir);
-      copyTestDatabaseFile(configDir, "groups.xml");
+    void createGroupV1XML() throws IOException {
+      testUtil.copyConfigFile("sonia/scm/update/group/groups.xml");
     }
 
     @Test
@@ -92,9 +81,9 @@ class XmlGroupV1UpdateStepTest {
     }
 
     @Test
-    void shouldExtractProperties(@TempDirectory.TempDir Path tempDir) throws JAXBException {
+    void shouldExtractProperties() throws JAXBException {
       updateStep.doUpdate();
-      Path propertiesFile = tempDir.resolve("config").resolve("group-properties-v1.xml");
+      Path propertiesFile = testUtil.getFile("group-properties-v1.xml");
       assertThat(propertiesFile)
         .exists();
       assertThat(linesOf(propertiesFile.toFile()))
@@ -110,11 +99,6 @@ class XmlGroupV1UpdateStepTest {
     }
   }
 
-  private void copyTestDatabaseFile(Path configDir, String groupsFileName) throws IOException {
-    URL url = Resources.getResource("sonia/scm/group/update/" + groupsFileName);
-    Files.copy(url.openStream(), configDir.resolve(groupsFileName));
-  }
-
   @Test
   void shouldNotFailForMissingConfigDir() throws JAXBException {
     updateStep.doUpdate();
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/CopyMigrationStrategyTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/CopyMigrationStrategyTest.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/CopyMigrationStrategyTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/CopyMigrationStrategyTest.java
index d7217bec48..b40283ae79 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/CopyMigrationStrategyTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/CopyMigrationStrategyTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/InlineMigrationStrategyTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/InlineMigrationStrategyTest.java
similarity index 97%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/InlineMigrationStrategyTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/InlineMigrationStrategyTest.java
index ed0d7eeb40..6abddae3fb 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/InlineMigrationStrategyTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/InlineMigrationStrategyTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/MigrationStrategyDaoTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyDaoTest.java
similarity index 90%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/MigrationStrategyDaoTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyDaoTest.java
index a7365ce656..e3fd4457b6 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/MigrationStrategyDaoTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyDaoTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -11,13 +11,15 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.store.ConfigurationStoreFactory;
 import sonia.scm.store.JAXBConfigurationStoreFactory;
+import sonia.scm.update.repository.MigrationStrategy;
+import sonia.scm.update.repository.MigrationStrategyDao;
 
 import javax.xml.bind.JAXBException;
 import java.nio.file.Path;
 import java.util.Optional;
 
 import static org.mockito.Mockito.when;
-import static sonia.scm.repository.update.MigrationStrategy.INLINE;
+import static sonia.scm.update.repository.MigrationStrategy.INLINE;
 
 @ExtendWith(MockitoExtension.class)
 @ExtendWith(TempDirectory.class)
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/MigrationStrategyMock.java b/scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyMock.java
similarity index 85%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/MigrationStrategyMock.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyMock.java
index e0ee39880f..e0018f584f 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/MigrationStrategyMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyMock.java
@@ -1,7 +1,7 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import com.google.inject.Injector;
-import sonia.scm.repository.update.MigrationStrategy.Instance;
+import sonia.scm.update.repository.MigrationStrategy.Instance;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/MoveMigrationStrategyTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/MoveMigrationStrategyTest.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/MoveMigrationStrategyTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/MoveMigrationStrategyTest.java
index ce894516df..b55315d85f 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/MoveMigrationStrategyTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/MoveMigrationStrategyTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/V1RepositoryFileSystem.java b/scm-webapp/src/test/java/sonia/scm/update/repository/V1RepositoryFileSystem.java
similarity index 96%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/V1RepositoryFileSystem.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/V1RepositoryFileSystem.java
index 146953d790..5baf5200fc 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/V1RepositoryFileSystem.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/V1RepositoryFileSystem.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import sonia.scm.repository.spi.ZippedRepositoryTestBase;
 
@@ -62,6 +62,6 @@ class V1RepositoryFileSystem {
    * </pre>
    */
   static void createV1Home(Path tempDir) throws IOException {
-    ZippedRepositoryTestBase.extract(tempDir.toFile(), "sonia/scm/repository/update/scm-home.v1.zip");
+    ZippedRepositoryTestBase.extract(tempDir.toFile(), "sonia/scm/update/repository/scm-home.v1.zip");
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/XmlRepositoryFileNameUpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryFileNameUpdateStepTest.java
similarity index 93%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/XmlRepositoryFileNameUpdateStepTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryFileNameUpdateStepTest.java
index 6314e02783..51be47fc82 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/XmlRepositoryFileNameUpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryFileNameUpdateStepTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import com.google.common.io.Resources;
 import org.junit.jupiter.api.BeforeEach;
@@ -31,7 +31,7 @@ class XmlRepositoryFileNameUpdateStepTest {
   @Test
   void shouldCopyRepositoriesFileToRepositoryPathsFile(@TempDirectory.TempDir Path tempDir) throws JAXBException, IOException {
     XmlRepositoryFileNameUpdateStep updateStep = new XmlRepositoryFileNameUpdateStep(contextProvider);
-    URL url = Resources.getResource("sonia/scm/repository/update/formerV2RepositoryFile.xml");
+    URL url = Resources.getResource("sonia/scm/update/repository/formerV2RepositoryFile.xml");
     Path configDir = tempDir.resolve("config");
     Files.createDirectories(configDir);
     Files.copy(url.openStream(), configDir.resolve("repositories.xml"));
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/update/XmlRepositoryV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java
similarity index 96%
rename from scm-webapp/src/test/java/sonia/scm/repository/update/XmlRepositoryV1UpdateStepTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java
index 773d7bd447..438a54b70d 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/update/XmlRepositoryV1UpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.repository.update;
+package sonia.scm.update.repository;
 
 import com.google.common.io.Resources;
 import com.google.inject.Injector;
@@ -36,9 +36,9 @@ import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static sonia.scm.repository.update.MigrationStrategy.COPY;
-import static sonia.scm.repository.update.MigrationStrategy.INLINE;
-import static sonia.scm.repository.update.MigrationStrategy.MOVE;
+import static sonia.scm.update.repository.MigrationStrategy.COPY;
+import static sonia.scm.update.repository.MigrationStrategy.INLINE;
+import static sonia.scm.update.repository.MigrationStrategy.MOVE;
 
 @ExtendWith(MockitoExtension.class)
 @ExtendWith(TempDirectory.class)
@@ -226,7 +226,7 @@ class XmlRepositoryV1UpdateStepTest {
   }
 
   private void createFormerV2RepositoriesFile(@TempDirectory.TempDir Path tempDir) throws IOException {
-    URL url = Resources.getResource("sonia/scm/repository/update/formerV2RepositoryFile.xml");
+    URL url = Resources.getResource("sonia/scm/update/repository/formerV2RepositoryFile.xml");
     Path configDir = tempDir.resolve("config");
     Files.createDirectories(configDir);
     Files.copy(url.openStream(), configDir.resolve("repositories.xml"));
diff --git a/scm-webapp/src/test/java/sonia/scm/security/update/XmlSecurityV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/update/security/XmlSecurityV1UpdateStepTest.java
similarity index 95%
rename from scm-webapp/src/test/java/sonia/scm/security/update/XmlSecurityV1UpdateStepTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/security/XmlSecurityV1UpdateStepTest.java
index 62e82ce168..f8949d73a5 100644
--- a/scm-webapp/src/test/java/sonia/scm/security/update/XmlSecurityV1UpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/security/XmlSecurityV1UpdateStepTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.security.update;
+package sonia.scm.update.security;
 
 import com.google.common.io.Resources;
 import org.junit.jupiter.api.BeforeEach;
@@ -14,6 +14,7 @@ import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.InMemoryConfigurationEntryStore;
 import sonia.scm.store.InMemoryConfigurationEntryStoreFactory;
+import sonia.scm.update.security.XmlSecurityV1UpdateStep;
 
 import javax.xml.bind.JAXBException;
 import java.io.IOException;
@@ -82,7 +83,7 @@ class XmlSecurityV1UpdateStepTest {
   }
 
   private void copyTestDatabaseFile(Path configDir, String fileName) throws IOException {
-    URL url = Resources.getResource("sonia/scm/security/update/" + fileName);
+    URL url = Resources.getResource("sonia/scm/update/security/" + fileName);
     Files.copy(url.openStream(), configDir.resolve(fileName));
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/update/user/XmlUserV1UpdateStepTest.java
similarity index 69%
rename from scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java
rename to scm-webapp/src/test/java/sonia/scm/update/user/XmlUserV1UpdateStepTest.java
index 0d0920620c..19d37d542d 100644
--- a/scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/user/XmlUserV1UpdateStepTest.java
@@ -1,6 +1,5 @@
-package sonia.scm.user.update;
+package sonia.scm.update.user;
 
-import com.google.common.io.Resources;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -10,18 +9,13 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import sonia.scm.SCMContextProvider;
 import sonia.scm.security.AssignedPermission;
-import sonia.scm.security.DefaultKeyGenerator;
-import sonia.scm.store.ConfigurationEntryStoreFactory;
-import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
+import sonia.scm.update.UpdateStepTestUtil;
 import sonia.scm.user.User;
 import sonia.scm.user.xml.XmlUserDAO;
 
 import javax.xml.bind.JAXBException;
 import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
 
@@ -31,14 +25,11 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 @ExtendWith(TempDirectory.class)
 class XmlUserV1UpdateStepTest {
 
-  @Mock
-  SCMContextProvider contextProvider;
   @Mock
   XmlUserDAO userDAO;
 
@@ -47,13 +38,12 @@ class XmlUserV1UpdateStepTest {
 
   XmlUserV1UpdateStep updateStep;
 
-  ConfigurationEntryStoreFactory storeFactory;
+  private UpdateStepTestUtil testUtil;
 
   @BeforeEach
   void mockScmHome(@TempDirectory.TempDir Path tempDir) {
-    when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
-    storeFactory = new JAXBConfigurationEntryStoreFactory(contextProvider, null, new DefaultKeyGenerator());
-    updateStep = new XmlUserV1UpdateStep(contextProvider, userDAO, storeFactory);
+    testUtil = new UpdateStepTestUtil(tempDir);
+    updateStep = new XmlUserV1UpdateStep(testUtil.getContextProvider(), userDAO, testUtil.getStoreFactory());
   }
 
   @Nested
@@ -65,20 +55,15 @@ class XmlUserV1UpdateStepTest {
     }
 
     @BeforeEach
-    void createUserV1XML(@TempDirectory.TempDir Path tempDir) throws IOException {
-      Path configDir = tempDir.resolve("config");
-      Files.createDirectories(configDir);
-      copyTestDatabaseFile(configDir, "users.xml");
+    void createUserV1XML() throws IOException {
+      testUtil.copyConfigFile("sonia/scm/update/user/users.xml");
     }
 
     @Test
     void shouldCreateNewPermissionsForV1AdminUser() throws JAXBException {
       updateStep.doUpdate();
       Optional<AssignedPermission> assignedPermission =
-        storeFactory
-          .withType(AssignedPermission.class)
-          .withName("security")
-          .build()
+        testUtil.getStoreForConfigFile("security")
           .getAll()
           .values()
           .stream()
@@ -111,9 +96,9 @@ class XmlUserV1UpdateStepTest {
     }
 
     @Test
-    void shouldExtractProperties(@TempDirectory.TempDir Path tempDir) throws JAXBException {
+    void shouldExtractProperties() throws JAXBException {
       updateStep.doUpdate();
-      Path propertiesFile = tempDir.resolve("config").resolve("user-properties-v1.xml");
+      Path propertiesFile = testUtil.getFile("user-properties-v1.xml");
       assertThat(propertiesFile)
         .exists();
       assertThat(linesOf(propertiesFile.toFile()))
@@ -133,11 +118,6 @@ class XmlUserV1UpdateStepTest {
     }
   }
 
-  private void copyTestDatabaseFile(Path configDir, String usersFileName) throws IOException {
-    URL url = Resources.getResource("sonia/scm/user/update/" + usersFileName);
-    Files.copy(url.openStream(), configDir.resolve(usersFileName));
-  }
-
   @Test
   void shouldNotFailForMissingConfigDir() throws JAXBException {
     updateStep.doUpdate();
diff --git a/scm-webapp/src/test/resources/sonia/scm/repository/update/scm-home.v1.zip b/scm-webapp/src/test/resources/sonia/scm/repository/update/scm-home.v1.zip
deleted file mode 100644
index 0d43f2f4d6a0b5f595e58cda18933e1565bbc083..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13412
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

diff --git a/scm-webapp/src/test/resources/sonia/scm/group/update/groups.xml b/scm-webapp/src/test/resources/sonia/scm/update/group/groups.xml
similarity index 100%
rename from scm-webapp/src/test/resources/sonia/scm/group/update/groups.xml
rename to scm-webapp/src/test/resources/sonia/scm/update/group/groups.xml
diff --git a/scm-webapp/src/test/resources/sonia/scm/repository/update/formerV2RepositoryFile.xml b/scm-webapp/src/test/resources/sonia/scm/update/repository/formerV2RepositoryFile.xml
similarity index 100%
rename from scm-webapp/src/test/resources/sonia/scm/repository/update/formerV2RepositoryFile.xml
rename to scm-webapp/src/test/resources/sonia/scm/update/repository/formerV2RepositoryFile.xml
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/repository/scm-home.v1.zip b/scm-webapp/src/test/resources/sonia/scm/update/repository/scm-home.v1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5d936db5e264ac6182855e34a5aae82871c2c3fd
GIT binary patch
literal 13593
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
Qn+yHf3Kj7INQ6T99}&d;jsO4v

literal 0
HcmV?d00001

diff --git a/scm-webapp/src/test/resources/sonia/scm/security/update/config.xml b/scm-webapp/src/test/resources/sonia/scm/update/security/config.xml
similarity index 100%
rename from scm-webapp/src/test/resources/sonia/scm/security/update/config.xml
rename to scm-webapp/src/test/resources/sonia/scm/update/security/config.xml
diff --git a/scm-webapp/src/test/resources/sonia/scm/user/update/users.xml b/scm-webapp/src/test/resources/sonia/scm/update/user/users.xml
similarity index 100%
rename from scm-webapp/src/test/resources/sonia/scm/user/update/users.xml
rename to scm-webapp/src/test/resources/sonia/scm/update/user/users.xml

From da4f3e669187b38e89c93f469cbaf4c12977f674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 3 Jun 2019 16:02:04 +0200
Subject: [PATCH 3/4] Resolve config files via resolve method of context
 provider

---
 .../scm/update/group/XmlGroupV1UpdateStep.java   | 14 ++++++++------
 .../repository/XmlRepositoryV1UpdateStep.java    | 13 ++++++++-----
 .../scm/update/user/XmlUserV1UpdateStep.java     | 14 ++++++++------
 .../sonia/scm/update/UpdateStepTestUtil.java     |  6 ++++--
 .../XmlRepositoryV1UpdateStepTest.java           | 16 ++++++----------
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java
index 3f3b25352d..9622af0f34 100644
--- a/scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java
@@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
 
@@ -96,9 +96,8 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
   }
 
   private Optional<Path> determineV1File() {
-    Path configDirectory = determineConfigDirectory();
-    Path existingGroupsFile = configDirectory.resolve("groups" + StoreConstants.FILE_EXTENSION);
-    Path groupsV1File = configDirectory.resolve("groupsV1" + StoreConstants.FILE_EXTENSION);
+    Path existingGroupsFile = resolveConfigFile("groups");
+    Path groupsV1File = resolveConfigFile("groupsV1");
     if (existingGroupsFile.toFile().exists()) {
       try {
         Files.move(existingGroupsFile, groupsV1File);
@@ -111,8 +110,11 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
     return empty();
   }
 
-  private Path determineConfigDirectory() {
-    return new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME).toPath();
+  private Path resolveConfigFile(String name) {
+    return contextProvider
+      .resolve(
+        Paths.get(StoreConstants.CONFIG_DIRECTORY_NAME).resolve(name + StoreConstants.FILE_EXTENSION)
+      );
   }
 
   @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
index a3b511a06b..34c08fb16b 100644
--- a/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
@@ -27,6 +27,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -94,7 +95,7 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
 
   @Override
   public void doUpdate() throws JAXBException {
-    if (!determineV1File().exists()) {
+    if (!resolveV1File().exists()) {
       LOG.info("no v1 repositories database file found");
       return;
     }
@@ -179,7 +180,7 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
   }
 
   private Optional<V1RepositoryDatabase> readV1Database(JAXBContext jaxbContext) throws JAXBException {
-    Object unmarshal = jaxbContext.createUnmarshaller().unmarshal(determineV1File());
+    Object unmarshal = jaxbContext.createUnmarshaller().unmarshal(resolveV1File());
     if (unmarshal instanceof V1RepositoryDatabase) {
       return of((V1RepositoryDatabase) unmarshal);
     } else {
@@ -187,9 +188,11 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
     }
   }
 
-  private File determineV1File() {
-    File configDirectory = new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME);
-    return new File(configDirectory, "repositories" + StoreConstants.FILE_EXTENSION);
+  private File resolveV1File() {
+    return contextProvider
+      .resolve(
+        Paths.get(StoreConstants.CONFIG_DIRECTORY_NAME).resolve("repositories" + StoreConstants.FILE_EXTENSION)
+      ).toFile();
   }
 
   @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java
index 9878304585..24d96d3654 100644
--- a/scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java
@@ -22,10 +22,10 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
 
@@ -107,9 +107,8 @@ public class XmlUserV1UpdateStep implements UpdateStep {
   }
 
   private Optional<Path> determineV1File() {
-    Path configDirectory = determineConfigDirectory();
-    Path existingUsersFile = configDirectory.resolve("users" + StoreConstants.FILE_EXTENSION);
-    Path usersV1File = configDirectory.resolve("usersV1" + StoreConstants.FILE_EXTENSION);
+    Path existingUsersFile = resolveConfigFile("users");
+    Path usersV1File = resolveConfigFile("usersV1");
     if (existingUsersFile.toFile().exists()) {
       try {
         Files.move(existingUsersFile, usersV1File);
@@ -122,8 +121,11 @@ public class XmlUserV1UpdateStep implements UpdateStep {
     return empty();
   }
 
-  private Path determineConfigDirectory() {
-    return new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME).toPath();
+  private Path resolveConfigFile(String name) {
+    return contextProvider
+      .resolve(
+        Paths.get(StoreConstants.CONFIG_DIRECTORY_NAME).resolve(name + StoreConstants.FILE_EXTENSION)
+      );
   }
 
   @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java b/scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java
index f077d783b3..88b09fc086 100644
--- a/scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/UpdateStepTestUtil.java
@@ -15,7 +15,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
 
 public class UpdateStepTestUtil {
 
@@ -28,7 +29,8 @@ private final SCMContextProvider contextProvider;
     this.tempDir = tempDir;
     contextProvider = Mockito.mock(SCMContextProvider.class);
     storeFactory = new JAXBConfigurationEntryStoreFactory(contextProvider, null, new DefaultKeyGenerator());
-    when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
+    lenient().when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
+    lenient().when(contextProvider.resolve(any())).thenAnswer(invocation -> tempDir.resolve(invocation.getArgument(0).toString()));
   }
 
   public SCMContextProvider getContextProvider() {
diff --git a/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java
index 438a54b70d..2102d296ea 100644
--- a/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java
@@ -11,7 +11,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import sonia.scm.SCMContextProvider;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryPermission;
 import sonia.scm.repository.xml.XmlRepositoryDAO;
@@ -19,6 +18,7 @@ import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.InMemoryConfigurationEntryStore;
 import sonia.scm.store.InMemoryConfigurationEntryStoreFactory;
+import sonia.scm.update.UpdateStepTestUtil;
 
 import javax.xml.bind.JAXBException;
 import java.io.IOException;
@@ -46,8 +46,6 @@ class XmlRepositoryV1UpdateStepTest {
 
   Injector injectorMock = MigrationStrategyMock.init();
 
-  @Mock
-  SCMContextProvider contextProvider;
   @Mock
   XmlRepositoryDAO repositoryDAO;
   @Mock
@@ -60,17 +58,15 @@ class XmlRepositoryV1UpdateStepTest {
   @Captor
   ArgumentCaptor<Path> locationCaptor;
 
+  UpdateStepTestUtil testUtil;
+
   XmlRepositoryV1UpdateStep updateStep;
 
   @BeforeEach
-  void mockScmHome(@TempDirectory.TempDir Path tempDir) {
-    when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
-  }
-
-  @BeforeEach
-  void createUpdateStepFromMocks() {
+  void createUpdateStepFromMocks(@TempDirectory.TempDir Path tempDir) {
+    testUtil = new UpdateStepTestUtil(tempDir);
     updateStep = new XmlRepositoryV1UpdateStep(
-      contextProvider,
+      testUtil.getContextProvider(),
       repositoryDAO,
       migrationStrategyDao,
       injectorMock,

From f598c55c182b4e84a5321824fae7242d248a3229 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 4 Jun 2019 07:23:54 +0000
Subject: [PATCH 4/4] Close branch feature/extract_properties_v1