Author: olamy
Date: Tue Dec 3 06:06:58 2013
New Revision: 1547296
URL: http://svn.apache.org/r1547296
Log:
continue moving maven logic out of dav module
Added:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java?rev=1547296&r1=1547295&r2=1547296&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
Tue Dec 3 06:06:58 2013
@@ -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 ) );
- }
}
Added:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java?rev=1547296&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
(added)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
Tue Dec 3 06:06:58 2013
@@ -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() ) );
+ }
+
+
+}
+
Propchange:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
