Author: brett
Date: Tue Jul 8 22:20:48 2008
New Revision: 675096
URL: http://svn.apache.org/viewvc?rev=675096&view=rev
Log:
consolidate the string wagons
Removed:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=675096&r1=675095&r2=675096&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Tue Jul 8 22:20:48 2008
@@ -52,7 +52,6 @@
public class DefaultWagonManagerTest
extends PlexusTestCase
{
-
private DefaultWagonManager wagonManager;
private TransferListener transferListener = new Debug();
@@ -87,9 +86,9 @@
{
Artifact artifact = createTestPomArtifact(
"target/test-data/get-remote-artifact" );
- ArtifactRepository repo = createNoOpRepo();
+ ArtifactRepository repo = createStringRepo();
- StringWagon wagon = (StringWagon) wagonManager.getWagon( "noop" );
+ StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ),
"expected" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ) +
".md5", "bad_checksum" );
@@ -98,10 +97,10 @@
assertTrue( artifact.getFile().exists() );
}
- private ArtifactRepository createNoOpRepo()
+ private ArtifactRepository createStringRepo()
{
ArtifactRepository repo =
- new DefaultArtifactRepository( "id", "noop://url", new
ArtifactRepositoryLayoutStub() );
+ new DefaultArtifactRepository( "id", "string://url", new
ArtifactRepositoryLayoutStub() );
return repo;
}
@@ -268,7 +267,7 @@
assertWagon( "c" );
- assertWagon( "noop" );
+ assertWagon( "string" );
try
{
@@ -339,163 +338,91 @@
ArtifactRepository repo =
new DefaultArtifactRepository( "id", "string://url", new
ArtifactRepositoryLayoutStub(), policy, policy );
- File tmpFile = File.createTempFile( "mvn-cs-test", ".temp" );
- File sha1File = new File( tmpFile.getPath() + ".sha1" );
- File md5File = new File( tmpFile.getPath() + ".md5" );
+ Artifact artifact =
+ new DefaultArtifact( "sample.group", "sample-art",
VersionRange.createFromVersion( "1.0" ), "scope",
+ "jar", "classifier", null );
+ artifact.setFile( getTestFile( "target/sample-art" ) );
+
+ StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
+
+ wagon.clearExpectedContent();
+ wagon.addExpectedContent( "path", "lower-case-checksum" );
+ wagon.addExpectedContent( "path.sha1",
"2a25dc564a3b34f68237fc849066cbc7bb7a36a1" );
+
+ try
+ {
+ wagonManager.getArtifact( artifact, repo );
+ }
+ catch ( ChecksumFailedException e )
+ {
+ fail( "Checksum verification did not pass: " + e.getMessage() );
+ }
+
+ wagon.clearExpectedContent();
+ wagon.addExpectedContent( "path", "upper-case-checksum" );
+ wagon.addExpectedContent( "path.sha1",
"B7BB97D7D0B9244398D9B47296907F73313663E6" );
+
+ try
+ {
+ wagonManager.getArtifact( artifact, repo );
+ }
+ catch ( ChecksumFailedException e )
+ {
+ fail( "Checksum verification did not pass: " + e.getMessage() );
+ }
+
+ wagon.clearExpectedContent();
+ wagon.addExpectedContent( "path", "expected-failure" );
+ wagon.addExpectedContent( "path.sha1",
"b7bb97d7d0b9244398d9b47296907f73313663e6" );
+
+ try
+ {
+ wagonManager.getArtifact( artifact, repo );
+ fail( "Checksum verification did not fail" );
+ }
+ catch ( ChecksumFailedException e )
+ {
+ // expected
+ }
+
+ wagon.clearExpectedContent();
+ wagon.addExpectedContent( "path", "lower-case-checksum" );
+ wagon.addExpectedContent( "path.md5",
"50b2cf50a103a965efac62b983035cac" );
+
+ try
+ {
+ wagonManager.getArtifact( artifact, repo );
+ }
+ catch ( ChecksumFailedException e )
+ {
+ fail( "Checksum verification did not pass: " + e.getMessage() );
+ }
+
+ wagon.clearExpectedContent();
+ wagon.addExpectedContent( "path", "upper-case-checksum" );
+ wagon.addExpectedContent( "path.md5",
"842F568FCCFEB7E534DC72133D42FFDC" );
+
+ try
+ {
+ wagonManager.getArtifact( artifact, repo );
+ }
+ catch ( ChecksumFailedException e )
+ {
+ fail( "Checksum verification did not pass: " + e.getMessage() );
+ }
+
+ wagon.clearExpectedContent();
+ wagon.addExpectedContent( "path", "expected-failure" );
+ wagon.addExpectedContent( "path.md5",
"b7bb97d7d0b9244398d9b47296907f73313663e6" );
try
{
- Artifact artifact =
- new DefaultArtifact( "sample.group", "sample-art",
VersionRange.createFromVersion( "1.0" ), "scope",
- "jar", "classifier", null );
- artifact.setFile( tmpFile );
-
- {
- Xpp3Dom path = new Xpp3Dom( "path" );
- path.setValue( "lower-case-checksum" );
- Xpp3Dom sha1 = new Xpp3Dom( "path.sha1" );
- sha1.setValue( "2a25dc564a3b34f68237fc849066cbc7bb7a36a1" );
- Xpp3Dom resourceStrings = new Xpp3Dom( "resourceStrings" );
- resourceStrings.addChild( path );
- resourceStrings.addChild( sha1 );
- Xpp3Dom conf = new Xpp3Dom( "configuration" );
- conf.addChild( resourceStrings );
-
- wagonManager.addConfiguration( repo.getId(), conf );
-
- try
- {
- wagonManager.getArtifact( artifact, repo );
- }
- catch ( ChecksumFailedException e )
- {
- fail( "Checksum verification did not pass: " +
e.getMessage() );
- }
- }
-
- {
- Xpp3Dom path = new Xpp3Dom( "path" );
- path.setValue( "upper-case-checksum" );
- Xpp3Dom sha1 = new Xpp3Dom( "path.sha1" );
- sha1.setValue( "B7BB97D7D0B9244398D9B47296907F73313663E6" );
- Xpp3Dom resourceStrings = new Xpp3Dom( "resourceStrings" );
- resourceStrings.addChild( path );
- resourceStrings.addChild( sha1 );
- Xpp3Dom conf = new Xpp3Dom( "configuration" );
- conf.addChild( resourceStrings );
-
- wagonManager.addConfiguration( repo.getId(), conf );
-
- try
- {
- wagonManager.getArtifact( artifact, repo );
- }
- catch ( ChecksumFailedException e )
- {
- fail( "Checksum verification did not pass: " +
e.getMessage() );
- }
- }
-
- {
- Xpp3Dom path = new Xpp3Dom( "path" );
- path.setValue( "expected-failure" );
- Xpp3Dom sha1 = new Xpp3Dom( "path.sha1" );
- sha1.setValue( "b7bb97d7d0b9244398d9b47296907f73313663e6" );
- Xpp3Dom resourceStrings = new Xpp3Dom( "resourceStrings" );
- resourceStrings.addChild( path );
- resourceStrings.addChild( sha1 );
- Xpp3Dom conf = new Xpp3Dom( "configuration" );
- conf.addChild( resourceStrings );
-
- wagonManager.addConfiguration( repo.getId(), conf );
-
- try
- {
- wagonManager.getArtifact( artifact, repo );
- fail( "Checksum verification did not fail" );
- }
- catch ( ChecksumFailedException e )
- {
- // expected
- }
- }
-
- {
- Xpp3Dom path = new Xpp3Dom( "path" );
- path.setValue( "lower-case-checksum" );
- Xpp3Dom md5 = new Xpp3Dom( "path.md5" );
- md5.setValue( "50b2cf50a103a965efac62b983035cac" );
- Xpp3Dom resourceStrings = new Xpp3Dom( "resourceStrings" );
- resourceStrings.addChild( path );
- resourceStrings.addChild( md5 );
- Xpp3Dom conf = new Xpp3Dom( "configuration" );
- conf.addChild( resourceStrings );
-
- wagonManager.addConfiguration( repo.getId(), conf );
-
- try
- {
- wagonManager.getArtifact( artifact, repo );
- }
- catch ( ChecksumFailedException e )
- {
- fail( "Checksum verification did not pass: " +
e.getMessage() );
- }
- }
-
- {
- Xpp3Dom path = new Xpp3Dom( "path" );
- path.setValue( "upper-case-checksum" );
- Xpp3Dom md5 = new Xpp3Dom( "path.md5" );
- md5.setValue( "842F568FCCFEB7E534DC72133D42FFDC" );
- Xpp3Dom resourceStrings = new Xpp3Dom( "resourceStrings" );
- resourceStrings.addChild( path );
- resourceStrings.addChild( md5 );
- Xpp3Dom conf = new Xpp3Dom( "configuration" );
- conf.addChild( resourceStrings );
-
- wagonManager.addConfiguration( repo.getId(), conf );
-
- try
- {
- wagonManager.getArtifact( artifact, repo );
- }
- catch ( ChecksumFailedException e )
- {
- fail( "Checksum verification did not pass: " +
e.getMessage() );
- }
- }
-
- {
- Xpp3Dom path = new Xpp3Dom( "path" );
- path.setValue( "expected-failure" );
- Xpp3Dom md5 = new Xpp3Dom( "path.md5" );
- md5.setValue( "b7bb97d7d0b9244398d9b47296907f73313663e6" );
- Xpp3Dom resourceStrings = new Xpp3Dom( "resourceStrings" );
- resourceStrings.addChild( path );
- resourceStrings.addChild( md5 );
- Xpp3Dom conf = new Xpp3Dom( "configuration" );
- conf.addChild( resourceStrings );
-
- wagonManager.addConfiguration( repo.getId(), conf );
-
- try
- {
- wagonManager.getArtifact( artifact, repo );
- fail( "Checksum verification did not fail" );
- }
- catch ( ChecksumFailedException e )
- {
- // expected
- }
- }
-
- }
- finally
- {
- tmpFile.delete();
- sha1File.delete();
- md5File.delete();
+ wagonManager.getArtifact( artifact, repo );
+ fail( "Checksum verification did not fail" );
+ }
+ catch ( ChecksumFailedException e )
+ {
+ // expected
}
}
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java?rev=675096&r1=675095&r2=675096&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
Tue Jul 8 22:20:48 2008
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.io.File;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
@@ -31,6 +33,7 @@
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringOutputStream;
@@ -46,7 +49,7 @@
public String[] getSupportedProtocols()
{
- return new String[] { "noop" };
+ return new String[] { "string" };
}
public void closeConnection()
@@ -64,6 +67,7 @@
if ( content != null )
{
resource.setContentLength( content.length() );
+ resource.setLastModified( System.currentTimeMillis() );
inputData.setInputStream( new StringInputStream( content ) );
}
@@ -83,4 +87,9 @@
throws ConnectionException, AuthenticationException
{
}
+
+ public void clearExpectedContent()
+ {
+ expectedContent.clear();
+ }
}
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml?rev=675096&r1=675095&r2=675096&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
Tue Jul 8 22:20:48 2008
@@ -41,13 +41,8 @@
</component>
<component>
<role>org.apache.maven.wagon.Wagon</role>
- <role-hint>noop</role-hint>
-
<implementation>org.apache.maven.artifact.manager.StringWagon</implementation>
- </component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
<role-hint>string</role-hint>
-
<implementation>org.apache.maven.artifact.manager.WagonString</implementation>
+
<implementation>org.apache.maven.artifact.manager.StringWagon</implementation>
</component>
<component>
<role>org.apache.maven.artifact.repository.authentication.AuthenticationInfoProvider</role>
