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 2005/12/30 09:25:13 UTC
svn commit: r360028 [2/2] - in /maven/repository-manager/trunk:
maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/
maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/
maven-repository-indexer/src/te...
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java?rev=360028&r1=360027&r2=360028&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java Fri Dec 30 00:24:41 2005
@@ -22,6 +22,9 @@
public class CachedRepositoryQueryLayerTest
extends AbstractRepositoryQueryLayerTest
{
+ // TODO: share
+ private static final double CACHE_HIT_RATIO = 0.5;
+
protected void setUp()
throws Exception
{
@@ -35,7 +38,7 @@
testContainsArtifactTrue();
assertEquals( 0, queryLayer.getCacheHitRate(), 0 );
testContainsArtifactTrue();
- assertEquals( 0.50, queryLayer.getCacheHitRate(), 0 );
+ assertEquals( CACHE_HIT_RATIO, queryLayer.getCacheHitRate(), 0 );
}
public void testUseMetadataCache()
@@ -44,7 +47,7 @@
testArtifactVersionsTrue();
assertEquals( 0, queryLayer.getCacheHitRate(), 0 );
testArtifactVersionsTrue();
- assertEquals( 0.50, queryLayer.getCacheHitRate(), 0 );
+ assertEquals( CACHE_HIT_RATIO, queryLayer.getCacheHitRate(), 0 );
}
public void testUseFileCacheOnSnapshot()
@@ -52,6 +55,6 @@
testContainsSnapshotArtifactTrue();
assertEquals( 0, queryLayer.getCacheHitRate(), 0 );
testContainsSnapshotArtifactTrue();
- assertEquals( 0.50, queryLayer.getCacheHitRate(), 0 );
+ assertEquals( CACHE_HIT_RATIO, queryLayer.getCacheHitRate(), 0 );
}
}
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java?rev=360028&r1=360027&r2=360028&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java Fri Dec 30 00:24:41 2005
@@ -27,14 +27,16 @@
import org.apache.maven.artifact.versioning.VersionRange;
import java.io.File;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
import java.util.Iterator;
/**
* This class tests the ChecksumArtifactReporter.
- * It extends the AbstractChecksumArtifactReporterTest class.
+ * It extends the AbstractChecksumArtifactReporterTestCase class.
*/
public class ChecksumArtifactReporterTest
- extends AbstractChecksumArtifactReporterTest
+ extends AbstractChecksumArtifactReporterTestCase
{
private ArtifactReportProcessor artifactReportProcessor;
@@ -42,11 +44,6 @@
private MetadataReportProcessor metadataReportProcessor;
- public ChecksumArtifactReporterTest()
- {
-
- }
-
public void setUp()
throws Exception
{
@@ -55,74 +52,37 @@
metadataReportProcessor = (MetadataReportProcessor) lookup( MetadataReportProcessor.ROLE, "checksum-metadata" );
}
- public void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
- /**
- * Test creation of artifact with checksum files.
- */
- public void testCreateChecksumFile()
- {
- assertTrue( createChecksumFile( "VALID" ) );
- assertTrue( createChecksumFile( "INVALID" ) );
- }
-
- /**
- * Test creation of metadata file together with its checksums.
- */
- public void testCreateMetadataFile()
- {
- assertTrue( createMetadataFile( "VALID" ) );
- assertTrue( createMetadataFile( "INVALID" ) );
- }
-
/**
* Test the ChecksumArtifactReporter when the checksum files are valid.
*/
public void testChecksumArtifactReporterSuccess()
+ throws ReportProcessorException, NoSuchAlgorithmException, IOException
{
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- Artifact artifact =
- new DefaultArtifact( "checksumTest", "validArtifact", version, "compile", "jar", "", handler );
+ createChecksumFile( "VALID" );
+ createChecksumFile( "INVALID" );
- artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
- assertTrue( reporter.getSuccesses() == 2 );
- //System.out.println( "1 - SUCCESS ---> " + reporter.getSuccesses() );
+ ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
+ VersionRange version = VersionRange.createFromVersion( "1.0" );
+ Artifact artifact =
+ new DefaultArtifact( "checksumTest", "validArtifact", version, "compile", "jar", "", handler );
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- }
+ artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
+ assertEquals( 2, reporter.getSuccesses() );
}
/**
* Test the ChecksumArtifactReporter when the checksum files are invalid.
*/
public void testChecksumArtifactReporterFailed()
+ throws ReportProcessorException
{
+ ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
+ VersionRange version = VersionRange.createFromVersion( "1.0" );
+ Artifact artifact =
+ new DefaultArtifact( "checksumTest", "invalidArtifact", version, "compile", "jar", "", handler );
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- Artifact artifact =
- new DefaultArtifact( "checksumTest", "invalidArtifact", version, "compile", "jar", "", handler );
-
- artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
- assertTrue( reporter.getFailures() == 2 );
- //System.out.println( "2 - FAILURES ---> " + reporter.getFailures() );
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- }
+ artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
+ assertEquals( 2, reporter.getFailures() );
}
/**
@@ -130,36 +90,30 @@
* The reporter should report 2 success validation.
*/
public void testChecksumMetadataReporterSuccess()
+ throws ReportProcessorException, NoSuchAlgorithmException, IOException
{
+ createMetadataFile( "VALID" );
+ createMetadataFile( "INVALID" );
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- Artifact artifact =
- new DefaultArtifact( "checksumTest", "validArtifact", version, "compile", "jar", "", handler );
-
- //Version level metadata
- RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reporter );
-
- //Artifact level metadata
- metadata = new ArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reporter );
-
- //Group level metadata
- metadata = new GroupRepositoryMetadata( "checksumTest" );
- metadataReportProcessor.processMetadata( metadata, repository, reporter );
-
- Iterator iter = reporter.getRepositoryMetadataSuccessIterator();
- //System.out.println( "3 - META SUCCESS ---> " + iter.hasNext() );
- assertTrue( "check if there is a success", iter.hasNext() );
+ ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
+ VersionRange version = VersionRange.createFromVersion( "1.0" );
+ Artifact artifact =
+ new DefaultArtifact( "checksumTest", "validArtifact", version, "compile", "jar", "", handler );
+
+ //Version level metadata
+ RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository, reporter );
+
+ //Artifact level metadata
+ metadata = new ArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository, reporter );
+
+ //Group level metadata
+ metadata = new GroupRepositoryMetadata( "checksumTest" );
+ metadataReportProcessor.processMetadata( metadata, repository, reporter );
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- }
+ Iterator iter = reporter.getRepositoryMetadataSuccessIterator();
+ assertTrue( "check if there is a success", iter.hasNext() );
}
/**
@@ -167,29 +121,18 @@
* The reporter must report 2 failures.
*/
public void testChecksumMetadataReporterFailure()
+ throws ReportProcessorException
{
+ ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
+ VersionRange version = VersionRange.createFromVersion( "1.0" );
+ Artifact artifact =
+ new DefaultArtifact( "checksumTest", "invalidArtifact", version, "compile", "jar", "", handler );
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- Artifact artifact =
- new DefaultArtifact( "checksumTest", "invalidArtifact", version, "compile", "jar", "", handler );
+ RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository, reporter );
- RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reporter );
-
- //System.out.println("reporter.getFailures() ---> " + reporter.getFailures());
-
- Iterator iter = reporter.getRepositoryMetadataFailureIterator();
- //System.out.println( "4 - META FAILURE ---> " + iter.hasNext() );
- assertTrue( "check if there is a failure", iter.hasNext() );
-
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- }
+ Iterator iter = reporter.getRepositoryMetadataFailureIterator();
+ assertTrue( "check if there is a failure", iter.hasNext() );
}
/**
@@ -249,54 +192,29 @@
*/
/**
- * Test deletion of the test directories created.
- */
- public void testDeleteChecksumFiles()
- {
- assertTrue( deleteChecksumFiles( "jar" ) );
- }
-
- /**
- * Test deletion of the test directories created.
- */
- public void testDeleteTestDirectory()
- {
- assertTrue( deleteTestDirectory( new File( repository.getBasedir() + "checksumTest" ) ) );
- }
-
- /**
* Test the conditional when the checksum files of the artifact & metadata do not exist.
*/
public void testChecksumFilesDoNotExist()
+ throws ReportProcessorException, NoSuchAlgorithmException, IOException
{
createChecksumFile( "VALID" );
createMetadataFile( "VALID" );
- boolean b = deleteChecksumFiles( "jar" );
-
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- Artifact artifact =
- new DefaultArtifact( "checksumTest", "validArtifact", version, "compile", "jar", "", handler );
+ deleteChecksumFiles( "jar" );
- artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
- //System.out.println( "5 - ART FAILURE ---> " + reporter.getFailures() );
- assertTrue( reporter.getFailures() == 2 );
+ ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
+ VersionRange version = VersionRange.createFromVersion( "1.0" );
+ Artifact artifact =
+ new DefaultArtifact( "checksumTest", "validArtifact", version, "compile", "jar", "", handler );
- RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reporter );
+ artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
+ assertEquals( 2, reporter.getFailures() );
- Iterator iter = reporter.getRepositoryMetadataFailureIterator();
- //System.out.println( "5 - META FAILURE ---> " + iter.hasNext() );
- assertTrue( "check if there is a failure", iter.hasNext() );
+ RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository, reporter );
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- }
+ Iterator iter = reporter.getRepositoryMetadataFailureIterator();
+ assertTrue( "check if there is a failure", iter.hasNext() );
- b = deleteTestDirectory( new File( repository.getBasedir() + "checksumTest" ) );
+ deleteTestDirectory( new File( repository.getBasedir() + "checksumTest" ) );
}
}
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java?rev=360028&r1=360027&r2=360028&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java Fri Dec 30 00:24:41 2005
@@ -28,7 +28,7 @@
public class GenericMockObject
implements InvocationHandler
{
- Map invocations = new HashMap();
+ private Map invocations = new HashMap();
public GenericMockObject()
{
@@ -37,7 +37,7 @@
public GenericMockObject( Map returnMap )
{
- invocations = returnMap;
+ invocations = new HashMap( returnMap );
}
public void setExpectedReturns( Method method, List returnList )
@@ -46,7 +46,6 @@
}
public Object invoke( Object proxy, Method method, Object[] args )
- throws Throwable
{
if ( !invocations.containsKey( method ) )
{
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java?rev=360028&r1=360027&r2=360028&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java Fri Dec 30 00:24:41 2005
@@ -40,7 +40,7 @@
}
public void processArtifact( Model model, Artifact artifact, ArtifactReporter reporter,
- ArtifactRepository artifactRepository )
+ ArtifactRepository repository )
{
if ( iterator == null || !iterator.hasNext() ) // not initialized or reached end of the list. start again
{
@@ -51,23 +51,18 @@
while ( iterator.hasNext() )
{
ReportCondition reportCondition = (ReportCondition) iterator.next();
- switch ( reportCondition.getResult() )
+ int i = reportCondition.getResult();
+ if ( i == ReportCondition.SUCCESS )
{
- case ReportCondition.SUCCESS:
- {
- reporter.addSuccess( reportCondition.getArtifact() );
- break;
- }
- case ReportCondition.WARNING:
- {
- reporter.addWarning( reportCondition.getArtifact(), reportCondition.getReason() );
- break;
- }
- case ReportCondition.FAILURE:
- {
- reporter.addFailure( reportCondition.getArtifact(), reportCondition.getReason() );
- break;
- }
+ reporter.addSuccess( reportCondition.getArtifact() );
+ }
+ else if ( i == ReportCondition.WARNING )
+ {
+ reporter.addWarning( reportCondition.getArtifact(), reportCondition.getReason() );
+ }
+ else if ( i == ReportCondition.FAILURE )
+ {
+ reporter.addFailure( reportCondition.getArtifact(), reportCondition.getReason() );
}
}
}
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java?rev=360028&r1=360027&r2=360028&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java Fri Dec 30 00:24:41 2005
@@ -54,9 +54,9 @@
artifactSuccesses.add( new ArtifactResult( artifact ) );
}
- public void addWarning( Artifact artifact, String reason )
+ public void addWarning( Artifact artifact, String message )
{
- artifactWarnings.add( new ArtifactResult( artifact, reason ) );
+ artifactWarnings.add( new ArtifactResult( artifact, message ) );
}
public void addFailure( RepositoryMetadata metadata, String reason )
@@ -69,9 +69,9 @@
metadataSuccesses.add( new RepositoryMetadataResult( metadata ) );
}
- public void addWarning( RepositoryMetadata metadata, String reason )
+ public void addWarning( RepositoryMetadata metadata, String message )
{
- metadataWarnings.add( new RepositoryMetadataResult( metadata, reason ) );
+ metadataWarnings.add( new RepositoryMetadataResult( metadata, message ) );
}
public Iterator getArtifactFailureIterator()
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java?rev=360028&r1=360027&r2=360028&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java Fri Dec 30 00:24:41 2005
@@ -44,20 +44,21 @@
{
iterator = queryConditions.iterator();
}
+ boolean b;
if ( queryConditions.isEmpty() )
{
- return false;
+ b = false;
}
else
{
- boolean temp = ( (Boolean) iterator.next() ).booleanValue();
- return temp;
+ b = ( (Boolean) iterator.next() ).booleanValue();
}
+ return b;
}
public void addReturnValue( boolean queryCondition )
{
- queryConditions.add( new Boolean( queryCondition ) );
+ queryConditions.add( Boolean.valueOf( queryCondition ) );
}
public void clearList()
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java?rev=360028&r1=360027&r2=360028&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java Fri Dec 30 00:24:41 2005
@@ -23,11 +23,11 @@
*/
public class ReportCondition
{
- public final static int SUCCESS = 0;
+ public static final int SUCCESS = 0;
- public final static int FAILURE = -1;
+ public static final int FAILURE = -1;
- public final static int WARNING = 1;
+ public static final int WARNING = 1;
private int result;