Adjust to changes in Gerrit core Change-Id: Ic4a3717877679cf7acc9b4160c058e965789391b
diff --git a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java index 70d1715..9b59f63 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java
@@ -36,7 +36,7 @@ private static final long DEFAULT_ARCHIVE_DURATION_MS = TimeUnit.DAYS.toMillis(180); private static final String CUSTOM_DURATION = "100"; private static final String CUSTOM_PARENT = "customParent"; - private static final String INVALID_CUSTOM_FOLDER = "\0"; + private static final String INVALID_CUSTOM_FOLDER = "//\\\\\\///////"; private static final String INVALID_ARCHIVE_DURATION = "180weeks180years"; private static final String PLUGIN_NAME = "delete-project"; @@ -56,7 +56,7 @@ @Test public void defaultValuesAreLoaded() { when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)) - .thenReturn(new PluginConfig(PLUGIN_NAME, new Config())); + .thenReturn(PluginConfig.create(PLUGIN_NAME, new Config(), null)); deleteConfig = new Configuration(pluginConfigFactoryMock, PLUGIN_NAME, pluginDataDir); assertThat(deleteConfig.getDeletedProjectsParent()).isEqualTo("Deleted-Projects"); @@ -69,7 +69,7 @@ @Test public void customValuesAreLoaded() { - PluginConfig pluginConfig = new PluginConfig(PLUGIN_NAME, new Config()); + PluginConfig.Update pluginConfig = PluginConfig.Update.forTest(PLUGIN_NAME, new Config()); pluginConfig.setString("parentForDeletedProjects", CUSTOM_PARENT); pluginConfig.setBoolean("allowDeletionOfReposWithTags", false); pluginConfig.setBoolean("hideProjectOnPreserve", true); @@ -77,7 +77,8 @@ pluginConfig.setString("deleteArchivedReposAfter", CUSTOM_DURATION); pluginConfig.setString("archiveFolder", customArchiveFolder.toString()); - when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)).thenReturn(pluginConfig); + when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)) + .thenReturn(pluginConfig.asPluginConfig()); deleteConfig = new Configuration(pluginConfigFactoryMock, PLUGIN_NAME, pluginDataDir); assertThat(deleteConfig.getDeletedProjectsParent()).isEqualTo(CUSTOM_PARENT); @@ -91,10 +92,11 @@ @Test public void archiveDurationWithUnitIsLoaded() { - PluginConfig pluginConfig = new PluginConfig(PLUGIN_NAME, new Config()); + PluginConfig.Update pluginConfig = PluginConfig.Update.forTest(PLUGIN_NAME, new Config()); pluginConfig.setString("deleteArchivedReposAfter", CUSTOM_DURATION + "years"); - when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)).thenReturn(pluginConfig); + when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)) + .thenReturn(pluginConfig.asPluginConfig()); deleteConfig = new Configuration(pluginConfigFactoryMock, PLUGIN_NAME, pluginDataDir); assertThat(deleteConfig.getArchiveDuration()) @@ -103,10 +105,11 @@ @Test public void invalidArchiveDuration() { - PluginConfig pluginConfig = new PluginConfig(PLUGIN_NAME, new Config()); + PluginConfig.Update pluginConfig = PluginConfig.Update.forTest(PLUGIN_NAME, new Config()); pluginConfig.setString("deleteArchivedReposAfter", INVALID_ARCHIVE_DURATION); - when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)).thenReturn(pluginConfig); + when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)) + .thenReturn(pluginConfig.asPluginConfig()); deleteConfig = new Configuration(pluginConfigFactoryMock, PLUGIN_NAME, pluginDataDir); assertThat(deleteConfig.getArchiveDuration()).isEqualTo(DEFAULT_ARCHIVE_DURATION_MS); @@ -114,10 +117,11 @@ @Test public void invalidTargetArchiveFolder() { - PluginConfig pluginConfig = new PluginConfig(PLUGIN_NAME, new Config()); + PluginConfig.Update pluginConfig = PluginConfig.Update.forTest(PLUGIN_NAME, new Config()); pluginConfig.setString("archiveFolder", INVALID_CUSTOM_FOLDER); - when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)).thenReturn(pluginConfig); + when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)) + .thenReturn(pluginConfig.asPluginConfig()); deleteConfig = new Configuration(pluginConfigFactoryMock, PLUGIN_NAME, pluginDataDir); assertThat(deleteConfig.getArchiveFolder().toString()).isEqualTo(pluginDataDir.toString());
diff --git a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ProtectedProjectsTest.java b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ProtectedProjectsTest.java index c4c370a..75ea96b 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ProtectedProjectsTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ProtectedProjectsTest.java
@@ -42,7 +42,7 @@ @Mock private AllUsersNameProvider allUsersMock; @Mock private PluginConfigFactory pluginConfigFactoryMock; - private PluginConfig pluginConfig; + private PluginConfig.Update pluginConfig; private Configuration deleteConfig; private ProtectedProjects protectedProjects; private File pluginData = new File("data"); @@ -51,8 +51,9 @@ public void setup() throws Exception { when(allProjectsMock.get()).thenReturn(new AllProjectsName("All-Projects")); when(allUsersMock.get()).thenReturn(new AllUsersName("All-Users")); - pluginConfig = new PluginConfig(PLUGIN_NAME, new Config()); - when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)).thenReturn(pluginConfig); + pluginConfig = PluginConfig.Update.forTest(PLUGIN_NAME, new Config()); + when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)) + .thenReturn(pluginConfig.asPluginConfig()); deleteConfig = new Configuration(pluginConfigFactoryMock, PLUGIN_NAME, pluginData); protectedProjects = new ProtectedProjects(allProjectsMock, allUsersMock, deleteConfig); } @@ -76,7 +77,8 @@ public void customProjectIsProtected() throws Exception { List<String> projects = ImmutableList.of("Custom-Parent", "^protected-.*"); pluginConfig.setStringList("protectedProject", projects); - when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)).thenReturn(pluginConfig); + when(pluginConfigFactoryMock.getFromGerritConfig(PLUGIN_NAME)) + .thenReturn(pluginConfig.asPluginConfig()); deleteConfig = new Configuration(pluginConfigFactoryMock, PLUGIN_NAME, pluginData); assertThat(deleteConfig.protectedProjects()).hasSize(projects.size()); protectedProjects = new ProtectedProjects(allProjectsMock, allUsersMock, deleteConfig);