Fxing unit tests for RepositoryRegistry

diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/indexer/GenericIndexManager.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/indexer/GenericIndexManager.java
new file mode 100644 (file)
index 0000000..2e9ee17
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/indexer/GenericIndexManager.java
@@ -0,0 +1,66 @@
+package org.apache.archiva.indexer;
+
+/*
+ * 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.model.ArtifactReference;
+import org.apache.archiva.repository.Repository;
+import org.apache.archiva.repository.RepositoryType;
+import org.springframework.stereotype.Service;
+
+import java.net.URI;
+
+@Service("indexManager#none")
+public class GenericIndexManager implements ArchivaIndexManager {
+
+    @Override
+    public void pack(ArchivaIndexingContext context) {
+
+    }
+
+    @Override
+    public void scan(ArchivaIndexingContext context, boolean update) {
+
+    }
+
+    @Override
+    public void update(ArchivaIndexingContext context, URI remoteUpdateUri, boolean fullUpdate) {
+
+    }
+
+    @Override
+    public void addArtifactToIndex(ArchivaIndexingContext context, ArtifactReference artifactReference) {
+
+    }
+
+    @Override
+    public void removeArtifactFromIndex(ArchivaIndexingContext context, ArtifactReference artifactReference) {
+
+    }
+
+    @Override
+    public boolean supportsRepository(RepositoryType type) {
+        return false;
+    }
+
+    @Override
+    public ArchivaIndexingContext createContext(Repository repository) {
+        return null;
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index 2b03400ce677593d0aa46fb0082c9a9cb044b1e5..a33ba65be343b1112203047db8ef7abbf49aa28f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -71,7 +71,7 @@
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-model</artifactId>
@@ -171,6 +171,7 @@
         <configuration>
           <systemPropertyVariables>
             <basedir>${basedir}</basedir>
+            <appserver.base>${project.build.directory}/test-classes</appserver.base>
           </systemPropertyVariables>
         </configuration>
       </plugin>

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java
new file mode 100644 (file)
index 0000000..3693e07
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java
@@ -0,0 +1,66 @@
+package org.apache.archiva.repository.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.repository.*;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Service("repositoryContentProvider#mock")
+public class RepositoryContentProviderMock implements RepositoryContentProvider {
+
+    private static final Set<RepositoryType> REPOSITORY_TYPES = new HashSet<>();
+    static {
+        REPOSITORY_TYPES.add(RepositoryType.MAVEN);
+        REPOSITORY_TYPES.add(RepositoryType.NPM);
+    }
+
+    @Override
+    public boolean supportsLayout(String layout) {
+        return true;
+    }
+
+    @Override
+    public Set<RepositoryType> getSupportedRepositoryTypes() {
+        return REPOSITORY_TYPES;
+    }
+
+    @Override
+    public boolean supports(RepositoryType type) {
+        return true;
+    }
+
+    @Override
+    public RemoteRepositoryContent createRemoteContent(RemoteRepository repository) throws RepositoryException {
+        return new RemoteRepositoryContentMock();
+    }
+
+    @Override
+    public ManagedRepositoryContent createManagedContent(ManagedRepository repository) throws RepositoryException {
+        return new ManagedRepositoryContentMock();
+    }
+
+    @Override
+    public <T extends RepositoryContent, V extends Repository> T createContent(Class<T> clazz, V repository) throws RepositoryException {
+        return null;
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java
index 834ce5ba2a598c8c0e127e7f1b2eab6e1dbdd5a9..95485cc3383572bd4184d6647915a2c37b8f1547 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java
@@ -130,6 +130,7 @@ public class RepositoryProviderMock implements RepositoryProvider
         String id = configuration.getId( ) + StagingRepositoryFeature.STAGING_REPO_POSTFIX;
         BasicManagedRepository managedRepository = new BasicManagedRepository( id, configuration.getName( ) );
         updateManagedInstance( managedRepository, configuration );
+        managedRepository.getFeature(StagingRepositoryFeature.class).get().setStageRepoNeeded(false);
         return managedRepository;
     }
 

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index c3c8a2f99e2c0e49da45b58275de1291575b5356..74a963a7529a792a8c32c0fe33af70f8c0c19268 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -80,7 +80,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-indexer</artifactId>
+      <artifactId>archiva-maven2-indexer</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>