Author: bentmann
Date: Tue Feb 10 16:45:39 2009
New Revision: 743012
URL: http://svn.apache.org/viewvc?rev=743012&view=rev
Log:
o Strengthened IT to show outstanding issues
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml
- copied unchanged from r742988,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings-security.xml
- copied unchanged from r742988,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/settings-security.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings.xml
- copied unchanged from r742988,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/settings.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/security-template.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/settings-security.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/settings.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java?rev=743012&r1=743011&r2=743012&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
Tue Feb 10 16:45:39 2009
@@ -24,6 +24,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -39,10 +40,10 @@
/**
* Test that the encrypted auth infos given in the settings.xml are
decrypted.
*/
- public void testit0553()
+ public void testitBasic()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0553" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0553/test-1" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -61,4 +62,41 @@
assertEquals( "testtest", props.getProperty( "test.password" ) );
}
+ /**
+ * Test that the encrypted auth infos given in the settings.xml are
decrypted when the master password resides
+ * in an external file.
+ */
+ /* FIXME: Outstanding bugs in plexus-sec-dispatcher prevent this from
passing
+ public void testitRelocation()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0553/test-2" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+
+ // NOTE: The upper-case scheme name is essential part of the test
+ String secUrl = "FILE://" + new File( testDir,
"relocated-settings-security.xml" ).toURI().getRawPath();
+ Properties filterProps = new Properties();
+ filterProps.setProperty( "@relocation@", secUrl );
+ // NOTE: The tilde ~ in the file name is essential part of the test
+ verifier.filterFile( "security-template.xml", "settings~security.xml",
"UTF-8", filterProps );
+
+ List cliOptions = new ArrayList();
+ cliOptions.add( "--settings" );
+ cliOptions.add( "settings.xml" );
+ verifier.getSystemProperties().setProperty( "maven.sec.path",
"settings~security.xml" );
+ verifier.setCliOptions( cliOptions );
+ // NOTE: The selection of the Turkish language for the JVM locale is
essential part of the test
+ verifier.executeGoal( "validate", Collections.singletonMap(
"MAVEN_OPTS", "-Duser.language=tr" ) );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties props = verifier.loadProperties( "target/auth.properties" );
+ assertEquals( "testuser", props.getProperty( "test.username" ) );
+ assertEquals( "testtest", props.getProperty( "test.password" ) );
+ }
+ //*/
+
}
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/pom.xml?rev=743012&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/pom.xml
Tue Feb 10 16:45:39 2009
@@ -0,0 +1,61 @@
+<?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 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.its.mng0553</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>test</name>
+ <description>
+ Test that the auth infos given in the settings.xml are pushed into the
wagon manager and are available
+ to other components/plugins.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-uses-wagon</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <propertiesFile>target/auth.properties</propertiesFile>
+ <serverIds>
+ <serverId>test</serverId>
+ </serverIds>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>dump-auth</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml?rev=743012&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
Tue Feb 10 16:45:39 2009
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settingsSecurity>
+ <master>{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=}</master>
+</settingsSecurity>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/security-template.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/security-template.xml?rev=743012&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/security-template.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/security-template.xml
Tue Feb 10 16:45:39 2009
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settingsSecurity>
+ <relocation>@relocation@</relocation>
+</settingsSecurity>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/security-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/security-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml?rev=743012&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
Tue Feb 10 16:45:39 2009
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<settings>
+ <servers>
+ <server>
+ <id>test</id>
+ <username>testuser</username>
+ <password>{8+qG0C/CnRsH+45rqY50rWb1cMILU4zu9K/sZ8omYzs=}</password>
+ </server>
+ </servers>
+</settings>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
