svn commit: r675602 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src: main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java

[oching]

Author: oching
Date: Thu Jul 10 07:50:18 2008
New Revision: 675602

URL: http://svn.apache.org/viewvc?rev=675602&view=rev
Log:
[MRM-872]
-added test case for repo group merged metadata request

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=675602&r1=675601&r2=675602&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
 Thu Jul 10 07:50:18 2008
@@ -261,6 +261,9 @@
         if ( request.getRequestURI().endsWith( "metadata.xml" ) )
         {
             // TODO MRM-872 : must merge all available metadatas
+            // use RepositoryMetadataMerge for the merging of the versions 
+            // 
+            // Deng: I'll continue this tomorrow, everything is getting blurry 
now
         }
 
         DavResource resource = availableResources.get( 0 );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java?rev=675602&r1=675601&r2=675602&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
 Thu Jul 10 07:50:18 2008
@@ -217,6 +217,45 @@
         assertNotNull( "Should have received a response", response );
         assertEquals( "Should have been an 401 response code.", 
HttpServletResponse.SC_UNAUTHORIZED, response.getResponseCode() );
     }
+    
+    // MRM-872
+    public void testGetMergedMetadata()
+        throws Exception
+    {
+        // first metadata file
+        String resourceName = 
"dummy/dummy-merged-metadata-resource/maven-metadata.xml";
+        
+        File dummyInternalResourceFile = new File( repoRootFirst, resourceName 
);
+        dummyInternalResourceFile.getParentFile().mkdirs();
+        FileUtils.writeStringToFile( dummyInternalResourceFile, "<?xml 
version=\"1.0\" encoding=\"UTF-8\"?>" +
+                       
"<metadata><groupId>dummy</groupId><artifactId>dummy-merged-metadata-resource</artifactId>"
 +
+                       
"<versioning><latest>1.0</latest><release>1.0</release><versions><version>1.0</version>"
 +
+                       
"<version>2.5</version><lastUpdated>20080708095554</lastUpdated></versioning></metadata>",
 null );
+        
+        //second metadata file
+        resourceName = 
"dummy/dummy-merged-metadata-resource/maven-metadata.xml";        
+        dummyInternalResourceFile = new File( repoRootLast, resourceName );
+        dummyInternalResourceFile.getParentFile().mkdirs();
+        FileUtils.writeStringToFile( dummyInternalResourceFile, "<?xml 
version=\"1.0\" encoding=\"UTF-8\"?>" +
+                
"<metadata><groupId>dummy</groupId><artifactId>dummy-merged-metadata-resource</artifactId>"
 +
+                
"<versioning><latest>2.0</latest><release>2.0</release><versions><version>1.0</version>"
 +
+                
"<version>1.5</version><version>2.0</version><lastUpdated>20080709095554</lastUpdated>"
 +
+                "</versioning></metadata>", null );
+        
+        WebRequest request =
+            new GetMethodWebRequest( "http://machine.com/repository/"; + 
REPO_GROUP_WITH_VALID_REPOS + "/dummy/" +
+                "dummy-merged-metadata-resource/maven-metadata.xml" );
+        WebResponse response = sc.getResource( request );
+        
+        String expectedString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+            
"<metadata><groupId>dummy</groupId><artifactId>dummy-merged-metadata-resource</artifactId>"
 +
+            "<versioning><latest>2.5</latest><versions><version>1.0</version>" 
+
+            
"<version>1.5</version><version>2.0</version><version>2.5</version><lastUpdated>20080709095554</lastUpdated>"
 +
+            "</versioning></metadata>"; 
+                
+        //assertResponseOK( response );
+        //assertEquals( "Expected file contents", expectedString, 
response.getText() );
+    }
         
     protected void assertResponseMethodNotAllowed( WebResponse response )
     {