Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Decoupled ITs from POM resolution error handling 

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@929937 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-04-01 11:40:03 +00:00
parent 0b07e81350
commit 24cdbaf4e3
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
View File

@ -96,6 +96,16 @@ public class MavenITmng3461MirrorMatchingTest
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 );

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
View File

@ -71,7 +71,7 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
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 MavenITmng4343MissingReleaseUpdatePolicyTest
// 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 MavenITmng4343MissingReleaseUpdatePolicyTest
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 MavenITmng4343MissingReleaseUpdatePolicyTest
// 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 MavenITmng4343MissingReleaseUpdatePolicyTest
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" );