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/08/05 18:30:04 UTC
svn commit: r682775 - in
/maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/
resources/mng-2477-repository-security/
resources/mng-2477-repository-security/test-bad-checksum/ resour...
Author: brett
Date: Tue Aug 5 09:30:04 2008
New Revision: 682775
URL: http://svn.apache.org/viewvc?rev=682775&view=rev
Log:
[MNG-2477] add tests for the checksum requirements shown in the proposal - disabled. Implementing is incredibly difficult with the project <-> artifact coupling in place today
Added:
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-checksum/
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-checksum/pom.xml (with props)
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-pom-checksum/
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-pom-checksum/pom.xml (with props)
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-checksum/
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-checksum/pom.xml (with props)
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-deployment/
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-deployment/pom.xml
- copied, changed from r682589, maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/pom.xml
Removed:
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/pom.xml
Modified:
maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2477RepositorySecurityTest.java
Modified: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2477RepositorySecurityTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2477RepositorySecurityTest.java?rev=682775&r1=682774&r2=682775&view=diff
==============================================================================
--- maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2477RepositorySecurityTest.java (original)
+++ maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2477RepositorySecurityTest.java Tue Aug 5 09:30:04 2008
@@ -20,48 +20,112 @@
package org.apache.maven.integrationtests;
import java.io.File;
-import java.util.Collections;
+import java.io.IOException;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
import org.apache.maven.it.util.ResourceExtractor;
/**
- * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3052">MNG-3052</a>. When a project dependency
- * declares its own repositories, they should be used to resolve that dependency's dependencies. This includes both
- * steps: determining the dependency artifact information (version, etc.) AND resolving the actual artifact itself.
- * NOTE: The SNAPSHOT versions are CRITICAL in this test, since they force the correct resolution of artifact metadata,
- * which depends on having the correct set of repositories present.
- *
- * @author jdcasey
+ * This is a test set for the repository security features.
*/
public class MavenITmng2477RepositorySecurityTest
extends AbstractMavenIntegrationTestCase
{
+ private File mainTestDir;
+
public MavenITmng2477RepositorySecurityTest()
throws InvalidVersionSpecificationException
{
super( "(2.0.100,)" ); // only test in 2.1+
}
+ public void setUp()
+ throws IOException
+ {
+ mainTestDir =
+ ResourceExtractor.simpleExtractResources( getClass(), "/mng-2477-repository-security" ).getCanonicalFile();
+ }
+
+ /* Checksum tests are not yet implemented
+ public void testitMNG2477RequiredChecksums()
+ throws IOException, VerificationException
+ {
+ File testDir = new File( mainTestDir, "test-checksum" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ verifier.executeGoal( "compile" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertArtifactPresent( "junit", "junit", "3.8.1", "pom" );
+ verifier.assertArtifactPresent( "junit", "junit", "3.8.1", "jar" );
+
+ verifier.assertArtifactPresent( "commons-logging", "commons-logging-api", "1.1", "pom" );
+ verifier.assertArtifactPresent( "commons-logging", "commons-logging-api", "1.1", "jar" );
+ }
+
+ public void testitMNG2477RequiredChecksumFail()
+ throws IOException, VerificationException
+ {
+ File testDir = new File( mainTestDir, "test-bad-checksum" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ try
+ {
+ verifier.executeGoal( "compile" );
+ fail( "Execution should not succeed with an invalid checksum" );
+ }
+ catch ( VerificationException e )
+ {
+ // expected
+ }
+ finally
+ {
+ verifier.resetStreams();
+ }
+ }
+
+ public void testitMNG2477RequiredChecksumPomFail()
+ throws IOException, VerificationException
+ {
+ File testDir = new File( mainTestDir, "test-bad-pom-checksum" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ try
+ {
+ verifier.executeGoal( "compile" );
+ fail( "Execution should not succeed with an invalid checksum" );
+ }
+ catch ( VerificationException e )
+ {
+ // expected
+ }
+ finally
+ {
+ verifier.resetStreams();
+ }
+ }*/
+
public void testitMNG2477DeploymentPOMIsConvertedToModelv400()
throws Exception
{
- File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/mng-2477-repository-security" ).getCanonicalFile();
+ File testDir = new File( mainTestDir, "test-deployment" );
File repository = new File( testDir, "deployment-repository" );
FileUtils.deleteDirectory( repository );
- File file = new File( repository, "org/apache/maven/its/mng2477/test-project/1.0/test-project-1.0.pom" );
+ File file = new File( repository, "org/apache/maven/its/mng2477/test-deployment/1.0/test-deployment-1.0.pom" );
assertFalse( file.exists() );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng2477", "test-project", "1.0", "pom" );
-
- verifier.setCliOptions( Collections.singletonList( "-X" ) );
-
+ verifier.deleteArtifact( "org.apache.maven.its.mng2477", "test-deployment", "1.0", "pom" );
+
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -71,7 +135,7 @@
// TODO: would be better to read it back as a model
String contents = FileUtils.fileRead( file );
assertFalse( contents.indexOf( "signaturePolicy" ) >= 0 );
- // not implementeed yet
- // assertTrue( contents.indexOf( "requiredChecksum value=\"99129f16442844f6a4a11ae22fbbee40b14d774f\" pom=\"16d74791c801c89b0071b1680ea0bc85c93417bb\"" ) >= 0 );
+ // not implemented yet
+// assertTrue( contents.indexOf( "requiredChecksum value=\"99129f16442844f6a4a11ae22fbbee40b14d774f\" pom=\"16d74791c801c89b0071b1680ea0bc85c93417bb\"" ) >= 0 );
}
}
Added: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-checksum/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-checksum/pom.xml?rev=682775&view=auto
==============================================================================
--- maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-checksum/pom.xml (added)
+++ maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-checksum/pom.xml Tue Aug 5 09:30:04 2008
@@ -0,0 +1,16 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng2477</groupId>
+ <version>1.0</version>
+ <artifactId>test-bad-checksum</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ <requiredChecksum value="16d74791c801c89b0071b1680ea0bc85c93417bb" />
+ </dependency>
+ </dependencies>
+</project>
+
Propchange: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-checksum/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-pom-checksum/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-pom-checksum/pom.xml?rev=682775&view=auto
==============================================================================
--- maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-pom-checksum/pom.xml (added)
+++ maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-pom-checksum/pom.xml Tue Aug 5 09:30:04 2008
@@ -0,0 +1,16 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng2477</groupId>
+ <version>1.0</version>
+ <artifactId>test-bad-pom-checksum</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ <requiredChecksum value="99129f16442844f6a4a11ae22fbbee40b14d774f" pom="99129f16442844f6a4a11ae22fbbee40b14d774f" />
+ </dependency>
+ </dependencies>
+</project>
+
Propchange: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-bad-pom-checksum/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-checksum/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-checksum/pom.xml?rev=682775&view=auto
==============================================================================
--- maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-checksum/pom.xml (added)
+++ maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-checksum/pom.xml Tue Aug 5 09:30:04 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng2477</groupId>
+ <version>1.0</version>
+ <artifactId>test-checksum</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ <requiredChecksum value="99129f16442844f6a4a11ae22fbbee40b14d774f" pom="16d74791c801c89b0071b1680ea0bc85c93417bb" />
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ <requiredChecksum value="7d4cf5231d46c8524f9b9ed75bb2d1c69ab93322" />
+ </dependency>
+ </dependencies>
+</project>
+
Propchange: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-checksum/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-deployment/pom.xml (from r682589, maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/pom.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-deployment/pom.xml?p2=maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-deployment/pom.xml&p1=maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/pom.xml&r1=682589&r2=682775&rev=682775&view=diff
==============================================================================
--- maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/pom.xml (original)
+++ maven/core-integration-testing/branches/MNG-2477/core-integration-tests/src/test/resources/mng-2477-repository-security/test-deployment/pom.xml Tue Aug 5 09:30:04 2008
@@ -2,15 +2,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng2477</groupId>
<version>1.0</version>
- <artifactId>test-project</artifactId>
- <name>test-project</name>
+ <artifactId>test-deployment</artifactId>
+ <name>test-deployment</name>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
-<!-- later
+<!-- TODO: not implemented
<requiredChecksum value="99129f16442844f6a4a11ae22fbbee40b14d774f" pom="16d74791c801c89b0071b1680ea0bc85c93417bb" />
-->
</dependency>