You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/11 22:14:41 UTC
svn commit: r636105 - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/
resources/mng-2123-npe-with-conflicting-ranges/
resources/mng-2861relocationsAndRanges/MNG-2861/A/ resources/mng-286...
Author: brianf
Date: Tue Mar 11 14:14:37 2008
New Revision: 636105
URL: http://svn.apache.org/viewvc?rev=636105&view=rev
Log:
fixed the versions on some recent its
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/ (props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/A/ (props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/ (props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/C/ (props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomA/ (props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomB/ (props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/ (props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/ (props changed)
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=636105&r1=636104&r2=636105&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Tue Mar 11 14:14:37 2008
@@ -183,7 +183,11 @@
suite.addTestSuite( MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.class );
suite.addTestSuite( MavenITmng3394POMPluginVersionDominanceTest.class );
suite.addTestSuite( MavenITmng2861RelocationsAndRanges.class );
-
+ suite.addTestSuite( MavenITmng2972OverridePluginDependency.class );
+
+ //not fixed in the code yet. Test is correct.
+ //suite.addTestSuite( MavenITmng3284UsingCachedPluginsTest.class );
+
// ----------------------------------------------------------------------------------------------------
// Tests that need to be fixed.
// ----------------------------------------------------------------------------------------------------
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java?rev=636105&r1=636104&r2=636105&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java Tue Mar 11 14:14:37 2008
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@@ -12,6 +13,13 @@
public class MavenITmng2123VersionRangeDependencyTest
extends AbstractMavenIntegrationTestCase
{
+
+ public MavenITmng2123VersionRangeDependencyTest()
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.0.8,)" );
+ }
+
public void testitMNG2123 ()
throws Exception
{
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java?rev=636105&r1=636104&r2=636105&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java Tue Mar 11 14:14:37 2008
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@@ -12,6 +13,12 @@
public class MavenITmng2861RelocationsAndRanges
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2861RelocationsAndRanges()
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.0.8,)" );
+ }
+
public void testitMNG2123 ()
throws Exception
{
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java?rev=636105&r1=636104&r2=636105&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java Tue Mar 11 14:14:37 2008
@@ -1,13 +1,12 @@
package org.apache.maven.integrationtests;
import java.io.File;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import junit.framework.Assert;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@@ -17,6 +16,12 @@
public class MavenITmng3284UsingCachedPluginsTest
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng3284UsingCachedPluginsTest()
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.0.8,)" );
+ }
+
public void testitMNG3284Test()
throws Exception
{
@@ -65,8 +70,8 @@
verifier.resetStreams();
- Assert.assertEquals( "Should be using plugin version 1 only once", 1,foundVersionOne );
- Assert.assertEquals( "Should be using plugin version 2 only once", 1,foundVersionTwo );
+ Assert.assertEquals( "Should be using plugin version 1 only once.", 1,foundVersionOne );
+ Assert.assertEquals( "Should be using plugin version 2 only once.", 1,foundVersionTwo );
}
}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+target
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/A/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+target
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+target
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/C/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+target
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomA/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+target
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomB/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+*
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+target
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 11 14:14:37 2008
@@ -0,0 +1 @@
+target