Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring packages for mock classes

This commit is contained in:
Martin Stockhammer 2021-12-24 16:29:21 +01:00
parent a8fa3d574b
commit ff06849746
11 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
View File

@ -24,7 +24,7 @@
<managedRepository>
<id>internal</id>
<name>Archiva Managed Internal Repository</name>
<location>file://${appserver.base}/repositories/internal</location>
<location>${appserver.base}/repositories/internal</location>
<indexDir>${appserver.base}/repositories/internal/.indexer</indexDir>
<layout>default</layout>
<releases>true</releases>
@ -35,7 +35,7 @@
<managedRepository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
<location>file://${appserver.base}/repositories/snapshots</location>
<location>${appserver.base}/repositories/snapshots</location>
<indexDir>.indexer</indexDir>
<layout>default</layout>
<releases>false</releases>
@ -46,7 +46,7 @@
<managedRepository>
<id>test-repo</id>
<name>Test Repository</name>
<location>file://${appserver.base}/test-repo</location>
<location>${appserver.base}/test-repo</location>
<layout>default</layout>
<releases>true</releases>
<snapshots>true</snapshots>

3
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java → archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/mock/repository/RepositoryProviderMock.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.mock;
package org.apache.archiva.consumers.core.mock.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.repository.mock;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
View File

@ -28,7 +28,7 @@
default-lazy-init="true">
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.metadata.repository,org.apache.archiva.repository.maven.content"/>
<context:component-scan base-package="org.apache.archiva.metadata.repository,org.apache.archiva.maven.repository.content"/>
<!-- for testing repo purge using retention count -->

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
View File

@ -27,7 +27,7 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"
default-lazy-init="true">
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.metadata.repository,org.apache.archiva.repository.maven.content,org.apache.archiva.maven.metadata"/>
<context:component-scan base-package="org.apache.archiva.metadata.repository,org.apache.archiva.maven.repository.content,org.apache.archiva.maven.metadata"/>
<bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
<property name="initialConfiguration">

2
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
View File

@ -35,7 +35,7 @@ import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.base.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.base.RepositoryHandlerDependencies;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.archiva.webdav.httpunit.MkColMethodWebRequest;
import org.apache.archiva.webdav.mock.httpunit.MkColMethodWebRequest;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;

2
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java
View File

@ -22,7 +22,7 @@ package org.apache.archiva.webdav;
import com.gargoylesoftware.htmlunit.WebRequest;
import com.gargoylesoftware.htmlunit.WebResponse;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.webdav.httpunit.MkColMethodWebRequest;
import org.apache.archiva.webdav.mock.httpunit.MkColMethodWebRequest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
View File

@ -34,7 +34,7 @@ import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.memory.SimpleUser;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.metadata.audit.TestAuditListener;
import org.apache.archiva.webdav.mock.metadata.audit.TestAuditListener;
import org.apache.archiva.repository.base.group.RepositoryGroupHandler;
import org.apache.archiva.security.ServletAuthenticator;
import org.apache.archiva.security.common.ArchivaRoleConstants;

3
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/httpunit/MkColMethodWebRequest.java → archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/mock/httpunit/MkColMethodWebRequest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.webdav.httpunit;
package org.apache.archiva.webdav.mock.httpunit;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.webdav.httpunit;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

4
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/audit/TestAuditListener.java → archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/mock/metadata/audit/TestAuditListener.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.metadata.audit;
package org.apache.archiva.webdav.mock.metadata.audit;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.metadata.audit;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -19,6 +18,7 @@ package org.apache.archiva.metadata.audit;
* under the License.
*/
import org.apache.archiva.metadata.audit.AuditListener;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import java.util.ArrayList;

1
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
View File

@ -180,7 +180,6 @@ public class DefaultCassandraArchivaManager
List<String> hostNames = new ArrayList<>( );
hostNames.add( cassandraHost + ":" + cassandraPort );
System.out.println( "Contact point: " + cassandraHost + ":" + cassandraPort );
configLoader =
DriverConfigLoader.programmaticBuilder( )

5
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
View File

@ -95,9 +95,7 @@ public class CassandraMetadataRepositoryTest
throws Exception
{
cTime = System.currentTimeMillis( );
System.err.println( "Setting up - "+(testNum++) + " - " + testInfo.getDisplayName() + " - 0ms");
super.setUp();
System.err.println( "Setting up - " + testInfo.getDisplayName( ) + " - " + (System.currentTimeMillis( ) - cTime) +"ms");
assertMaxTries =1;
assertRetrySleepMs=10;
@ -126,7 +124,6 @@ public class CassandraMetadataRepositoryTest
{
clearReposAndNamespace( cassandraArchivaManager, clearedTables );
}
System.err.println( "Finished setting up - "+testInfo.getDisplayName() + " - " + (System.currentTimeMillis( ) - cTime) +"ms");
}
/**
@ -165,10 +162,8 @@ public class CassandraMetadataRepositoryTest
public void shutdown(TestInfo testInfo)
throws Exception
{
System.err.println( "Shutting down - " + (testNum-1) + " - " + testInfo.getDisplayName( ) + " - " + ( System.currentTimeMillis( ) - cTime ) +"ms");
clearReposAndNamespace( cassandraArchivaManager, clearedTables );
super.tearDown();
System.err.println( "Shutting down finished - " + testInfo.getDisplayName( ) + " - " + ( System.currentTimeMillis( ) - cTime ) +"ms");
}
static void clearReposAndNamespace( final CassandraArchivaManager cassandraArchivaManager, final AtomicBoolean clearedFlag )