You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/08/25 01:20:42 UTC
svn commit: r988758 -
/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/
Author: bentmann
Date: Tue Aug 24 23:20:41 2010
New Revision: 988758
URL: http://svn.apache.org/viewvc?rev=988758&view=rev
Log:
o Enabled ITs for 3.0-beta-3+
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=988758&r1=988757&r2=988758&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Tue Aug 24 23:20:41 2010
@@ -88,7 +88,7 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenITmng4755FetchRemoteMetadataForVersionRangeTest.class );
suite.addTestSuite( MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.class );
suite.addTestSuite( MavenITmng4747JavaAgentUsedByPluginTest.class );
- // suite.addTestSuite( MavenITmng4745PluginVersionUpdateTest.class );
+ suite.addTestSuite( MavenITmng4745PluginVersionUpdateTest.class );
suite.addTestSuite( MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.class );
suite.addTestSuite( MavenITmng4721OptionalPluginDependencyTest.class );
suite.addTestSuite( MavenITmng4720DependencyManagementExclusionMergeTest.class );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java?rev=988758&r1=988757&r2=988758&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java Tue Aug 24 23:20:41 2010
@@ -190,7 +190,7 @@ public class MavenITmng1895ScopeConflict
public void testitProvidedVsTest()
throws Exception
{
- requiresMavenVersion( "[4.0,)" ); // MNG-2686
+ requiresMavenVersion( "[3.0-beta-3,)" ); // MNG-2686
Verifier verifier = run( "provided", "test" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java?rev=988758&r1=988757&r2=988758&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java Tue Aug 24 23:20:41 2010
@@ -132,7 +132,7 @@ public class MavenITmng3599useHttpProxyF
}
}
- public void testmng3599useHttpProxyForHttp()
+ public void testitUseHttpProxyForHttp()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" );
@@ -175,11 +175,10 @@ public class MavenITmng3599useHttpProxyF
/**
* Test that HTTP proxy is used for HTTP and for WebDAV.
*/
- public void testmng3599useHttpProxyForWebDAV()
+ public void testitUseHttpProxyForWebDAV()
throws Exception
{
- // TODO: implement equivalent test for 3.0 once supported
- requiresMavenVersion( "[2.1.0-M1,3.0-alpha-1)" );
+ requiresMavenVersion( "[2.1.0-M1,3.0-alpha-1),[3.0-beta-3,)" );
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java?rev=988758&r1=988757&r2=988758&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java Tue Aug 24 23:20:41 2010
@@ -67,8 +67,7 @@ public class MavenITmng3948ParentResolut
public void testitFromPom()
throws Exception
{
- // TODO: fate of POM repositories in 3.x is unclear, disabled for now
- requiresMavenVersion( "[2.0,3.0-alpha-1)" );
+ requiresMavenVersion( "[2.0,3.0-alpha-1),[3.0-beta-1,)" );
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3948/test-2" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java?rev=988758&r1=988757&r2=988758&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java Tue Aug 24 23:20:41 2010
@@ -67,8 +67,7 @@ public class MavenITmng3970DepResolution
public void testitFromPom()
throws Exception
{
- // TODO: fate of POM repositories in 3.x is unclear, disabled for now
- requiresMavenVersion( "[2.0,3.0-alpha-1)" );
+ requiresMavenVersion( "[2.0,3.0-alpha-1),[3.0-beta-1,)" );
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3970/test-2" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java?rev=988758&r1=988757&r2=988758&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java Tue Aug 24 23:20:41 2010
@@ -50,7 +50,7 @@ public class MavenITmng4768NearestMatchC
public void testitADB()
throws Exception
{
- requiresMavenVersion( "[4.0,)" );
+ requiresMavenVersion( "[3.0-beta-3,)" );
testit( "test-adb" );
}
@@ -69,7 +69,7 @@ public class MavenITmng4768NearestMatchC
public void testitDAB()
throws Exception
{
- requiresMavenVersion( "[4.0,)" );
+ requiresMavenVersion( "[3.0-beta-3,)" );
testit( "test-dab" );
}