You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/02/14 15:45:07 UTC
svn commit: r507550 [6/7] - in /maven/archiva/branches/archiva-MRM-239: ./
archiva-cli/src/main/java/org/apache/maven/archiva/cli/
archiva-converter/src/main/java/org/apache/maven/archiva/converter/
archiva-converter/src/main/java/org/apache/maven/arch...
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/database/ReportingDatabaseTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/database/ReportingDatabaseTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/database/ReportingDatabaseTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/database/ReportingDatabaseTest.java Wed Feb 14 06:44:59 2007
@@ -19,14 +19,7 @@
* under the License.
*/
-import junit.framework.TestCase;
-import org.apache.maven.archiva.reporting.model.ArtifactResults;
-import org.apache.maven.archiva.reporting.model.MetadataResults;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
/**
* Test for {@link ReportingDatabase}.
@@ -35,117 +28,28 @@
* @version $Id$
*/
public class ReportingDatabaseTest
- extends TestCase
+ extends AbstractRepositoryReportsTestCase
{
- private Artifact artifact;
-
- private String processor, problem, reason;
-
- private ReportingDatabase reportingDatabase;
-
- private RepositoryMetadata metadata;
+ private ReportingDatabase database;
protected void setUp()
throws Exception
{
super.setUp();
- artifact = new DefaultArtifact( "group", "artifact", VersionRange.createFromVersion( "1.0" ), "scope", "type",
- "classifier", null );
- processor = "processor";
- problem = "problem";
- reason = "reason";
- reportingDatabase = new ReportingDatabase( null );
-
- metadata = new ArtifactRepositoryMetadata( artifact );
- }
-
- public void testAddNoticeArtifactStringStringString()
- {
- reportingDatabase.addNotice( artifact, processor, problem, reason );
- ArtifactResults artifactResults = reportingDatabase.getArtifactResults( artifact );
-
- assertEquals( 1, reportingDatabase.getNumNotices() );
- assertEquals( 1, artifactResults.getNotices().size() );
-
- reportingDatabase.addNotice( artifact, processor, problem, reason );
- artifactResults = reportingDatabase.getArtifactResults( artifact );
-
- assertEquals( 1, reportingDatabase.getNumNotices() );
- assertEquals( 1, artifactResults.getNotices().size() );
+ database = (ReportingDatabase) lookup( ReportingDatabase.ROLE );
}
- public void testAddWarningArtifactStringStringString()
- {
- reportingDatabase.addWarning( artifact, processor, problem, reason );
- ArtifactResults artifactResults = reportingDatabase.getArtifactResults( artifact );
-
- assertEquals( 1, reportingDatabase.getNumWarnings() );
- assertEquals( 1, artifactResults.getWarnings().size() );
-
- reportingDatabase.addWarning( artifact, processor, problem, reason );
- artifactResults = reportingDatabase.getArtifactResults( artifact );
-
- assertEquals( 1, reportingDatabase.getNumWarnings() );
- assertEquals( 1, artifactResults.getWarnings().size() );
- }
-
- public void testAddFailureArtifactStringStringString()
- {
- reportingDatabase.addFailure( artifact, processor, problem, reason );
- ArtifactResults artifactResults = reportingDatabase.getArtifactResults( artifact );
-
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 1, artifactResults.getFailures().size() );
-
- reportingDatabase.addFailure( artifact, processor, problem, reason );
- artifactResults = reportingDatabase.getArtifactResults( artifact );
-
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 1, artifactResults.getFailures().size() );
- }
-
- public void testAddNoticeRepositoryMetadataStringStringString()
- {
- reportingDatabase.addNotice( metadata, processor, problem, reason );
- MetadataResults metadataResults = reportingDatabase.getMetadataResults( metadata, System.currentTimeMillis() );
-
- assertEquals( 1, reportingDatabase.getNumNotices() );
- assertEquals( 1, metadataResults.getNotices().size() );
-
- reportingDatabase.addNotice( metadata, processor, problem, reason );
- metadataResults = reportingDatabase.getMetadataResults( metadata, System.currentTimeMillis() );
-
- assertEquals( 1, reportingDatabase.getNumNotices() );
- assertEquals( 1, metadataResults.getNotices().size() );
- }
-
- public void testAddWarningRepositoryMetadataStringStringString()
+ protected void tearDown()
+ throws Exception
{
- reportingDatabase.addWarning( metadata, processor, problem, reason );
- MetadataResults metadataResults = reportingDatabase.getMetadataResults( metadata, System.currentTimeMillis() );
-
- assertEquals( 1, reportingDatabase.getNumWarnings() );
- assertEquals( 1, metadataResults.getWarnings().size() );
-
- reportingDatabase.addWarning( metadata, processor, problem, reason );
- metadataResults = reportingDatabase.getMetadataResults( metadata, System.currentTimeMillis() );
-
- assertEquals( 1, reportingDatabase.getNumWarnings() );
- assertEquals( 1, metadataResults.getWarnings().size() );
+ release( database );
+ super.tearDown();
}
- public void testAddFailureRepositoryMetadataStringStringString()
+ public void testLookup()
{
- reportingDatabase.addFailure( metadata, processor, problem, reason );
- MetadataResults metadataResults = reportingDatabase.getMetadataResults( metadata, System.currentTimeMillis() );
-
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 1, metadataResults.getFailures().size() );
-
- reportingDatabase.addFailure( metadata, processor, problem, reason );
- metadataResults = reportingDatabase.getMetadataResults( metadata, System.currentTimeMillis() );
-
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 1, metadataResults.getFailures().size() );
+ assertNotNull( "database should not be null.", database );
+ assertNotNull( "database.artifactDatabase should not be null.", database.getArtifactDatabase() );
+ assertNotNull( "database.metadataDatabase should not be null.", database.getMetadataDatabase() );
}
}
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java Wed Feb 14 06:44:59 2007
@@ -19,9 +19,9 @@
* under the License.
*/
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.MetadataResultsDatabase;
import org.apache.maven.archiva.reporting.model.MetadataResults;
import org.apache.maven.archiva.reporting.model.Result;
import org.apache.maven.artifact.Artifact;
@@ -36,6 +36,11 @@
import java.util.Iterator;
+/**
+ * BadMetadataReportProcessorTest
+ *
+ * @version $Id$
+ */
public class BadMetadataReportProcessorTest
extends AbstractRepositoryReportsTestCase
{
@@ -43,7 +48,7 @@
private MetadataReportProcessor badMetadataReportProcessor;
- private ReportingDatabase reportingDatabase;
+ private MetadataResultsDatabase database;
protected void setUp()
throws Exception
@@ -52,12 +57,19 @@
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- badMetadataReportProcessor = (MetadataReportProcessor) lookup( MetadataReportProcessor.ROLE, "bad-metadata" );
+ database = (MetadataResultsDatabase) lookup( MetadataResultsDatabase.ROLE );
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" );
- reportingDatabase = new ReportingDatabase( reportGroup );
+ badMetadataReportProcessor = (MetadataReportProcessor) lookup( MetadataReportProcessor.ROLE, "bad-metadata" );
}
+ protected void tearDown()
+ throws Exception
+ {
+ release( artifactFactory );
+ release( badMetadataReportProcessor );
+ super.tearDown();
+ }
+
public void testMetadataMissingLastUpdated()
{
Artifact artifact = artifactFactory.createBuildArtifact( "groupId", "artifactId", "1.0-alpha-1", "type" );
@@ -68,9 +80,9 @@
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -87,9 +99,9 @@
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, null );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -106,41 +118,41 @@
if ( alpha1First )
{
assertEquals( "check reason",
- "Artifact version 1.0-alpha-1 found in the repository but missing in the metadata.",
- result.getReason() );
+ "Artifact version 1.0-alpha-1 found in the repository but missing in the metadata.", result
+ .getReason() );
}
else
{
assertEquals( "check reason",
- "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.",
- result.getReason() );
+ "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.", result
+ .getReason() );
}
result = (Result) failures.next();
if ( !alpha1First )
{
assertEquals( "check reason",
- "Artifact version 1.0-alpha-1 found in the repository but missing in the metadata.",
- result.getReason() );
+ "Artifact version 1.0-alpha-1 found in the repository but missing in the metadata.", result
+ .getReason() );
}
else
{
assertEquals( "check reason",
- "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.",
- result.getReason() );
+ "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.", result
+ .getReason() );
}
assertFalse( "check no more failures", failures.hasNext() );
}
public void testSnapshotMetadataMissingVersioning()
{
- Artifact artifact =
- artifactFactory.createBuildArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT", "type" );
+ Artifact artifact = artifactFactory.createBuildArtifact( "groupId", "snapshot-artifact",
+ "1.0-alpha-1-SNAPSHOT", "type" );
RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -162,9 +174,9 @@
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertFalse( "check there are no failures", failures.hasNext() );
}
@@ -178,9 +190,9 @@
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -189,8 +201,8 @@
assertMetadata( metadata, results );
// TODO: should be more robust
assertEquals( "check reason",
- "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.",
- result.getReason() );
+ "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.", result
+ .getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -206,9 +218,9 @@
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -217,8 +229,8 @@
assertMetadata( metadata, results );
// TODO: should be more robust
assertEquals( "check reason",
- "Artifact version 1.0-alpha-3 is present in metadata but missing in the repository.",
- result.getReason() );
+ "Artifact version 1.0-alpha-3 is present in metadata but missing in the repository.", result
+ .getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -233,9 +245,9 @@
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -244,14 +256,14 @@
assertMetadata( metadata, results );
// TODO: should be more robust
assertEquals( "check reason",
- "Artifact version 1.0-alpha-3 is present in metadata but missing in the repository.",
- result.getReason() );
+ "Artifact version 1.0-alpha-3 is present in metadata but missing in the repository.", result
+ .getReason() );
assertTrue( "check there is a 2nd failure", failures.hasNext() );
result = (Result) failures.next();
// TODO: should be more robust
assertEquals( "check reason",
- "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.",
- result.getReason() );
+ "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.", result
+ .getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -261,9 +273,9 @@
metadata.getMetadata().addPlugin( createMetadataPlugin( "artifactId", "default" ) );
metadata.getMetadata().addPlugin( createMetadataPlugin( "snapshot-artifact", "default2" ) );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertFalse( "check there are no failures", failures.hasNext() );
}
@@ -274,17 +286,16 @@
metadata.getMetadata().addPlugin( createMetadataPlugin( "snapshot-artifact", "default2" ) );
metadata.getMetadata().addPlugin( createMetadataPlugin( "missing-plugin", "default3" ) );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
Result result = (Result) failures.next();
// TODO: should be more robust
- assertEquals( "check reason", "Metadata plugin missing-plugin not found in the repository",
- result.getReason() );
+ assertEquals( "check reason", "Metadata plugin missing-plugin not found in the repository", result.getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -293,18 +304,17 @@
RepositoryMetadata metadata = new GroupRepositoryMetadata( "groupId" );
metadata.getMetadata().addPlugin( createMetadataPlugin( "artifactId", "default" ) );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
Result result = (Result) failures.next();
// TODO: should be more robust
- assertEquals( "check reason",
- "Plugin snapshot-artifact is present in the repository but " + "missing in the metadata.",
- result.getReason() );
+ assertEquals( "check reason", "Plugin snapshot-artifact is present in the repository but "
+ + "missing in the metadata.", result.getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -316,22 +326,22 @@
metadata.getMetadata().addPlugin( createMetadataPlugin( null, "default3" ) );
metadata.getMetadata().addPlugin( createMetadataPlugin( "", "default4" ) );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
Result result = (Result) failures.next();
// TODO: should be more robust
- assertEquals( "check reason", "Missing or empty artifactId in group metadata for plugin default3",
- result.getReason() );
+ assertEquals( "check reason", "Missing or empty artifactId in group metadata for plugin default3", result
+ .getReason() );
assertTrue( "check there is a 2nd failure", failures.hasNext() );
result = (Result) failures.next();
// TODO: should be more robust
- assertEquals( "check reason", "Missing or empty artifactId in group metadata for plugin default4",
- result.getReason() );
+ assertEquals( "check reason", "Missing or empty artifactId in group metadata for plugin default4", result
+ .getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -341,9 +351,9 @@
metadata.getMetadata().addPlugin( createMetadataPlugin( "artifactId", null ) );
metadata.getMetadata().addPlugin( createMetadataPlugin( "snapshot-artifact", "" ) );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -354,8 +364,8 @@
assertTrue( "check there is a 2nd failure", failures.hasNext() );
result = (Result) failures.next();
// TODO: should be more robust
- assertEquals( "check reason", "Missing or empty plugin prefix for artifactId snapshot-artifact.",
- result.getReason() );
+ assertEquals( "check reason", "Missing or empty plugin prefix for artifactId snapshot-artifact.", result
+ .getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -365,9 +375,9 @@
metadata.getMetadata().addPlugin( createMetadataPlugin( "artifactId", "default" ) );
metadata.getMetadata().addPlugin( createMetadataPlugin( "snapshot-artifact", "default" ) );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -380,8 +390,8 @@
public void testValidSnapshotMetadata()
{
- Artifact artifact =
- artifactFactory.createBuildArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT", "type" );
+ Artifact artifact = artifactFactory.createBuildArtifact( "groupId", "snapshot-artifact",
+ "1.0-alpha-1-SNAPSHOT", "type" );
Snapshot snapshot = new Snapshot();
snapshot.setBuildNumber( 1 );
@@ -389,16 +399,16 @@
RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact, snapshot );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertFalse( "check there are no failures", failures.hasNext() );
}
public void testInvalidSnapshotMetadata()
{
- Artifact artifact =
- artifactFactory.createBuildArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT", "type" );
+ Artifact artifact = artifactFactory.createBuildArtifact( "groupId", "snapshot-artifact",
+ "1.0-alpha-1-SNAPSHOT", "type" );
Snapshot snapshot = new Snapshot();
snapshot.setBuildNumber( 2 );
@@ -406,9 +416,9 @@
RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact, snapshot );
- badMetadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
+ badMetadataReportProcessor.processMetadata( metadata, repository );
- Iterator failures = reportingDatabase.getMetadataIterator();
+ Iterator failures = database.getIterator();
assertTrue( "check there is a failure", failures.hasNext() );
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
@@ -416,16 +426,21 @@
Result result = (Result) failures.next();
assertMetadata( metadata, results );
// TODO: should be more robust
- assertEquals( "check reason", "Snapshot artifact 1.0-alpha-1-20050611.202024-2 does not exist.",
- result.getReason() );
+ assertEquals( "check reason", "Snapshot artifact 1.0-alpha-1-20050611.202024-2 does not exist.", result
+ .getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
private static void assertMetadata( RepositoryMetadata metadata, MetadataResults results )
{
- assertEquals( "check metadata", metadata.getGroupId(), results.getGroupId() );
- assertEquals( "check metadata", metadata.getArtifactId(), results.getArtifactId() );
- assertEquals( "check metadata", metadata.getBaseVersion(), results.getVersion() );
+ /* The funky StringUtils.defaultString() is used because of database constraints.
+ * The MetadataResults object has a complex primary key consisting of groupId, artifactId, and version.
+ * This also means that none of those fields may be null. however, that doesn't eliminate the
+ * ability to have an empty string in place of a null.
+ */
+ assertEquals( "check metadata", StringUtils.defaultString( metadata.getGroupId() ), results.getGroupId() );
+ assertEquals( "check metadata", StringUtils.defaultString( metadata.getArtifactId() ), results.getArtifactId() );
+ assertEquals( "check metadata", StringUtils.defaultString( metadata.getBaseVersion() ), results.getVersion() );
}
private Plugin createMetadataPlugin( String artifactId, String prefix )
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java Wed Feb 14 06:44:59 2007
@@ -20,8 +20,7 @@
*/
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
import org.apache.maven.archiva.reporting.model.ArtifactResults;
import org.apache.maven.archiva.reporting.model.Result;
import org.apache.maven.artifact.Artifact;
@@ -43,7 +42,7 @@
private static final String VALID_VERSION = "1.0-alpha-1";
- private ReportingDatabase reportingDatabase;
+ private ArtifactResultsDatabase database;
private Model model;
@@ -58,27 +57,24 @@
{
super.setUp();
model = new Model();
- processor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "dependency" );
-
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
-
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" );
- reportingDatabase = new ReportingDatabase( reportGroup );
+ database = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
+ processor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "dependency" );
}
public void testArtifactFoundButNoDirectDependencies()
{
Artifact artifact = createValidArtifact();
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 0, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
}
private Artifact createValidArtifact()
{
- Artifact projectArtifact =
- artifactFactory.createProjectArtifact( VALID_GROUP_ID, VALID_ARTIFACT_ID, VALID_VERSION );
+ Artifact projectArtifact = artifactFactory.createProjectArtifact( VALID_GROUP_ID, VALID_ARTIFACT_ID,
+ VALID_VERSION );
projectArtifact.setRepository( repository );
return projectArtifact;
}
@@ -87,11 +83,11 @@
{
Artifact artifact = artifactFactory.createProjectArtifact( INVALID, INVALID, INVALID );
artifact.setRepository( repository );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
- Iterator failures = reportingDatabase.getArtifactIterator();
+ processor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
+ Iterator failures = database.getIterator();
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
@@ -106,10 +102,10 @@
Dependency dependency = createValidDependency();
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 0, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
}
private Dependency createValidDependency()
@@ -124,10 +120,10 @@
Dependency dependency = createValidDependency();
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 0, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
}
public void testValidArtifactWithValidMultipleDependencies()
@@ -140,10 +136,10 @@
model.addDependency( dependency );
Artifact artifact = createValidArtifact();
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 0, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
}
public void testValidArtifactWithAnInvalidDependency()
@@ -156,18 +152,17 @@
model.addDependency( createDependency( INVALID, INVALID, INVALID ) );
Artifact artifact = createValidArtifact();
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
- Iterator failures = reportingDatabase.getArtifactIterator();
+ Iterator failures = database.getIterator();
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
Result result = (Result) failures.next();
- assertEquals( getDependencyNotFoundMessage( createDependency( INVALID, INVALID, INVALID ) ),
- result.getReason() );
+ assertEquals( getDependencyNotFoundMessage( createDependency( INVALID, INVALID, INVALID ) ), result.getReason() );
}
public void testValidArtifactWithInvalidDependencyGroupId()
@@ -177,12 +172,12 @@
Dependency dependency = createDependency( INVALID, VALID_ARTIFACT_ID, VALID_VERSION );
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
- Iterator failures = reportingDatabase.getArtifactIterator();
+ Iterator failures = database.getIterator();
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
@@ -206,12 +201,12 @@
Dependency dependency = createDependency( VALID_GROUP_ID, INVALID, VALID_VERSION );
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
- Iterator failures = reportingDatabase.getArtifactIterator();
+ Iterator failures = database.getIterator();
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
@@ -226,11 +221,11 @@
Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, INVALID );
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
- Iterator failures = reportingDatabase.getArtifactIterator();
+ Iterator failures = database.getIterator();
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
@@ -245,12 +240,12 @@
Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, "[" );
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
- Iterator failures = reportingDatabase.getArtifactIterator();
+ Iterator failures = database.getIterator();
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
@@ -265,10 +260,10 @@
Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, "[1.0,)" );
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 0, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
}
public void testValidArtifactWithMissingDependencyVersion()
@@ -278,12 +273,12 @@
Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, null );
model.addDependency( dependency );
- processor.processArtifact( artifact, model, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( 0, reportingDatabase.getNumNotices() );
+ processor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( 0, database.getNumNotices() );
- Iterator failures = reportingDatabase.getArtifactIterator();
+ Iterator failures = database.getIterator();
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java Wed Feb 14 06:44:59 2007
@@ -24,8 +24,7 @@
import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Model;
@@ -49,7 +48,7 @@
File indexDirectory;
- private ReportingDatabase reportDatabase;
+ private ArtifactResultsDatabase database;
protected void setUp()
throws Exception
@@ -60,8 +59,11 @@
FileUtils.deleteDirectory( indexDirectory );
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+
+ database = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
+
artifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "1.0-alpha-1", "jar" );
- System.out.println( "artifact = " + artifact );
+
model = new Model();
RepositoryArtifactIndexFactory factory =
@@ -75,9 +77,6 @@
index.indexRecords( Collections.singletonList( recordFactory.createRecord( artifact ) ) );
processor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "duplicate" );
-
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" );
- reportDatabase = new ReportingDatabase( reportGroup );
}
public void testNullArtifactFile()
@@ -85,32 +84,32 @@
{
artifact.setFile( null );
- processor.processArtifact( artifact, model, reportDatabase );
+ processor.processArtifact( artifact, model );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
- assertEquals( "Check warnings", 1, reportDatabase.getNumWarnings() );
- assertEquals( "Check no failures", 0, reportDatabase.getNumFailures() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
+ assertEquals( "Check warnings", 1, database.getNumWarnings() );
+ assertEquals( "Check no failures", 0, database.getNumFailures() );
}
public void testSuccessOnAlreadyIndexedArtifact()
throws Exception
{
- processor.processArtifact( artifact, model, reportDatabase );
+ processor.processArtifact( artifact, model );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
- assertEquals( "Check warnings", 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no failures", 0, reportDatabase.getNumFailures() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
+ assertEquals( "Check warnings", 0, database.getNumWarnings() );
+ assertEquals( "Check no failures", 0, database.getNumFailures() );
}
public void testSuccessOnDifferentGroupId()
throws Exception
{
artifact.setGroupId( "different.groupId" );
- processor.processArtifact( artifact, model, reportDatabase );
+ processor.processArtifact( artifact, model );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
- assertEquals( "Check warnings", 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no failures", 0, reportDatabase.getNumFailures() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
+ assertEquals( "Check warnings", 0, database.getNumWarnings() );
+ assertEquals( "Check no failures", 0, database.getNumFailures() );
}
public void testSuccessOnNewArtifact()
@@ -118,11 +117,11 @@
{
Artifact newArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "1.0-alpha-1", "pom" );
- processor.processArtifact( newArtifact, model, reportDatabase );
+ processor.processArtifact( newArtifact, model );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
- assertEquals( "Check warnings", 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no failures", 0, reportDatabase.getNumFailures() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
+ assertEquals( "Check warnings", 0, database.getNumWarnings() );
+ assertEquals( "Check no failures", 0, database.getNumFailures() );
}
public void testFailure()
@@ -132,11 +131,11 @@
artifact.getVersion(), artifact.getType() );
duplicate.setFile( artifact.getFile() );
- processor.processArtifact( duplicate, model, reportDatabase );
+ processor.processArtifact( duplicate, model );
- assertEquals( "Check warnings", 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
- assertEquals( "Check no failures", 1, reportDatabase.getNumFailures() );
+ assertEquals( "Check warnings", 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
+ assertEquals( "Check no failures", 1, database.getNumFailures() );
}
private Artifact createArtifact( String groupId, String artifactId, String baseVersion, String version,
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessorTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessorTest.java Wed Feb 14 06:44:59 2007
@@ -20,8 +20,7 @@
*/
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
import org.apache.maven.artifact.Artifact;
/**
@@ -32,16 +31,14 @@
{
private ArtifactReportProcessor artifactReportProcessor;
- private ReportingDatabase reportDatabase;
+ private ArtifactResultsDatabase database;
public void setUp()
throws Exception
{
super.setUp();
+ database = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "invalid-pom" );
-
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" );
- reportDatabase = new ReportingDatabase( reportGroup );
}
/**
@@ -51,8 +48,8 @@
{
Artifact artifact = createArtifact( "org.apache.maven", "artifactId", "1.0-alpha-3", "pom" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 1, reportDatabase.getNumFailures() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 1, database.getNumFailures() );
}
@@ -63,10 +60,10 @@
{
Artifact artifact = createArtifact( "groupId", "artifactId", "1.0-alpha-2", "pom" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
@@ -77,9 +74,9 @@
{
Artifact artifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "jar" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
}
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessorTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessorTest.java Wed Feb 14 06:44:59 2007
@@ -20,8 +20,7 @@
*/
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -40,16 +39,14 @@
{
private ArtifactReportProcessor artifactReportProcessor;
- private ReportingDatabase reportDatabase;
+ private ArtifactResultsDatabase database;
public void setUp()
throws Exception
{
super.setUp();
+ database = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "artifact-location" );
-
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" );
- reportDatabase = new ReportingDatabase( reportGroup );
}
/**
@@ -61,10 +58,10 @@
{
Artifact artifact = createArtifact( "org.apache.maven", "maven-model", "2.0" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
/**
@@ -78,10 +75,10 @@
Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" );
Model model = readPom( repository.pathOf( pomArtifact ) );
- artifactReportProcessor.processArtifact( artifact, model, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
/**
@@ -94,10 +91,10 @@
Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" );
Model model = readPom( repository.pathOf( pomArtifact ) );
- artifactReportProcessor.processArtifact( pomArtifact, model, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( pomArtifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
/**
@@ -111,10 +108,10 @@
Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" );
Model model = readPom( repository.pathOf( pomArtifact ) );
- artifactReportProcessor.processArtifact( artifact, model, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
/**
@@ -129,10 +126,10 @@
Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" );
Model model = readPom( repository.pathOf( pomArtifact ) );
- artifactReportProcessor.processArtifact( artifact, model, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
/**
@@ -147,10 +144,10 @@
Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" );
Model model = readPom( repository.pathOf( pomArtifact ) );
- artifactReportProcessor.processArtifact( artifact, model, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, model );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
/**
@@ -164,9 +161,9 @@
Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-2", "pom" );
Model model = readPom( repository.pathOf( pomArtifact ) );
- artifactReportProcessor.processArtifact( artifact, model, reportDatabase );
+ artifactReportProcessor.processArtifact( artifact, model );
- assertEquals( 1, reportDatabase.getNumFailures() );
+ assertEquals( 1, database.getNumFailures() );
}
/**
@@ -180,8 +177,8 @@
Artifact pomArtifact = createArtifact( "org.apache.maven", "maven-archiver", "2.0", "pom" );
Model model = readPom( repository.pathOf( pomArtifact ) );
- artifactReportProcessor.processArtifact( artifact, model, reportDatabase );
- assertEquals( 1, reportDatabase.getNumFailures() );
+ artifactReportProcessor.processArtifact( artifact, model );
+ assertEquals( 1, database.getNumFailures() );
}
private Model readPom( String path )
@@ -210,8 +207,8 @@
{
Artifact artifact = createArtifact( "org.apache.maven", "maven-monitor", "2.1" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 1, reportDatabase.getNumFailures() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 1, database.getNumFailures() );
}
/**
@@ -223,8 +220,8 @@
{
Artifact artifact = createArtifact( "org.apache.maven", "maven-project", "2.1" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 1, reportDatabase.getNumFailures() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 1, database.getNumFailures() );
}
}
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java Wed Feb 14 06:44:59 2007
@@ -20,8 +20,7 @@
*/
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
import org.apache.maven.archiva.reporting.model.ArtifactResults;
import org.apache.maven.archiva.reporting.model.Result;
import org.apache.maven.artifact.Artifact;
@@ -38,27 +37,25 @@
{
private ArtifactReportProcessor artifactReportProcessor;
- private ReportingDatabase reportDatabase;
+ private ArtifactResultsDatabase database;
public void setUp()
throws Exception
{
super.setUp();
+ database = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "old-artifact" );
-
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "old-artifact" );
- reportDatabase = new ReportingDatabase( reportGroup );
}
public void testOldArtifact()
{
Artifact artifact = createArtifact( "org.apache.maven", "maven-model", "2.0" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check notices", 1, reportDatabase.getNumNotices() );
- ArtifactResults results = (ArtifactResults) reportDatabase.getArtifactIterator().next();
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check notices", 1, database.getNumNotices() );
+ ArtifactResults results = (ArtifactResults) database.getIterator().next();
assertEquals( artifact.getArtifactId(), results.getArtifactId() );
assertEquals( artifact.getGroupId(), results.getGroupId() );
assertEquals( artifact.getVersion(), results.getVersion() );
@@ -78,10 +75,10 @@
Artifact artifact = createArtifactFromRepository( repository, "groupId", "artifactId", "1.0-alpha-1" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
public void testMissingArtifact()
@@ -91,7 +88,7 @@
try
{
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
+ artifactReportProcessor.processArtifact( artifact, null );
fail( "Should not have passed" );
}
catch ( IllegalStateException e )
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java Wed Feb 14 06:44:59 2007
@@ -21,8 +21,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
import org.apache.maven.archiva.reporting.model.ArtifactResults;
import org.apache.maven.archiva.reporting.model.Result;
import org.apache.maven.artifact.Artifact;
@@ -40,7 +39,7 @@
{
private ArtifactReportProcessor artifactReportProcessor;
- private ReportingDatabase reportDatabase;
+ private ArtifactResultsDatabase database;
private File tempRepository;
@@ -48,11 +47,10 @@
throws Exception
{
super.setUp();
- artifactReportProcessor =
- (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "old-snapshot-artifact" );
+ database = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
+ artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE,
+ "old-snapshot-artifact" );
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "old-artifact" );
- reportDatabase = new ReportingDatabase( reportGroup );
tempRepository = getTestFile( "target/test-repository" );
FileUtils.deleteDirectory( tempRepository );
}
@@ -61,11 +59,11 @@
{
Artifact artifact = createArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-20050611.202024-1", "pom" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check notices", 1, reportDatabase.getNumNotices() );
- Iterator artifactIterator = reportDatabase.getArtifactIterator();
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check notices", 1, database.getNumNotices() );
+ Iterator artifactIterator = database.getIterator();
assertArtifactResults( artifactIterator, artifact );
}
@@ -86,20 +84,20 @@
{
Artifact artifact = createArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT", "pom" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
public void testNonSnapshotArtifact()
{
Artifact artifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
public void testNewSnapshotArtifact()
@@ -113,13 +111,13 @@
String date = new SimpleDateFormat( "yyyyMMdd.HHmmss" ).format( new Date() );
FileUtils.writeStringToFile( new File( dir, "artifactId-1.0-alpha-1-" + date + "-1.jar" ), "foo", null );
- Artifact artifact =
- createArtifactFromRepository( repository, "groupId", "artifactId", "1.0-alpha-1-" + date + "-1" );
+ Artifact artifact = createArtifactFromRepository( repository, "groupId", "artifactId", "1.0-alpha-1-" + date
+ + "-1" );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check no notices", 0, reportDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check no notices", 0, database.getNumNotices() );
}
public void testTooManySnapshotArtifact()
@@ -137,15 +135,15 @@
for ( int i = 1; i <= 5; i++ )
{
- Artifact artifact = createArtifactFromRepository( tempRepository, "groupId", "artifactId",
- "1.0-alpha-1-" + date + "-" + i );
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
+ Artifact artifact = createArtifactFromRepository( tempRepository, "groupId", "artifactId", "1.0-alpha-1-"
+ + date + "-" + i );
+ artifactReportProcessor.processArtifact( artifact, null );
}
- assertEquals( 0, reportDatabase.getNumFailures() );
- assertEquals( 0, reportDatabase.getNumWarnings() );
- assertEquals( "Check notices", 3, reportDatabase.getNumNotices() );
- Iterator artifactIterator = reportDatabase.getArtifactIterator();
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "Check notices", 3, database.getNumNotices() );
+ Iterator artifactIterator = database.getIterator();
for ( int i = 1; i <= 3; i++ )
{
String version = "1.0-alpha-1-" + date + "-" + i;
@@ -161,7 +159,7 @@
try
{
- artifactReportProcessor.processArtifact( artifact, null, reportDatabase );
+ artifactReportProcessor.processArtifact( artifact, null );
fail( "Should not have passed" );
}
catch ( IllegalStateException e )
Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java?view=diff&rev=507550&r1=507549&r2=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java Wed Feb 14 06:44:59 2007
@@ -19,21 +19,12 @@
* under the License.
*/
-import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.apache.maven.archiva.reporting.group.ReportGroup;
-import org.apache.maven.archiva.reporting.model.MetadataResults;
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
-import org.apache.maven.archiva.reporting.processor.MetadataReportProcessor;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.codehaus.plexus.digest.DigesterException;
-import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
/**
* This class tests the ChecksumArtifactReportProcessor.
@@ -44,19 +35,14 @@
{
private ArtifactReportProcessor artifactReportProcessor;
- private ReportingDatabase reportingDatabase;
-
- private MetadataReportProcessor metadataReportProcessor;
+ private ArtifactResultsDatabase database;
public void setUp()
throws Exception
{
super.setUp();
artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "checksum" );
- metadataReportProcessor = (MetadataReportProcessor) lookup( MetadataReportProcessor.ROLE, "checksum-metadata" );
-
- ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" );
- reportingDatabase = new ReportingDatabase( reportGroup );
+ database = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
}
/**
@@ -70,10 +56,10 @@
Artifact artifact = createArtifact( "checksumTest", "validArtifact", "1.0" );
- artifactReportProcessor.processArtifact( artifact, null, reportingDatabase );
- assertEquals( 0, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 0, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "check no notices", 0, database.getNumNotices() );
}
/**
@@ -85,79 +71,9 @@
String s1 = "1.0";
Artifact artifact = createArtifact( "checksumTest", s, s1 );
- artifactReportProcessor.processArtifact( artifact, null, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
- assertEquals( 0, reportingDatabase.getNumWarnings() );
- assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() );
- }
-
- /**
- * Test the valid checksum of a metadata file.
- * The reportingDatabase should report 2 success validation.
- */
- public void testChecksumMetadataReporterSuccess()
- throws DigesterException, IOException
- {
- createMetadataFile( "VALID" );
- createMetadataFile( "INVALID" );
-
- Artifact artifact = createArtifact( "checksumTest", "validArtifact", "1.0" );
-
- //Version level metadata
- RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
-
- //Artifact level metadata
- metadata = new ArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
-
- //Group level metadata
- metadata = new GroupRepositoryMetadata( "checksumTest" );
- metadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
- }
-
- /**
- * Test the corrupted checksum of a metadata file.
- * The reportingDatabase must report 2 failures.
- */
- public void testChecksumMetadataReporterFailure()
- {
- Artifact artifact = createArtifact( "checksumTest", "invalidArtifact", "1.0" );
-
- RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
-
- Iterator failures = reportingDatabase.getMetadataIterator();
- assertTrue( "check there is a failure", failures.hasNext() );
- MetadataResults results = (MetadataResults) failures.next();
- failures = results.getFailures().iterator();
- assertTrue( "check there is a failure", failures.hasNext() );
- }
-
- /**
- * Test the conditional when the checksum files of the artifact & metadata do not exist.
- */
- public void testChecksumFilesDoNotExist()
- throws DigesterException, IOException
- {
- createChecksumFile( "VALID" );
- createMetadataFile( "VALID" );
- deleteChecksumFiles( "jar" );
-
- Artifact artifact = createArtifact( "checksumTest", "validArtifact", "1.0" );
-
- artifactReportProcessor.processArtifact( artifact, null, reportingDatabase );
- assertEquals( 1, reportingDatabase.getNumFailures() );
-
- RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- metadataReportProcessor.processMetadata( metadata, repository, reportingDatabase );
-
- Iterator failures = reportingDatabase.getMetadataIterator();
- assertTrue( "check there is a failure", failures.hasNext() );
- MetadataResults results = (MetadataResults) failures.next();
- failures = results.getFailures().iterator();
- assertTrue( "check there is a failure", failures.hasNext() );
-
- deleteTestDirectory( new File( repository.getBasedir() + "checksumTest" ) );
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 1, database.getNumFailures() );
+ assertEquals( 0, database.getNumWarnings() );
+ assertEquals( "check no notices", 0, database.getNumNotices() );
}
}
Added: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumMetadataReporterTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumMetadataReporterTest.java?view=auto&rev=507550
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumMetadataReporterTest.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumMetadataReporterTest.java Wed Feb 14 06:44:59 2007
@@ -0,0 +1,135 @@
+package org.apache.maven.archiva.reporting.reporter;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
+import org.apache.maven.archiva.reporting.database.MetadataResultsDatabase;
+import org.apache.maven.archiva.reporting.model.MetadataResults;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.processor.MetadataReportProcessor;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
+import org.codehaus.plexus.digest.DigesterException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+
+/**
+ * ChecksumMetadataReporterTest
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class ChecksumMetadataReporterTest
+ extends AbstractChecksumArtifactReporterTestCase
+{
+ private ArtifactReportProcessor artifactReportProcessor;
+
+ private MetadataReportProcessor metadataReportProcessor;
+
+ private MetadataResultsDatabase database;
+
+ private ArtifactResultsDatabase artifactsDatabase;
+
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ metadataReportProcessor = (MetadataReportProcessor) lookup( MetadataReportProcessor.ROLE, "checksum-metadata" );
+ artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "checksum" );
+ database = (MetadataResultsDatabase) lookup( MetadataResultsDatabase.ROLE );
+ artifactsDatabase = (ArtifactResultsDatabase) lookup( ArtifactResultsDatabase.ROLE );
+ }
+
+ /**
+ * Test the valid checksum of a metadata file.
+ * The reportingDatabase should report 2 success validation.
+ */
+ public void testChecksumMetadataReporterSuccess()
+ throws DigesterException, IOException
+ {
+ createMetadataFile( "VALID" );
+ createMetadataFile( "INVALID" );
+
+ Artifact artifact = createArtifact( "checksumTest", "validArtifact", "1.0" );
+
+ //Version level metadata
+ RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository );
+
+ //Artifact level metadata
+ metadata = new ArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository );
+
+ //Group level metadata
+ metadata = new GroupRepositoryMetadata( "checksumTest" );
+ metadataReportProcessor.processMetadata( metadata, repository );
+ }
+
+ /**
+ * Test the corrupted checksum of a metadata file.
+ * The reportingDatabase must report 2 failures.
+ */
+ public void testChecksumMetadataReporterFailure()
+ {
+ Artifact artifact = createArtifact( "checksumTest", "invalidArtifact", "1.0" );
+
+ RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository );
+
+ Iterator failures = database.getIterator();
+ assertTrue( "check there is a failure", failures.hasNext() );
+ MetadataResults results = (MetadataResults) failures.next();
+ failures = results.getFailures().iterator();
+ assertTrue( "check there is a failure", failures.hasNext() );
+ }
+
+ /**
+ * Test the conditional when the checksum files of the artifact & metadata do not exist.
+ */
+ public void testChecksumFilesDoNotExist()
+ throws DigesterException, IOException
+ {
+ createChecksumFile( "VALID" );
+ createMetadataFile( "VALID" );
+ deleteChecksumFiles( "jar" );
+
+ Artifact artifact = createArtifact( "checksumTest", "validArtifact", "1.0" );
+
+ artifactReportProcessor.processArtifact( artifact, null );
+ assertEquals( 1, artifactsDatabase.getNumFailures() );
+
+ RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact );
+ metadataReportProcessor.processMetadata( metadata, repository );
+
+ Iterator failures = database.getIterator();
+ assertTrue( "check there is a failure", failures.hasNext() );
+ MetadataResults results = (MetadataResults) failures.next();
+ failures = results.getFailures().iterator();
+ assertTrue( "check there is a failure", failures.hasNext() );
+
+ deleteTestDirectory( new File( repository.getBasedir() + "checksumTest" ) );
+ }
+
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumMetadataReporterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumMetadataReporterTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumMetadataReporterTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain