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 2009/01/10 23:43:36 UTC
svn commit: r733392 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0097/ resources/mng-2068/test-3/ resources/mng-2068/test-3/plugin/

Author: bentmann
Date: Sat Jan 10 14:43:36 2009
New Revision: 733392

URL: http://svn.apache.org/viewvc?rev=733392&view=rev
Log:
o Merged it0097 into the IT for the corresponding issue MNG-2068

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2068/test-3/
      - copied from r733387, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2068/test-3/plugin/
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/MavenITmng2068ReactorRelativeParentsTest.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=733392&r1=733391&r2=733392&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 Sat Jan 10 14:43:36 2009
@@ -291,7 +291,6 @@
         suite.addTestSuite( MavenIT0130CleanLifecycleTest.class );
         suite.addTestSuite( MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class );
         suite.addTestSuite( MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.class );
-        suite.addTestSuite( MavenIT0097Test.class );
         suite.addTestSuite( MavenIT0090Test.class );
         suite.addTestSuite( MavenIT0087Test.class );
         suite.addTestSuite( MavenIT0086Test.class );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java?rev=733392&r1=733391&r2=733392&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java Sat Jan 10 14:43:36 2009
@@ -49,7 +49,15 @@
     public void testitInheritedIdFields()
         throws Exception
     {
-        testitMNG2068( "test-1" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2068/test-1" );
+        File projectDir = new File( testDir, "parent" );
+
+        Verifier verifier = new Verifier( projectDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
+        verifier.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
     }
 
     /**
@@ -58,14 +66,25 @@
     public void testitExplicitIdFields()
         throws Exception
     {
-        testitMNG2068( "test-2" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2068/test-2" );
+        File projectDir = new File( testDir, "parent" );
+
+        Verifier verifier = new Verifier( projectDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
+        verifier.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
     }
 
-    private void testitMNG2068( String project )
+    /**
+     * Test that the implied relative path for the parent POM works, even two levels deep.
+     */
+    public void testitComplex()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2068/" + project );
-        File projectDir = new File( testDir, "parent" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2068/test-3" );
+        File projectDir = testDir;
 
         Verifier verifier = new Verifier( projectDir.getAbsolutePath() );
         verifier.setAutoclean( false );