continue moving maven logic out of dav module

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1547296 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
index fcb224f9707136a9793006c46857ba915e19a866..e069b700a01410ab07052bf72d93e12584130609 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
@@ -39,20 +39,6 @@ public class RepositoryPathUtilTest
         href = "path/to/my/resource";
         assertEquals( "to", RepositoryPathUtil.getRepositoryName( href ) );
 
-        href = "mypath";
-        assertEquals( "/", RepositoryPathUtil.getLogicalResource( href ) );
     }
 
-    @Test
-    public void testGetLogicalPath()
-    {
-        String href = "/repository/internal/org/apache/maven/someartifact.jar";
-        assertEquals( "/org/apache/maven/someartifact.jar", RepositoryPathUtil.getLogicalResource( href ) );
-
-        href = "repository/internal/org/apache/maven/someartifact.jar";
-        assertEquals( "/org/apache/maven/someartifact.jar", RepositoryPathUtil.getLogicalResource( href ) );
-
-        href = "repository/internal/org/apache/maven/";
-        assertEquals( "/org/apache/maven/", RepositoryPathUtil.getLogicalResource( href ) );
-    }
 }

diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
new file mode 100644 (file)
index 0000000..858bb86
--- /dev/null
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
@@ -0,0 +1,64 @@
+package org.apache.archiva.repository.metadata;
+
+/*
+ * 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.beans.ManagedRepository;
+import org.apache.archiva.metadata.repository.storage.RepositoryStorage;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * @author Olivier Lamy
+ */
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } )
+public class Maven2RepositoryStorageTest
+{
+    @Inject
+    @Named( value = "repositoryStorage#maven2" )
+    RepositoryStorage repositoryStorage;
+
+    @Test
+    public void testGetLogicalPath()
+    {
+        String href = "/repository/internal/org/apache/maven/someartifact.jar";
+        Assert.assertEquals( "/org/apache/maven/someartifact.jar",
+                             repositoryStorage.getFilePath( href, new ManagedRepository() ) );
+
+        href = "repository/internal/org/apache/maven/someartifact.jar";
+        Assert.assertEquals( "/org/apache/maven/someartifact.jar",
+                             repositoryStorage.getFilePath( href, new ManagedRepository() ) );
+
+        href = "repository/internal/org/apache/maven/";
+        Assert.assertEquals( "/org/apache/maven/", repositoryStorage.getFilePath( href, new ManagedRepository() ) );
+
+        href = "mypath";
+        Assert.assertEquals( "/", repositoryStorage.getFilePath( href, new ManagedRepository() ) );
+    }
+
+
+}
+