You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/10/11 20:35:21 UTC

svn commit: r583906 - in /maven/archiva/trunk/archiva-base/archiva-proxy/src/test: java/org/apache/maven/archiva/proxy/MetadataTransferTest.java resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml

Author: joakime
Date: Thu Oct 11 11:35:21 2007
New Revision: 583906

URL: http://svn.apache.org/viewvc?rev=583906&view=rev
Log:
Fixing missing requirement in test components.xml.
Updating unit tests for proper metadata update detection.

Modified:
    maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
    maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml

Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java?rev=583906&r1=583905&r2=583906&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java Thu Oct 11 11:35:21 2007
@@ -129,7 +129,9 @@
         assertFetchProject( requestedResource );
 
         // Nothing fetched.  Should only contain contents of what is in the repository.
-        assertProjectMetadataContents( requestedResource, new String[] { "1.0", "1.1", "2.0" }, "2.0", "2.0" );
+        // A metadata update is not performed in this use case.  Local metadata content is only
+        // updated via the metadata updater consumer.
+        assertProjectMetadataContents( requestedResource, new String[] { "1.0" }, null, null );
     }
 
     public void testGetProjectMetadataProxiedNotLocalMultipleRemotes()
@@ -257,7 +259,9 @@
         assertFetchProject( requestedResource );
 
         // metadata not fetched from both repos, and local version exists.
-        assertProjectMetadataContents( requestedResource, new String[] { "1.0-beta-2" }, "1.0-beta-2", "1.0-beta-2" );
+        // Since there was no updated metadata content from a remote/proxy, a metadata update on
+        // the local file never ran.  Local only updates are performed via the metadata updater consumer.
+        assertProjectMetadataContents( requestedResource, new String[] { "1.0-beta-2" }, null, null );
         assertNoRepoMetadata( ID_PROXIED1, requestedResource );
         assertNoRepoMetadata( ID_PROXIED2, requestedResource );
     }

Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml?rev=583906&r1=583905&r2=583906&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml Thu Oct 11 11:35:21 2007
@@ -58,6 +58,10 @@
           <role-hint>mock</role-hint>
           <field-name>configuration</field-name>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.archiva.common.utils.Checksums</role>
+          <field-name>checksums</field-name>
+        </requirement>
       </requirements>
     </component>