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 2010/05/18 17:53:36 UTC
svn commit: r945719 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it:
MavenITmng3379ParallelArtifactDownloadsTest.java
MavenITmng4235HttpAuthDeploymentChecksumsTest.java
Author: bentmann
Date: Tue May 18 15:53:35 2010
New Revision: 945719
URL: http://svn.apache.org/viewvc?rev=945719&view=rev
Log:
o Refactored code
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java?rev=945719&r1=945718&r2=945719&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java Tue May 18 15:53:35 2010
@@ -20,11 +20,7 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@@ -132,7 +128,7 @@ public class MavenITmng3379ParallelArtif
{
File file = getFile( verifier, gid, aid, ver, cls, ext );
assertTrue( file.getAbsolutePath(), file.isFile() );
- assertEquals( sha1, calcHash( file, "SHA-1" ) );
+ assertEquals( sha1, ItUtils.calcHash( file, "SHA-1" ) );
}
private void assertMetadata( Verifier verifier, String gid, String aid, String ver, String sha1 )
@@ -141,7 +137,7 @@ public class MavenITmng3379ParallelArtif
File file = getFile( verifier, gid, aid, ver, "", "pom" );
file = new File( file.getParent(), "maven-metadata-maven-core-it.xml" );
assertTrue( file.getAbsolutePath(), file.isFile() );
- assertEquals( sha1, calcHash( file, "SHA-1" ) );
+ assertEquals( sha1, ItUtils.calcHash( file, "SHA-1" ) );
}
private void assertMetadata( Verifier verifier, String gid, String aid, String sha1 )
@@ -150,7 +146,7 @@ public class MavenITmng3379ParallelArtif
File file = getFile( verifier, gid, aid, "0.2", "", "pom" );
file = new File( file.getParentFile().getParent(), "maven-metadata-maven-core-it.xml" );
assertTrue( file.getAbsolutePath(), file.isFile() );
- assertEquals( sha1, calcHash( file, "SHA-1" ) );
+ assertEquals( sha1, ItUtils.calcHash( file, "SHA-1" ) );
}
private File getFile( Verifier verifier, String gid, String aid, String ver, String cls, String ext )
@@ -169,43 +165,4 @@ public class MavenITmng3379ParallelArtif
return new File( buffer.toString() );
}
- private String calcHash( File file, String algo )
- throws IOException, NoSuchAlgorithmException
- {
- MessageDigest digester = MessageDigest.getInstance( algo );
-
- FileInputStream is = new FileInputStream( file );
- try
- {
- DigestInputStream dis = new DigestInputStream( is, digester );
-
- for ( byte[] buffer = new byte[1024 * 4]; dis.read( buffer ) >= 0; )
- {
- // just read it
- }
- }
- finally
- {
- is.close();
- }
-
- byte[] digest = digester.digest();
-
- StringBuffer hash = new StringBuffer( digest.length * 2 );
-
- for ( int i = 0; i < digest.length; i++ )
- {
- int b = digest[i] & 0xFF;
-
- if ( b < 0x10 )
- {
- hash.append( '0' );
- }
-
- hash.append( Integer.toHexString( b ) );
- }
-
- return hash.toString();
- }
-
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java?rev=945719&r1=945718&r2=945719&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java Tue May 18 15:53:35 2010
@@ -20,12 +20,8 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.Properties;
import javax.servlet.ServletException;
@@ -187,50 +183,11 @@ public class MavenITmng4235HttpAuthDeplo
private void assertHash( Verifier verifier, String dataFile, String hashExt, String algo )
throws Exception
{
- String actualHash = calcHash( new File( verifier.getBasedir(), dataFile ), algo );
+ String actualHash = ItUtils.calcHash( new File( verifier.getBasedir(), dataFile ), algo );
String expectedHash = verifier.loadLines( dataFile + hashExt, "UTF-8" ).get( 0 ).toString().trim();
assertTrue( "expected=" + expectedHash + ", actual=" + actualHash, expectedHash.equalsIgnoreCase( actualHash ) );
}
- private String calcHash( File file, String algo )
- throws IOException, NoSuchAlgorithmException
- {
- MessageDigest digester = MessageDigest.getInstance( algo );
-
- FileInputStream is = new FileInputStream( file );
- try
- {
- DigestInputStream dis = new DigestInputStream( is, digester );
-
- for ( byte[] buffer = new byte[1024 * 4]; dis.read( buffer ) >= 0; )
- {
- // just read it
- }
- }
- finally
- {
- is.close();
- }
-
- byte[] digest = digester.digest();
-
- StringBuffer hash = new StringBuffer( digest.length * 2 );
-
- for ( int i = 0; i < digest.length; i++ )
- {
- int b = digest[i] & 0xFF;
-
- if ( b < 0x10 )
- {
- hash.append( '0' );
- }
-
- hash.append( Integer.toHexString( b ) );
- }
-
- return hash.toString();
- }
-
}