This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch archiva-2.x in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 63154a6af822384907566f3998c7948d6d34eed8 Author: Martin Stockhammer <[email protected]> AuthorDate: Fri Feb 22 21:09:56 2019 +0100 Adding config file removal before tests --- .../repository/AbstractRepositoryAdminTest.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java index 96d217d..ba96639 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java @@ -27,12 +27,15 @@ import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; import org.apache.archiva.admin.model.proxyconnectorrule.ProxyConnectorRuleAdmin; import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; +import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.memory.SimpleUser; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; +import org.junit.Before; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,6 +44,10 @@ import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; import javax.inject.Named; 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.HashMap; import java.util.List; import java.util.Map; @@ -76,6 +83,23 @@ public abstract class AbstractRepositoryAdminTest @Inject protected ProxyConnectorRuleAdmin proxyConnectorRuleAdmin; + @Inject + private ArchivaConfiguration archivaConfiguration; + + @Before + public void initialize() { + Path confFile = Paths.get(System.getProperty( "appserver.base" ), "conf/archiva.xml"); + try + { + Files.deleteIfExists( confFile ); + archivaConfiguration.reload(); + } + catch ( IOException e ) + { + // ignore + } + } + protected AuditInformation getFakeAuditInformation() { AuditInformation auditInformation = new AuditInformation( getFakeUser(), "archiva-localhost" );
