maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r929937 - in /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it: MavenITmng3461MirrorMatchingTest.java MavenITmng4343MissingReleaseUpdatePolicyTest.java
Date Thu, 01 Apr 2010 11:40:04 GMT
Author: bentmann
Date: Thu Apr  1 11:40:03 2010
New Revision: 929937

URL: http://svn.apache.org/viewvc?rev=929937&view=rev
Log:
o Decoupled ITs from POM resolution error handling

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java?rev=929937&r1=929936&r2=929937&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
Thu Apr  1 11:40:03 2010
@@ -96,6 +96,16 @@ public class MavenITmng3461MirrorMatchin
                     response.setStatus( HttpServletResponse.SC_OK );
                     response.getWriter().println( request.getRequestURI() );
                 }
+                else if ( request.getRequestURI().endsWith( "/b-0.1.pom" ) )
+                {
+                    response.setStatus( HttpServletResponse.SC_OK );
+                    response.getWriter().println( "<project>" );
+                    response.getWriter().println( "  <modelVersion>4.0.0</modelVersion>"
);
+                    response.getWriter().println( "  <groupId>org.apache.maven.its.mng3461</groupId>"
);
+                    response.getWriter().println( "  <artifactId>b</artifactId>"
);
+                    response.getWriter().println( "  <version>0.1</version>"
);
+                    response.getWriter().println( "</project>" );
+                }
                 else
                 {
                     response.setStatus( HttpServletResponse.SC_NOT_FOUND );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java?rev=929937&r1=929936&r2=929937&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
Thu Apr  1 11:40:03 2010
@@ -71,7 +71,7 @@ public class MavenITmng4343MissingReleas
 
                 if ( request.getRequestURI().startsWith( "/org/apache/maven/its/mng4343"
) )
                 {
-                    requestedUris.add( request.getRequestURI() );
+                    requestedUris.add( request.getRequestURI().substring( 29 ) );
                 }
 
                 if ( blockAccess )
@@ -159,7 +159,8 @@ public class MavenITmng4343MissingReleas
             // expected
         }
 
-        assertTrue( requestedUris.toString(), requestedUris.contains( "/org/apache/maven/its/mng4343/dep/0.1/dep-0.1.jar"
) );
+        assertTrue( requestedUris.toString(), 
+            requestedUris.contains( "/dep/0.1/dep-0.1.jar" ) || requestedUris.contains( "/dep/0.1/dep-0.1.pom"
) );
         requestedUris.clear();
 
         blockAccess = false;
@@ -168,8 +169,8 @@ public class MavenITmng4343MissingReleas
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 
-        assertTrue( requestedUris.toString(), requestedUris.contains( "/org/apache/maven/its/mng4343/dep/0.1/dep-0.1.jar"
) );
-        assertTrue( requestedUris.toString(), requestedUris.contains( "/org/apache/maven/its/mng4343/dep/0.1/dep-0.1.pom"
) );
+        assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.jar"
) );
+        assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.pom"
) );
         verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar"
);
         verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom"
);
 
@@ -210,7 +211,8 @@ public class MavenITmng4343MissingReleas
             // expected
         }
 
-        assertTrue( requestedUris.toString(), requestedUris.contains( "/org/apache/maven/its/mng4343/dep/0.1/dep-0.1.jar"
) );
+        assertTrue( requestedUris.toString(), 
+            requestedUris.contains( "/dep/0.1/dep-0.1.jar" ) || requestedUris.contains( "/dep/0.1/dep-0.1.pom"
) );
         requestedUris.clear();
 
         blockAccess = false;
@@ -236,8 +238,8 @@ public class MavenITmng4343MissingReleas
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 
-        assertTrue( requestedUris.toString(), requestedUris.contains( "/org/apache/maven/its/mng4343/dep/0.1/dep-0.1.jar"
) );
-        assertTrue( requestedUris.toString(), requestedUris.contains( "/org/apache/maven/its/mng4343/dep/0.1/dep-0.1.pom"
) );
+        assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.jar"
) );
+        assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.pom"
) );
         verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar"
);
         verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom"
);
 



Mime
View raw message