Repository: archiva Updated Branches: refs/heads/master 8c67ef5e7 -> 795d6d395
add more mock for consumer archetype test Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/aabbc2d5 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/aabbc2d5 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/aabbc2d5 Branch: refs/heads/master Commit: aabbc2d52c1e3bef7222ea043766301ce21c602c Parents: 8c67ef5 Author: Olivier Lamy <[email protected]> Authored: Tue Oct 6 17:27:07 2015 +1100 Committer: Olivier Lamy <[email protected]> Committed: Tue Oct 6 17:27:07 2015 +1100 ---------------------------------------------------------------------- .../test/java/SimpleArtifactConsumerTest.java | 6 -- .../src/test/resources/spring-context.xml | 5 +- .../resourcesstatic/archetype-resources/pom.xml | 6 ++ .../archiva/mock/MockNetworkProxyAdmin.java | 70 ++++++++++++++++++ .../archiva/mock/MockProxyConnectorAdmin.java | 78 ++++++++++++++++++++ .../repository/AbstractRepositoryAdminTest.java | 2 + 6 files changed, 160 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/aabbc2d5/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java index 095873c..1b44182 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java @@ -66,12 +66,6 @@ public class SimpleArtifactConsumerTest throws Exception { setUpMockRepository(); - - RepositorySession repositorySession = mock( RepositorySession.class ); - when( repositorySessionFactory.createSession() ).thenReturn( repositorySession ); - - metadataRepository = mock( MetadataRepository.class ); - when( repositorySession.getRepository() ).thenReturn( metadataRepository ); } private void setUpMockRepository() http://git-wip-us.apache.org/repos/asf/archiva/blob/aabbc2d5/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml index 8a12f3a..cd75577 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml @@ -29,5 +29,8 @@ <mockito:mock id="mockManagedRepositoryAdmin" class="org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin" /> <mockito:mock id="mockRemoteRepositoryAdmin" class="org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin" /> - <alias alias="repositorySessionFactory#jcr" name="repositorySessionFactory#mock" /> + <alias alias="repositorySessionFactory#jcr" name="repositorySessionFactory#file" /> + + <bean name="proxyConnectorAdmin#mock" class="org.apache.archiva.mock.MockProxyConnectorAdmin"/> + <bean name="networkProxyAdmin#mock" class="org.apache.archiva.mock.MockNetworkProxyAdmin"/> </beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/archiva/blob/aabbc2d5/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml index b6d0319..64a39f6 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml @@ -162,6 +162,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-store-file</artifactId> + <version>${archiva.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> <version>${log4j.version}</version> http://git-wip-us.apache.org/repos/asf/archiva/blob/aabbc2d5/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockNetworkProxyAdmin.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockNetworkProxyAdmin.java b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockNetworkProxyAdmin.java new file mode 100644 index 0000000..b46a846 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockNetworkProxyAdmin.java @@ -0,0 +1,70 @@ +package org.apache.archiva.mock; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * 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 + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.archiva.admin.model.AuditInformation; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.beans.NetworkProxy; +import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; + +import java.util.Collections; +import java.util.List; + +/** + * @author Olivier Lamy + */ +public class MockNetworkProxyAdmin + implements NetworkProxyAdmin +{ + @Override + public List<NetworkProxy> getNetworkProxies() + throws RepositoryAdminException + { + return Collections.emptyList(); + } + + @Override + public NetworkProxy getNetworkProxy( String networkProxyId ) + throws RepositoryAdminException + { + return null; + } + + @Override + public void addNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation ) + throws RepositoryAdminException + { + // no op + } + + @Override + public void updateNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation ) + throws RepositoryAdminException + { + // no op + } + + @Override + public void deleteNetworkProxy( String networkProxyId, AuditInformation auditInformation ) + throws RepositoryAdminException + { + // no op + } +} http://git-wip-us.apache.org/repos/asf/archiva/blob/aabbc2d5/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockProxyConnectorAdmin.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockProxyConnectorAdmin.java new file mode 100644 index 0000000..f6830d8 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockProxyConnectorAdmin.java @@ -0,0 +1,78 @@ +package org.apache.archiva.mock; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * 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 + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.archiva.admin.model.AuditInformation; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.beans.ProxyConnector; +import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +/** + * @author Olivier Lamy + */ +public class MockProxyConnectorAdmin + implements ProxyConnectorAdmin +{ + @Override + public List<ProxyConnector> getProxyConnectors() + throws RepositoryAdminException + { + return Collections.emptyList(); + } + + @Override + public ProxyConnector getProxyConnector( String sourceRepoId, String targetRepoId ) + throws RepositoryAdminException + { + return null; + } + + @Override + public Boolean addProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) + throws RepositoryAdminException + { + return Boolean.FALSE; + } + + @Override + public Boolean deleteProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) + throws RepositoryAdminException + { + return Boolean.FALSE; + } + + @Override + public Boolean updateProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) + throws RepositoryAdminException + { + return Boolean.FALSE; + } + + @Override + public Map<String, List<ProxyConnector>> getProxyConnectorAsMap() + throws RepositoryAdminException + { + return Collections.emptyMap(); + } +} http://git-wip-us.apache.org/repos/asf/archiva/blob/aabbc2d5/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java ---------------------------------------------------------------------- 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 780ae4e..e081c78 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 @@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory; import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; +import javax.inject.Named; import java.io.File; import java.util.HashMap; import java.util.List; @@ -70,6 +71,7 @@ public abstract class AbstractRepositoryAdminTest protected ManagedRepositoryAdmin managedRepositoryAdmin; @Inject + @Named("proxyConnectorAdmin#default") protected ProxyConnectorAdmin proxyConnectorAdmin; @Inject
