You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/08/03 22:32:05 UTC

svn commit: r800543 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4279/ resources/mng-4279/src/ resources/mng-4279/src/main/ resources/mng-4279/src/main/java/ resources/mng-4279/src/main/java...

Author: jdcasey
Date: Mon Aug  3 20:32:04 2009
New Revision: 800543

URL: http://svn.apache.org/viewvc?rev=800543&view=rev
Log:
[MNG-4279] Test graceful failure of wagon provider selection

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/pom.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/settings.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/mng4279/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/mng4279/App.java   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/mng4279/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/mng4279/AppTest.java   (with props)
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.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=800543&r1=800542&r2=800543&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 Mon Aug  3 20:32:04 2009
@@ -86,6 +86,7 @@
         // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
 
+        suite.addTestSuite( MavenITmng4279WagonProviderFailoverTest.class );
         suite.addTestSuite( MavenITmng4276WrongTransitivePlexusUtilsTest.class );
         suite.addTestSuite( MavenITmng4274PluginRealmArtifactsTest.class );
         suite.addTestSuite( MavenITmng4273RestrictedCoreRealmAccessForPluginTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java?rev=800543&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java Mon Aug  3 20:32:04 2009
@@ -0,0 +1,55 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4279">MNG-4279</a>.
+ *
+ * @author John Casey
+ */
+public class MavenITmng4279WagonProviderFailoverTest
+    extends AbstractMavenIntegrationTestCase
+{
+
+    public MavenITmng4279WagonProviderFailoverTest()
+    {
+        super( "(2.2.0,2.99.99]" );
+    }
+
+    public void testit()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4279" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        
+        verifier.getCliOptions().add( "-s" );
+        verifier.getCliOptions().add( "settings.xml" );
+        verifier.executeGoal( "deploy" );
+        
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/pom.xml?rev=800543&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/pom.xml Mon Aug  3 20:32:04 2009
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.it.mng4279</groupId>
+  <artifactId>mng-4279</artifactId>
+  <packaging>jar</packaging>
+  <version>1</version>
+  <name>mng-4279</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+  <distributionManagement>
+    <repository>
+      <id>central</id>
+      <url>file:///${java.io.tmpdir}/${project.artifactId}</url>
+    </repository>
+  </distributionManagement>
+</project>

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

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/settings.xml?rev=800543&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/settings.xml Mon Aug  3 20:32:04 2009
@@ -0,0 +1,10 @@
+<settings>
+  <servers>
+    <server>
+      <id>central</id>
+      <configuration>
+        <wagonProvider>lightweight</wagonProvider>
+      </configuration>
+    </server>
+  </servers>
+</settings>

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

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/mng4279/App.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/mng4279/App.java?rev=800543&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/mng4279/App.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/mng4279/App.java Mon Aug  3 20:32:04 2009
@@ -0,0 +1,13 @@
+package org.apache.maven.it.mng4279;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/main/java/org/apache/maven/it/mng4279/App.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/mng4279/AppTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/mng4279/AppTest.java?rev=800543&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/mng4279/AppTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/mng4279/AppTest.java Mon Aug  3 20:32:04 2009
@@ -0,0 +1,38 @@
+package org.apache.maven.it.mng4279;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4279/src/test/java/org/apache/maven/it/mng4279/AppTest.java
------------------------------------------------------------------------------
    svn:eol-style = native