Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99EB1DD94 for ; Tue, 23 Oct 2012 13:30:41 +0000 (UTC) Received: (qmail 11674 invoked by uid 500); 23 Oct 2012 13:30:41 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 11621 invoked by uid 500); 23 Oct 2012 13:30:41 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 11614 invoked by uid 99); 23 Oct 2012 13:30:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Oct 2012 13:30:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Oct 2012 13:30:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AB9AC2388A3F for ; Tue, 23 Oct 2012 13:29:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1401291 - /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ Date: Tue, 23 Oct 2012 13:29:56 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121023132956.AB9AC2388A3F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Tue Oct 23 13:29:56 2012 New Revision: 1401291 URL: http://svn.apache.org/viewvc?rev=1401291&view=rev Log: fix unit tests Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java?rev=1401291&r1=1401290&r2=1401291&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java (original) +++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java Tue Oct 23 13:29:56 2012 @@ -288,8 +288,8 @@ public class Maven2RepositoryMetadataRes "target/test-repositorys/com/example/test/test-snapshot-artifact-root" ); ReadMetadataRequest readMetadataRequest = - new ReadMetadataRequest().namespace( TEST_SNAP_REPO_ID ).namespace( "com.example.test" ).projectId( - "test-snapshot-artifact-module-a" ).projectVersion( "1.1-SNAPSHOT" ); + new ReadMetadataRequest( TEST_SNAP_REPO_ID, "com.example.test", "test-snapshot-artifact-module-a", + "1.1-SNAPSHOT" ); ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( readMetadataRequest ); Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java?rev=1401291&r1=1401290&r2=1401291&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java (original) +++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java Tue Oct 23 13:29:56 2012 @@ -19,13 +19,6 @@ package org.apache.archiva.metadata.repo * under the License. */ -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; import junit.framework.TestCase; import org.apache.archiva.common.utils.FileUtil; import org.apache.archiva.configuration.ArchivaConfiguration; @@ -40,6 +33,7 @@ import org.apache.archiva.metadata.model import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.repository.filter.AllFilter; import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; import org.apache.archiva.proxy.common.WagonFactory; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; @@ -48,19 +42,28 @@ import org.apache.maven.wagon.Wagon; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; + +import javax.inject.Inject; +import javax.inject.Named; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.springframework.test.context.ContextConfiguration; -@RunWith( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) +@RunWith ( ArchivaSpringJUnit4ClassRunner.class ) +@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class Maven2RepositoryMetadataResolverMRM1411Test extends TestCase { private static final Filter ALL = new AllFilter(); @Inject - @Named( value = "repositoryStorage#maven2" ) + @Named ( value = "repositoryStorage#maven2" ) private Maven2RepositoryStorage storage; private static final String TEST_REPO_ID = "test"; @@ -89,9 +92,9 @@ public class Maven2RepositoryMetadataRes private WagonFactory wagonFactory; ManagedRepositoryConfiguration testRepo; - + Configuration c; - + @Before @Override public void setUp() @@ -106,7 +109,6 @@ public class Maven2RepositoryMetadataRes testRepo.setReleases( true ); testRepo.setSnapshots( true ); c.addManagedRepository( testRepo ); - RemoteRepositoryConfiguration testRemoteRepo = new RemoteRepositoryConfiguration(); testRemoteRepo.setId( TEST_REMOTE_REPO_ID ); @@ -124,9 +126,9 @@ public class Maven2RepositoryMetadataRes configuration.save( c ); - assertTrue ( c.getManagedRepositories().get( 0 ).isSnapshots() ); - assertTrue ( c.getManagedRepositories().get( 0 ).isReleases() ); - + assertTrue( c.getManagedRepositories().get( 0 ).isSnapshots() ); + assertTrue( c.getManagedRepositories().get( 0 ).isReleases() ); + wagonFactory = mock( WagonFactory.class ); storage.setWagonFactory( wagonFactory ); @@ -143,8 +145,8 @@ public class Maven2RepositoryMetadataRes copyTestArtifactWithParent( "target/test-classes/com/example/test/test-artifact-module-a", "target/test-repository/com/example/test/test-artifact-module-a" ); - ProjectVersionMetadata metadata = - storage.readProjectVersionMetadata( TEST_REPO_ID, "com.example.test", "test-artifact-module-a", "1.0" ); + ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( + new ReadMetadataRequest( TEST_REPO_ID, "com.example.test", "test-artifact-module-a", "1.0" ) ); MavenProjectFacet facet = (MavenProjectFacet) metadata.getFacet( MavenProjectFacet.FACET_ID ); assertEquals( "jar", facet.getPackaging() ); @@ -193,8 +195,8 @@ public class Maven2RepositoryMetadataRes copyTestArtifactWithParent( "target/test-classes/com/example/test/test-artifact-module-a", "target/test-repository/com/example/test/test-artifact-module-a" ); - ProjectVersionMetadata metadata = - storage.readProjectVersionMetadata( TEST_REPO_ID, "com.example.test", "test-artifact-module-a", "1.0" ); + ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( + new ReadMetadataRequest( TEST_REPO_ID, "com.example.test", "test-artifact-module-a", "1.0" ) ); assertEquals( "1.0", metadata.getId() ); MavenProjectFacet facet = (MavenProjectFacet) metadata.getFacet( MavenProjectFacet.FACET_ID ); @@ -218,8 +220,8 @@ public class Maven2RepositoryMetadataRes copyTestArtifactWithParent( "target/test-classes/com/example/test/test-artifact-module-a", "target/test-repository/com/example/test/test-artifact-module-a" ); - ProjectVersionMetadata metadata = - storage.readProjectVersionMetadata( TEST_REPO_ID, "com.example.test", "missing-parent", "1.1" ); + ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( + new ReadMetadataRequest( TEST_REPO_ID, "com.example.test", "missing-parent", "1.1" ) ); assertEquals( "1.1", metadata.getId() ); @@ -244,9 +246,9 @@ public class Maven2RepositoryMetadataRes copyTestArtifactWithParent( "target/test-classes/com/example/test/test-snapshot-artifact-module-a", "target/test-repository/com/example/test/test-snapshot-artifact-module-a" ); - ProjectVersionMetadata metadata = - storage.readProjectVersionMetadata( TEST_REPO_ID, "com.example.test", "test-snapshot-artifact-module-a", - "1.1-SNAPSHOT" ); + ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( + new ReadMetadataRequest( TEST_REPO_ID, "com.example.test", "test-snapshot-artifact-module-a", + "1.1-SNAPSHOT" ) ); MavenProjectFacet facet = (MavenProjectFacet) metadata.getFacet( MavenProjectFacet.FACET_ID ); assertEquals( "jar", facet.getPackaging() ); @@ -285,21 +287,21 @@ public class Maven2RepositoryMetadataRes { testRepo.setSnapshots( false ); configuration.save( c ); - assertFalse ( c.getManagedRepositories().get( 0 ).isSnapshots() ); + assertFalse( c.getManagedRepositories().get( 0 ).isSnapshots() ); copyTestArtifactWithParent( "target/test-classes/com/example/test/test-snapshot-artifact-module-a", "target/test-repository/com/example/test/test-snapshot-artifact-module-a" ); - try + try { - ProjectVersionMetadata metadata = - storage.readProjectVersionMetadata( TEST_REPO_ID, "com.example.test", "test-snapshot-artifact-module-a", - "1.1-SNAPSHOT" ); + ProjectVersionMetadata metadata = storage.readProjectVersionMetadata( + new ReadMetadataRequest( TEST_REPO_ID, "com.example.test", "test-snapshot-artifact-module-a", + "1.1-SNAPSHOT" ) ); fail( "Should not be found" ); - } - catch ( RepositoryStorageRuntimeException e ) + } + catch ( RepositoryStorageRuntimeException e ) { } - + List paths = new ArrayList(); paths.add( "target/test-repository/com/example/test/test-snapshot-artifact-module-a" ); paths.add( "target/test-repository/com/example/test/test-snapshot-artifact-root" ); @@ -308,7 +310,7 @@ public class Maven2RepositoryMetadataRes } // Tests for MRM-1411 - END -private void assertDependency( Dependency dependency, String groupId, String artifactId, String version ) + private void assertDependency( Dependency dependency, String groupId, String artifactId, String version ) { assertDependency( dependency, groupId, artifactId, version, "compile" ); } @@ -324,7 +326,7 @@ private void assertDependency( Dependenc assertNull( dependency.getClassifier() ); assertNull( dependency.getSystemPath() ); } - + private void assertArtifact( ArtifactMetadata artifact, String id, int size, String sha1, String md5 ) { assertEquals( id, artifact.getId() );