From a8e13d13db7bac80269279858d2cc8da78c8fa20 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 29 Jan 2009 20:49:47 +0000 Subject: [PATCH] mark up ITs that still need to be fixed in a future alpha of 3.0 git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@739005 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java | 4 ++-- .../org/apache/maven/it/MavenITmng1830ShowVersionTest.java | 2 +- .../it/MavenITmng2668UsePluginDependenciesForSortingTest.java | 2 +- .../maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java | 4 ++-- .../maven/it/MavenITmng3600DeploymentModeDefaultsTest.java | 3 ++- .../apache/maven/it/MavenITmng3652UserAgentHeaderTest.java | 3 ++- .../maven/it/MavenITmng3729MultiForkAggregatorsTest.java | 2 +- .../apache/maven/it/MavenITmng3760BaseUriPropertyTest.java | 3 ++- .../maven/it/MavenITmng3810BadProfileActivationTest.java | 3 ++- .../apache/maven/it/MavenITmng3920PlexusComponentApiTest.java | 3 ++- 10 files changed, 17 insertions(+), 12 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index 2ce7501811..025253ae33 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -32,8 +32,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest { public MavenITmng0553SettingsAuthzEncryptionTest() { - super( "(2.1.0-M1,2.99)" ); // 2.1.0-M2+ - //super( "(2.0.9,2.1.0-M1),(2.1.0-M1,2.1.99)" ); // 2.0.10+, excluding 2.1.0-M1 + // TODO: reintroduce for 3.0 + super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M2+ } /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java index 470392b4dc..db59506a07 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java @@ -40,7 +40,7 @@ public class MavenITmng1830ShowVersionTest public MavenITmng1830ShowVersionTest() { // TODO: reinstate for 3.0 - super( "(2.0.10,2.1.0-M1),(2.1.0-M1,2.999)" ); // Maven 2.0.11 + , 2.1.0-M2 + + super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // Maven 2.0.11 + , 2.1.0-M2 + } /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java index b9610d628a..c4318fafd9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java @@ -29,7 +29,7 @@ public class MavenITmng2668UsePluginDependenciesForSortingTest { public MavenITmng2668UsePluginDependenciesForSortingTest() { - // TODO: estimated fix by 3.0-alpha-3 + // TODO: estimated fix by 3.0-alpha-4 super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M2+ } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java index 154fda99ee..ce2c401345 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java @@ -182,8 +182,8 @@ public class MavenITmng3599useHttpProxyForWebDAVTest public void testmng3599useHttpProxyForWebDAV() throws Exception { - // Doesn't work until 2.1.0-M1+ - if ( matchesVersionRange( "[2.1.0-M1, 2.99.99)" ) ) + // TODO: implement equivalent test for 3.0 once supported + if ( matchesVersionRange( "[2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ) ) //2.1.0-M1+ { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java index 4a1cb58047..84a721ce18 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -32,7 +32,8 @@ public class MavenITmng3600DeploymentModeDefaultsTest { public MavenITmng3600DeploymentModeDefaultsTest() { - super( "(2.1.0-M1,)" ); + // TODO: implement for 3.0 + super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); } public void testitMNG3600NoSettings() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index b4662a55ae..5a0eb17a96 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -46,7 +46,8 @@ public class MavenITmng3652UserAgentHeaderTest public MavenITmng3652UserAgentHeaderTest() { - super( "[2.1.0-M1,2.99.99)" ); + // TODO: re-instate feature in 3.0 + super( "[2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M1+ } public void setUp() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java index efa7783a43..ea6a5642e3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java @@ -52,7 +52,7 @@ public class MavenITmng3729MultiForkAggregatorsTest { public MavenITmng3729MultiForkAggregatorsTest() { - super( "(2.0.8,2.99.99)" ); // only test in 2.0.9+ + super( "(2.0.8,3.0-alpha-1),(3.0-alpha-3,)" ); // only test in 2.0.9+ //TODO: FIX: Disabled for 3.0.x, causes infinite looping on Mac. } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java index 8dda9af236..da5d66144c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java @@ -39,7 +39,8 @@ public class MavenITmng3760BaseUriPropertyTest public MavenITmng3760BaseUriPropertyTest() { - super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-1,)" ); // 2.1.0-M2+, 3.0-alpha-2+ + // TODO: fix for 3.0 + super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M2+ } public void testitMNG3760() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java index f91b1b58b4..0c1f3150c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java @@ -37,7 +37,8 @@ public class MavenITmng3810BadProfileActivationTest public MavenITmng3810BadProfileActivationTest() { - super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-1,)" ); // 2.0.10+, 2.1.0-M2+, 3.0-alpha-2+ + // TODO: implement for 3.0 + super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.0.11+, 2.1.0-M2+ } public void testitMNG3810Property() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java index 30289d4c07..bb5b093abd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java @@ -33,7 +33,8 @@ public class MavenITmng3920PlexusComponentApiTest { public MavenITmng3920PlexusComponentApiTest() { - super( "(2.0.10,2.1.0-M1),(2.1.0-M1,)" ); // only test in 2.0.11+, and not in 2.1.0-M1 + // TODO: implement for 3.0 + super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.0.11+, 2.1.0-M2+ } public void testitMNG3920()