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 2008/11/29 21:38:28 UTC
svn commit: r721713 - in
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager:
DefaultWagonManagerTest.java StringWagon.java
Author: bentmann
Date: Sat Nov 29 12:38:27 2008
New Revision: 721713
URL: http://svn.apache.org/viewvc?rev=721713&view=rev
Log:
o Stabilized tests
Modified:
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
Modified: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=721713&r1=721712&r2=721713&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Sat Nov 29 12:38:27 2008
@@ -210,7 +210,7 @@
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
@@ -220,6 +220,7 @@
{
Artifact artifact = createTestPomArtifact( "target/test-data/get-remote-pom" );
artifact.getFile().createNewFile();
+ artifact.getFile().setLastModified( System.currentTimeMillis() - 60 * 1000 );
ArtifactRepository repo = createStringRepo();
@@ -235,7 +236,7 @@
wagonManager.getArtifact( artifact, repo, true );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
@@ -300,7 +301,7 @@
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
@@ -310,6 +311,7 @@
{
Artifact artifact = createTestArtifact( "target/test-data/get-remote-jar", "jar" );
artifact.getFile().createNewFile();
+ artifact.getFile().setLastModified( System.currentTimeMillis() - 60 * 1000 );
ArtifactRepository repo = createStringRepo();
@@ -325,7 +327,7 @@
wagonManager.getArtifact( artifact, repo, true );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
@@ -355,7 +357,7 @@
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
@@ -365,6 +367,7 @@
{
Artifact artifact = createTestArtifact( "target/test-data/get-remote-jar", "1.0-SNAPSHOT", "jar" );
artifact.getFile().createNewFile();
+ artifact.getFile().setLastModified( System.currentTimeMillis() - 60 * 1000 );
ArtifactRepository repo = createStringRepo();
@@ -383,7 +386,7 @@
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
- assertEquals( "", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
@@ -393,6 +396,7 @@
{
Artifact artifact = createTestArtifact( "target/test-data/get-remote-jar", "1.0-SNAPSHOT", "jar" );
artifact.getFile().createNewFile();
+ artifact.getFile().setLastModified( System.currentTimeMillis() - 60 * 1000 );
ArtifactRepository repo = createStringRepo();
@@ -413,7 +417,7 @@
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
@@ -423,6 +427,7 @@
{
Artifact artifact = createTestArtifact( "target/test-data/get-remote-jar", "1.0-SNAPSHOT", "jar" );
artifact.getFile().createNewFile();
+ artifact.getFile().setLastModified( System.currentTimeMillis() - 60 * 1000 );
ArtifactRepository repo = createStringRepo();
@@ -440,7 +445,7 @@
wagonManager.getArtifact( artifact, repo, true );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
Modified: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java?rev=721713&r1=721712&r2=721713&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java Sat Nov 29 12:38:27 2008
@@ -19,8 +19,9 @@
* under the License.
*/
-import java.io.File;
-import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
@@ -33,9 +34,6 @@
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;
public class StringWagon
extends StreamWagon
@@ -71,7 +69,14 @@
resource.setContentLength( content.length() );
resource.setLastModified( System.currentTimeMillis() );
- inputData.setInputStream( new StringInputStream( content ) );
+ try
+ {
+ inputData.setInputStream( new ByteArrayInputStream( content.getBytes( "UTF-8" ) ) );
+ }
+ catch ( UnsupportedEncodingException e )
+ {
+ throw new Error( "broken JVM", e );
+ }
}
else
{
@@ -83,7 +88,7 @@
public void fillOutputData( OutputData outputData )
throws TransferFailedException
{
- outputData.setOutputStream( new StringOutputStream() );
+ outputData.setOutputStream( new ByteArrayOutputStream() );
}
@Override