From 82699368831d402d9e9ef9833d4c3c5af378a462 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 4 Sep 2011 14:53:03 +0000 Subject: [PATCH] [MRM-1506] api to configure RemoteRepository : start adding unit tests git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165040 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-repository-admin/pom.xml | 3 + .../AbstractRepositoryAdminTest.java | 2 +- .../managed/ManagedRepositoryAdminTest.java | 1 + .../remote/RemoteRepositoryAdminTest.java | 58 +++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) rename archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/{managed => }/AbstractRepositoryAdminTest.java (96%) create mode 100644 archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java diff --git a/archiva-modules/archiva-base/archiva-repository-admin/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/pom.xml index 158deae66..5f004f8e5 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/pom.xml @@ -32,6 +32,9 @@ org.apache.archiva archiva-configuration + org.apache.archiva archiva-security diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/AbstractRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java similarity index 96% rename from archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/AbstractRepositoryAdminTest.java rename to archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java index 59498113c..02e72d357 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/AbstractRepositoryAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.admin.repository.managed; +package org.apache.archiva.admin.repository; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java index e0e758bb3..517d8c7df 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java @@ -20,6 +20,7 @@ package org.apache.archiva.admin.repository.managed; import org.apache.archiva.admin.AuditInformation; import org.apache.archiva.admin.mock.MockAuditListener; +import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest; import org.apache.archiva.audit.AuditEvent; import org.apache.archiva.security.ArchivaRoleConstants; import org.apache.commons.io.FileUtils; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java new file mode 100644 index 000000000..54c819539 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java @@ -0,0 +1,58 @@ +package org.apache.archiva.admin.repository.remote; +/* + * 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.repository.AbstractRepositoryAdminTest; +import org.junit.Test; + +import javax.inject.Inject; +import java.util.List; + +/** + * @author Olivier Lamy + */ +public class RemoteRepositoryAdminTest + extends AbstractRepositoryAdminTest +{ + + @Inject + private RemoteRepositoryAdmin remoteRepositoryAdmin; + + @Test + public void getAll() + throws Exception + { + List remoteRepositories = remoteRepositoryAdmin.getRemoteRepositories(); + assertNotNull( remoteRepositories ); + assertTrue( remoteRepositories.size() > 0 ); + log.info( "remote " + remoteRepositories ); + } + + @Test + public void getById() + throws Exception + { + RemoteRepository central = remoteRepositoryAdmin.getRemoteRepository( "central" ); + assertNotNull( central ); + assertEquals( "http://repo1.maven.org/maven2", central.getUrl() ); + assertEquals( 60, central.getTimeout() ); + assertNull( central.getUserName() ); + assertNull( central.getPassword() ); + } +}