Fixing missing requirement in test components.xml.

Updating unit tests for proper metadata update detection.

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

diff --git a/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java b/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
index 4e74dfd5dbdc1bfb14c9dd65dcbbbe21a2f2e341..117fb7551bc6e46c06bb6dfe110c974a082e900d 100644 (file)
--- a/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
+++ b/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
@@ -129,7 +129,9 @@ public class MetadataTransferTest
         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 @@ public class MetadataTransferTest
         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 );
     }

diff --git a/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml b/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
index 851cdc3a380cf2e34c36f3bc5d07ae743518c3b3..d63f77c6106b059be3b24099cc07457d946fe842 100644 (file)
--- a/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
+++ b/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
@@ -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>