From: Olivier Lamy Date: Mon, 29 Oct 2012 21:07:23 +0000 (+0000) Subject: more unit test failures X-Git-Tag: archiva-1.4-M4~670 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=28e8bdefd242aa07d23e67714b6b626180bb079a;p=archiva.git more unit test failures git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1403529 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockRepositoryStorage.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockRepositoryStorage.java new file mode 100644 index 000000000..36ed52a6f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockRepositoryStorage.java @@ -0,0 +1,145 @@ +package org.apache.archiva.security.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.metadata.model.ArtifactMetadata; +import org.apache.archiva.metadata.model.ProjectMetadata; +import org.apache.archiva.metadata.model.ProjectVersionMetadata; +import org.apache.archiva.metadata.repository.MetadataRepository; +import org.apache.archiva.metadata.repository.RepositorySession; +import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; +import org.apache.archiva.metadata.repository.storage.RepositoryStorage; +import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataException; +import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException; +import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException; +import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; +import org.apache.archiva.model.ArtifactReference; +import org.apache.archiva.policies.ProxyDownloadException; +import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.repository.ManagedRepositoryContent; +import org.apache.archiva.repository.events.RepositoryListener; +import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; +import org.apache.archiva.scheduler.repository.model.RepositoryTask; + +import java.util.Collection; + +/** + * @author Olivier Lamy + */ +public class MockRepositoryStorage + implements RepositoryStorage, RepositoryListener, RepositoryArchivaTaskScheduler +{ + public ProjectMetadata readProjectMetadata( String repoId, String namespace, String projectId ) + { + return null; + } + + public ProjectVersionMetadata readProjectVersionMetadata( ReadMetadataRequest readMetadataRequest ) + throws RepositoryStorageMetadataInvalidException, RepositoryStorageMetadataNotFoundException, + RepositoryStorageRuntimeException + { + return null; + } + + public Collection listRootNamespaces( String repoId, Filter filter ) + throws RepositoryStorageRuntimeException + { + return null; + } + + public Collection listNamespaces( String repoId, String namespace, Filter filter ) + throws RepositoryStorageRuntimeException + { + return null; + } + + public Collection listProjects( String repoId, String namespace, Filter filter ) + throws RepositoryStorageRuntimeException + { + return null; + } + + public Collection listProjectVersions( String repoId, String namespace, String projectId, + Filter filter ) + throws RepositoryStorageRuntimeException + { + return null; + } + + public Collection readArtifactsMetadata( ReadMetadataRequest readMetadataRequest ) + throws RepositoryStorageRuntimeException + { + return null; + } + + public ArtifactMetadata readArtifactMetadataFromPath( String repoId, String path ) + throws RepositoryStorageRuntimeException + { + return null; + } + + public void applyServerSideRelocation( ManagedRepositoryContent managedRepository, ArtifactReference artifact ) + throws ProxyDownloadException + { + + } + + + public void deleteArtifact( MetadataRepository metadataRepository, String repositoryId, String namespace, + String project, String version, String id ) + { + + } + + public void addArtifact( RepositorySession session, String repoId, String namespace, String projectId, + ProjectVersionMetadata metadata ) + { + + } + + public void addArtifactProblem( RepositorySession session, String repoId, String namespace, String projectId, + String projectVersion, RepositoryStorageMetadataException exception ) + { + + } + + + public boolean isProcessingRepositoryTask( String repositoryId ) + { + return false; + } + + public boolean isProcessingRepositoryTask( RepositoryTask task ) + { + return false; + } + + public void queueTask( RepositoryTask task ) + throws TaskQueueException + { + + } + + public boolean unQueueTask( RepositoryTask task ) + throws TaskQueueException + { + return false; + } +} diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml index e6fdacd02..9b39e5c5c 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml @@ -101,6 +101,10 @@ + + + + diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index 505daae35..b0b40471f 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -54,8 +54,7 @@ import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryNotFoundException; -import org.apache.archiva.repository.content.LegacyPathParser; -import org.apache.archiva.repository.content.RepositoryRequest; +import org.apache.archiva.repository.content.maven2.RepositoryRequest; import org.apache.archiva.repository.layout.LayoutException; import org.apache.archiva.repository.metadata.MetadataTools; import org.apache.archiva.repository.metadata.RepositoryMetadataException;