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/16 17:56:45 UTC

svn commit: r735055 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0115/ resources/it0115/test-extension/ resources/it0115/test-project/

Author: bentmann
Date: Fri Jan 16 08:56:45 2009
New Revision: 735055

URL: http://svn.apache.org/viewvc?rev=735055&view=rev
Log:
o Decoupled it0115 from production deps/plugins

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/pom.xml   (with props)
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/test-extension/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/test-project/
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java?rev=735055&r1=735054&r2=735055&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java Fri Jan 16 08:56:45 2009
@@ -28,35 +28,27 @@
     extends AbstractMavenIntegrationTestCase
 {
 
-    public MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest() {
-        super( "(2.0.1,2.0.5),(2.0.6,2.99.99)" );//extension support removed from 3.0
+    public MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest()
+    {
+        super( "(2.0.1,2.0.5),(2.0.6,2.99.99)" ); //extension support removed from 3.0
     }
 
-    public void testit0115()
+    /**
+     * Test the use of a custom lifecycle from a plugin that is defined as a build extension.
+     */
+    public void testitMNG2831()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0115" );
 
-        Verifier verifier;
-
-        // Install the parent POM
-        verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.deleteArtifact( "org.apache.maven.its.it0115", "test-extension", "1.0-SNAPSHOT", "jar" );
-        verifier.deleteArtifact( "org.apache.maven.its.it0115", "test-project", "1.0-SNAPSHOT", "jar" );
-
-        // Install the plugin to test for Authz info in the WagonManager
-        verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
-        verifier.executeGoal( "install" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        // Build the test project that uses the plugin.
-        File testProject = new File( testDir.getAbsolutePath(), "test-project" );
-        verifier = new Verifier( testProject.getAbsolutePath() );
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
         verifier.executeGoal( "package" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        verifier.assertFilePresent( new File( testProject, "target/test-project.xar" ).getAbsolutePath() );
+        verifier.assertFilePresent( "target/test-1.0-it.jar" );
     }
+
 }

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/pom.xml?rev=735055&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/pom.xml Fri Jan 16 08:56:45 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng2831</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0</version>
+  <!-- The packaging defined by the IT plugin -->
+  <packaging>it-packaging</packaging>
+
+  <name>Maven Integration Test :: MNG-2831</name> 
+  <description>
+    Test the use of a custom lifecycle from a plugin that is defined as a build extension.
+  </description>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-packaging</artifactId>
+        <version>2.1-SNAPSHOT</version>
+      </extension>
+    </extensions>
+  </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0115/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision