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

fix renameGlobalConfigFile / add Test

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-06-25 09:12:57 +02:00
parent bd2509e581
commit de8f15abf5
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-dao-xml/src/main/java/sonia/scm/store/JAXBPropertyFileAccess.java
View File

@@ -32,7 +32,7 @@ public class JAXBPropertyFileAccess implements PropertyFileAccess {
return newName -> { return newName -> {
Path configDir = contextProvider.getBaseDirectory().toPath().resolve(StoreConstants.CONFIG_DIRECTORY_NAME); Path configDir = contextProvider.getBaseDirectory().toPath().resolve(StoreConstants.CONFIG_DIRECTORY_NAME);
Path oldConfigFile = configDir.resolve(oldName + XML_FILENAME_SUFFIX); Path oldConfigFile = configDir.resolve(oldName + XML_FILENAME_SUFFIX);
Path newConfigFile = configDir.resolve(oldName + XML_FILENAME_SUFFIX); Path newConfigFile = configDir.resolve(newName + XML_FILENAME_SUFFIX);
Files.move(oldConfigFile, newConfigFile); Files.move(oldConfigFile, newConfigFile);
}; };
} }

33
scm-dao-xml/src/test/java/sonia/scm/store/JAXBPropertyFileAccessTest.java
View File

@@ -1,6 +1,7 @@
package sonia.scm.store; package sonia.scm.store;
import org.assertj.core.api.Assertions; import org.assertj.core.api.Assertions;
import org.junit.Assert;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -16,11 +17,13 @@ import sonia.scm.repository.xml.PathBasedRepositoryLocationResolver;
import sonia.scm.update.PropertyFileAccess; import sonia.scm.update.PropertyFileAccess;
import sonia.scm.util.IOUtil; import sonia.scm.util.IOUtil;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.lenient;
@@ -30,6 +33,9 @@ class JAXBPropertyFileAccessTest {
public static final String REPOSITORY_ID = "repoId"; public static final String REPOSITORY_ID = "repoId";
public static final String STORE_NAME = "test"; public static final String STORE_NAME = "test";
public static final String OLD_FILE_NAME = "old";
public static final String NEW_FILE_NAME = "new";
public static final String CONFIG_DIR = "config";
@Mock @Mock
SCMContextProvider contextProvider; SCMContextProvider contextProvider;
@@ -43,11 +49,28 @@ class JAXBPropertyFileAccessTest {
lenient().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())); lenient().when(contextProvider.resolve(any())).thenAnswer(invocation -> tempDir.resolve(invocation.getArgument(0).toString()));
locationResolver = new PathBasedRepositoryLocationResolver(contextProvider, new InitialRepositoryLocationResolver(), new DefaultFileSystem());//new TempDirRepositoryLocationResolver(tempDir.toFile()); locationResolver = new PathBasedRepositoryLocationResolver(contextProvider, new InitialRepositoryLocationResolver(), new DefaultFileSystem());
fileAccess = new JAXBPropertyFileAccess(contextProvider, locationResolver); fileAccess = new JAXBPropertyFileAccess(contextProvider, locationResolver);
} }
@Test
void shouldRenameGlobalConfigFile() throws IOException {
Path baseDirectory = contextProvider.getBaseDirectory().toPath();
Path configDirectory = baseDirectory.resolve(StoreConstants.CONFIG_DIRECTORY_NAME);
Files.createDirectories(configDirectory);
Path oldPath = configDirectory.resolve("old" + StoreConstants.FILE_EXTENSION);
Files.createFile(oldPath);
fileAccess.renameGlobalConfigurationFrom("old").to("new");
Path newPath = configDirectory.resolve("new" + StoreConstants.FILE_EXTENSION);
assertThat(oldPath).doesNotExist();
assertThat(newPath).exists();
}
@Nested @Nested
class ForExistingRepository { class ForExistingRepository {
@@ -63,7 +86,7 @@ class JAXBPropertyFileAccessTest {
fileAccess.forStoreName(STORE_NAME).moveAsRepositoryStore(Paths.get("myStore.xml"), REPOSITORY_ID); fileAccess.forStoreName(STORE_NAME).moveAsRepositoryStore(Paths.get("myStore.xml"), REPOSITORY_ID);
Assertions.assertThat(tempDir.resolve("repositories").resolve(REPOSITORY_ID).resolve("store").resolve("data").resolve(STORE_NAME).resolve("myStore.xml")).exists(); assertThat(tempDir.resolve("repositories").resolve(REPOSITORY_ID).resolve("store").resolve("data").resolve(STORE_NAME).resolve("myStore.xml")).exists();
} }
@Test @Test
@@ -76,8 +99,8 @@ class JAXBPropertyFileAccessTest {
PropertyFileAccess.StoreFileTools statisticStoreAccess = fileAccess.forStoreName(STORE_NAME); PropertyFileAccess.StoreFileTools statisticStoreAccess = fileAccess.forStoreName(STORE_NAME);
statisticStoreAccess.forStoreFiles(statisticStoreAccess::moveAsRepositoryStore); statisticStoreAccess.forStoreFiles(statisticStoreAccess::moveAsRepositoryStore);
Assertions.assertThat(tempDir.resolve("repositories").resolve(REPOSITORY_ID).resolve("store").resolve("data").resolve(STORE_NAME).resolve("repoId.xml")).exists(); assertThat(tempDir.resolve("repositories").resolve(REPOSITORY_ID).resolve("store").resolve("data").resolve(STORE_NAME).resolve("repoId.xml")).exists();
Assertions.assertThat(tempDir.resolve("repositories").resolve("repoId2").resolve("store").resolve("data").resolve(STORE_NAME).resolve("repoId2.xml")).exists(); assertThat(tempDir.resolve("repositories").resolve("repoId2").resolve("store").resolve("data").resolve(STORE_NAME).resolve("repoId2.xml")).exists();
} }
} }
@@ -96,7 +119,7 @@ class JAXBPropertyFileAccessTest {
fileAccess.forStoreName(STORE_NAME).moveAsRepositoryStore(Paths.get("myStore.xml"), REPOSITORY_ID); fileAccess.forStoreName(STORE_NAME).moveAsRepositoryStore(Paths.get("myStore.xml"), REPOSITORY_ID);
Assertions.assertThat(tempDir.resolve("repositories").resolve(REPOSITORY_ID).resolve("store").resolve("data").resolve(STORE_NAME).resolve("myStore.xml")).doesNotExist(); assertThat(tempDir.resolve("repositories").resolve(REPOSITORY_ID).resolve("store").resolve("data").resolve(STORE_NAME).resolve("myStore.xml")).doesNotExist();
} }
} }
} }