You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ba...@apache.org on 2007/03/14 06:17:54 UTC
svn commit: r518022 - in /maven/archiva/trunk/archiva-reports-standard/src:
main/java/org/apache/maven/archiva/reporting/database/
main/java/org/apache/maven/archiva/reporting/model/ main/mdo/
test/java/org/apache/maven/archiva/reporting/processor/ tes...
Author: bayard
Date: Tue Mar 13 22:17:53 2007
New Revision: 518022
URL: http://svn.apache.org/viewvc?view=rev&rev=518022
Log:
Renaming 'result' to 'resultReason' and 'type' to 'artifactType' as result/type are protected words in some databases and jpox barfs on them.
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java
maven/archiva/trunk/archiva-reports-standard/src/main/mdo/reporting.mdo
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java Tue Mar 13 22:17:53 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
/**
* AbstractResultsDatabase
@@ -69,9 +69,9 @@
*/
public abstract int getNumNotices();
- protected static Result createResult( String processor, String problem, String reason )
+ protected static ResultReason createResultReason( String processor, String problem, String reason )
{
- Result result = new Result();
+ ResultReason result = new ResultReason();
result.setProcessor( processor );
result.setProblem( problem );
result.setReason( reason );
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java Tue Mar 13 22:17:53 2007
@@ -22,7 +22,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.reporting.model.ArtifactResults;
import org.apache.maven.archiva.reporting.model.ArtifactResultsKey;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
import org.apache.maven.artifact.Artifact;
import java.util.Collections;
@@ -54,7 +54,7 @@
public void addFailure( Artifact artifact, String processor, String problem, String reason )
{
ArtifactResults results = getArtifactResults( artifact );
- Result result = createResult( processor, problem, reason );
+ ResultReason result = createResultReason( processor, problem, reason );
if ( !results.getFailures().contains( result ) )
{
@@ -67,7 +67,7 @@
public void addNotice( Artifact artifact, String processor, String problem, String reason )
{
ArtifactResults results = getArtifactResults( artifact );
- Result result = createResult( processor, problem, reason );
+ ResultReason result = createResultReason( processor, problem, reason );
if ( !results.getNotices().contains( result ) )
{
@@ -80,7 +80,7 @@
public void addWarning( Artifact artifact, String processor, String problem, String reason )
{
ArtifactResults results = getArtifactResults( artifact );
- Result result = createResult( processor, problem, reason );
+ ResultReason result = createResultReason( processor, problem, reason );
if ( !results.getWarnings().contains( result ) )
{
@@ -211,7 +211,7 @@
results.setGroupId( StringUtils.defaultString( artifact.getGroupId() ) );
results.setArtifactId( StringUtils.defaultString( artifact.getArtifactId() ) );
results.setVersion( StringUtils.defaultString( artifact.getVersion() ) );
- results.setType( StringUtils.defaultString( artifact.getType() ) );
+ results.setArtifactType( StringUtils.defaultString( artifact.getType() ) );
results.setClassifier( StringUtils.defaultString( artifact.getClassifier() ) );
return results;
@@ -241,7 +241,7 @@
key.groupId = StringUtils.defaultString( artifact.getGroupId() );
key.artifactId = StringUtils.defaultString( artifact.getArtifactId() );
key.version = StringUtils.defaultString( artifact.getVersion() );
- key.type = StringUtils.defaultString( artifact.getType() );
+ key.artifactType = StringUtils.defaultString( artifact.getType() );
key.classifier = StringUtils.defaultString( artifact.getClassifier() );
return (ArtifactResults) getObjectByKey( ArtifactResults.class, key );
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java Tue Mar 13 22:17:53 2007
@@ -22,7 +22,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.reporting.model.MetadataResults;
import org.apache.maven.archiva.reporting.model.MetadataResultsKey;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import java.util.Collections;
@@ -47,7 +47,7 @@
public void addFailure( RepositoryMetadata metadata, String processor, String problem, String reason )
{
MetadataResults results = getMetadataResults( metadata );
- Result result = createResult( processor, problem, reason );
+ ResultReason result = createResultReason( processor, problem, reason );
if ( !results.getFailures().contains( result ) )
{
@@ -60,7 +60,7 @@
public void addWarning( RepositoryMetadata metadata, String processor, String problem, String reason )
{
MetadataResults results = getMetadataResults( metadata );
- Result result = createResult( processor, problem, reason );
+ ResultReason result = createResultReason( processor, problem, reason );
if ( !results.getWarnings().contains( result ) )
{
@@ -73,7 +73,7 @@
public void addNotice( RepositoryMetadata metadata, String processor, String problem, String reason )
{
MetadataResults results = getMetadataResults( metadata );
- Result result = createResult( processor, problem, reason );
+ ResultReason result = createResultReason( processor, problem, reason );
if ( !results.getNotices().contains( result ) )
{
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java Tue Mar 13 22:17:53 2007
@@ -38,7 +38,7 @@
public String version = "";
- public String type = "";
+ public String artifactType = "";
public String classifier = "";
@@ -53,13 +53,13 @@
groupId = parts[0];
artifactId = parts[1];
version = parts[2];
- type = parts[3];
+ artifactType = parts[3];
classifier = parts[4];
}
public String toString()
{
- return StringUtils.join( new String[] { groupId, artifactId, version, type, classifier }, ':' );
+ return StringUtils.join( new String[] { groupId, artifactId, version, artifactType, classifier }, ':' );
}
public int hashCode()
@@ -69,7 +69,7 @@
result = PRIME * result + ( ( groupId == null ) ? 0 : groupId.hashCode() );
result = PRIME * result + ( ( artifactId == null ) ? 0 : artifactId.hashCode() );
result = PRIME * result + ( ( version == null ) ? 0 : version.hashCode() );
- result = PRIME * result + ( ( type == null ) ? 0 : type.hashCode() );
+ result = PRIME * result + ( ( artifactType == null ) ? 0 : artifactType.hashCode() );
result = PRIME * result + ( ( classifier == null ) ? 0 : classifier.hashCode() );
return result;
}
@@ -129,14 +129,14 @@
return false;
}
- if ( type == null )
+ if ( artifactType == null )
{
- if ( other.type != null )
+ if ( other.artifactType != null )
{
return false;
}
}
- else if ( !type.equals( other.type ) )
+ else if ( !artifactType.equals( other.artifactType ) )
{
return false;
}
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/mdo/reporting.mdo
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/mdo/reporting.mdo?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/mdo/reporting.mdo (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/mdo/reporting.mdo Tue Mar 13 22:17:53 2007
@@ -103,7 +103,7 @@
jpox.primary-key="true"
jpox.value-strategy="off"
jpox.persistence-modifier="persistent">
- <name>type</name>
+ <name>artifactType</name>
<version>1.0.0</version>
<type>String</type>
<identity>true</identity>
@@ -134,7 +134,7 @@
jpox.dependent="true"
java.generate-break="false"
java.generate-create="false">
- <type>Result</type>
+ <type>ResultReason</type>
<multiplicity>*</multiplicity>
</association>
</field>
@@ -147,7 +147,7 @@
jpox.dependent="true"
java.generate-break="false"
java.generate-create="false">
- <type>Result</type>
+ <type>ResultReason</type>
<multiplicity>*</multiplicity>
</association>
</field>
@@ -160,7 +160,7 @@
jpox.dependent="true"
java.generate-break="false"
java.generate-create="false">
- <type>Result</type>
+ <type>ResultReason</type>
<multiplicity>*</multiplicity>
</association>
</field>
@@ -221,7 +221,7 @@
jpox.dependent="true"
java.generate-break="false"
java.generate-create="false">
- <type>Result</type>
+ <type>ResultReason</type>
<multiplicity>*</multiplicity>
</association>
</field>
@@ -234,7 +234,7 @@
jpox.dependent="true"
java.generate-break="false"
java.generate-create="false">
- <type>Result</type>
+ <type>ResultReason</type>
<multiplicity>*</multiplicity>
</association>
</field>
@@ -247,7 +247,7 @@
jpox.dependent="true"
java.generate-break="false"
java.generate-create="false">
- <type>Result</type>
+ <type>ResultReason</type>
<multiplicity>*</multiplicity>
</association>
</field>
@@ -263,7 +263,7 @@
</fields>
</class>
<class stash.storable="true">
- <name>Result</name>
+ <name>ResultReason</name>
<version>1.0.0</version>
<fields>
<field xml.attribute="true">
@@ -302,13 +302,13 @@
<code><![CDATA[
public boolean equals( Object obj )
{
- if ( obj instanceof Result )
+ if ( obj instanceof ResultReason )
{
if ( this == obj )
{
return true;
}
- Result rhs = (Result) obj;
+ ResultReason rhs = (ResultReason) obj;
return new org.apache.commons.lang.builder.EqualsBuilder()
.append( problem, rhs.problem )
.append( processor, rhs.processor )
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java Tue Mar 13 22:17:53 2007
@@ -23,7 +23,7 @@
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
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.archiva.reporting.model.ResultReason;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
@@ -87,7 +87,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertMetadata( metadata, results );
assertEquals( "check reason", "Missing lastUpdated element inside the metadata.", result.getReason() );
assertFalse( "check no more failures", failures.hasNext() );
@@ -107,9 +107,9 @@
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
assertMetadata( metadata, results );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( "check reason", "Missing lastUpdated element inside the metadata.", result.getReason() );
- result = (Result) failures.next();
+ result = (ResultReason) failures.next();
boolean alpha1First = false;
if ( result.getReason().indexOf( "alpha-1" ) > 0 )
{
@@ -127,7 +127,7 @@
"Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.", result
.getReason() );
}
- result = (Result) failures.next();
+ result = (ResultReason) failures.next();
if ( !alpha1First )
{
assertEquals( "check reason",
@@ -158,7 +158,7 @@
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
assertMetadata( metadata, results );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( "check reason", "Missing lastUpdated element inside the metadata.", result.getReason() );
assertFalse( "check no more failures", failures.hasNext() );
}
@@ -197,7 +197,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertMetadata( metadata, results );
// TODO: should be more robust
assertEquals( "check reason",
@@ -225,7 +225,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertMetadata( metadata, results );
// TODO: should be more robust
assertEquals( "check reason",
@@ -252,14 +252,14 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
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() );
assertTrue( "check there is a 2nd failure", failures.hasNext() );
- result = (Result) failures.next();
+ result = (ResultReason) 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
@@ -293,7 +293,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
// TODO: should be more robust
assertEquals( "check reason", "Metadata plugin missing-plugin not found in the repository", result.getReason() );
assertFalse( "check no more failures", failures.hasNext() );
@@ -311,7 +311,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) 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() );
@@ -333,12 +333,12 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
// TODO: should be more robust
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();
+ result = (ResultReason) failures.next();
// TODO: should be more robust
assertEquals( "check reason", "Missing or empty artifactId in group metadata for plugin default4", result
.getReason() );
@@ -358,11 +358,11 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
// TODO: should be more robust
assertEquals( "check reason", "Missing or empty plugin prefix for artifactId artifactId.", result.getReason() );
assertTrue( "check there is a 2nd failure", failures.hasNext() );
- result = (Result) failures.next();
+ result = (ResultReason) failures.next();
// TODO: should be more robust
assertEquals( "check reason", "Missing or empty plugin prefix for artifactId snapshot-artifact.", result
.getReason() );
@@ -382,7 +382,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
// TODO: should be more robust
assertEquals( "check reason", "Duplicate plugin prefix found: default.", result.getReason() );
assertFalse( "check no more failures", failures.hasNext() );
@@ -423,7 +423,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) 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
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java Tue Mar 13 22:17:53 2007
@@ -22,7 +22,7 @@
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
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.archiva.reporting.model.ResultReason;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Dependency;
@@ -91,7 +91,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( "Artifact does not exist in the repository", result.getReason() );
}
@@ -161,7 +161,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( getDependencyNotFoundMessage( createDependency( INVALID, INVALID, INVALID ) ), result.getReason() );
}
@@ -181,7 +181,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( getDependencyNotFoundMessage( dependency ), result.getReason() );
}
@@ -210,7 +210,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( getDependencyNotFoundMessage( dependency ), result.getReason() );
}
@@ -229,7 +229,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( getDependencyNotFoundMessage( dependency ), result.getReason() );
}
@@ -249,7 +249,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( getDependencyVersionInvalidMessage( dependency, "[" ), result.getReason() );
}
@@ -282,7 +282,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
assertFalse( failures.hasNext() );
failures = results.getFailures().iterator();
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertEquals( getDependencyVersionInvalidMessage( dependency, null ), result.getReason() );
}
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java Tue Mar 13 22:17:53 2007
@@ -22,7 +22,7 @@
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
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.archiva.reporting.model.ResultReason;
import org.apache.maven.artifact.Artifact;
import org.codehaus.plexus.util.FileUtils;
@@ -61,7 +61,7 @@
assertEquals( artifact.getVersion(), results.getVersion() );
assertEquals( 1, results.getNotices().size() );
Iterator i = results.getNotices().iterator();
- Result result = (Result) i.next();
+ ResultReason result = (ResultReason) i.next();
assertEquals( "old-artifact", result.getProcessor() );
}
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java Tue Mar 13 22:17:53 2007
@@ -23,7 +23,7 @@
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
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.archiva.reporting.model.ResultReason;
import org.apache.maven.artifact.Artifact;
import java.io.File;
@@ -76,7 +76,7 @@
assertFalse( artifact.getVersion().indexOf( "SNAPSHOT" ) >= 0 );
assertEquals( 1, results.getNotices().size() );
Iterator i = results.getNotices().iterator();
- Result result = (Result) i.next();
+ ResultReason result = (ResultReason) i.next();
assertEquals( "old-snapshot-artifact", result.getProcessor() );
}
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java?view=diff&rev=518022&r1=518021&r2=518022
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java Tue Mar 13 22:17:53 2007
@@ -24,7 +24,7 @@
import org.apache.maven.archiva.reporting.database.ReportingDatabase;
import org.apache.maven.archiva.reporting.model.ArtifactResults;
import org.apache.maven.archiva.reporting.model.MetadataResults;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
@@ -90,7 +90,7 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertMetadata( results );
assertEquals( "check failure reason", "Single Failure Reason", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -126,13 +126,13 @@
MetadataResults results = (MetadataResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertMetadata( results );
assertEquals( "check failure reason", "First Failure Reason", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
assertTrue( "must have 2nd failure", failures.hasNext() );
- result = (Result) failures.next();
+ result = (ResultReason) failures.next();
assertEquals( "check failure reason", "Second Failure Reason", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -151,7 +151,7 @@
MetadataResults results = (MetadataResults) warnings.next();
warnings = results.getWarnings().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertMetadata( results );
assertEquals( "check failure reason", "Single Warning Message", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -172,13 +172,13 @@
MetadataResults results = (MetadataResults) warnings.next();
warnings = results.getWarnings().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertMetadata( results );
assertEquals( "check failure reason", "First Warning", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
assertTrue( "must have 2nd warning", warnings.hasNext() );
- result = (Result) warnings.next();
+ result = (ResultReason) warnings.next();
assertEquals( "check failure reason", "Second Warning", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -197,7 +197,7 @@
MetadataResults results = (MetadataResults) warnings.next();
warnings = results.getNotices().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertMetadata( results );
assertEquals( "check failure reason", "Single Notice Message", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -218,13 +218,13 @@
MetadataResults results = (MetadataResults) warnings.next();
warnings = results.getNotices().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertMetadata( results );
assertEquals( "check failure reason", "First Notice", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
assertTrue( "must have 2nd warning", warnings.hasNext() );
- result = (Result) warnings.next();
+ result = (ResultReason) warnings.next();
assertEquals( "check failure reason", "Second Notice", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -243,7 +243,7 @@
ArtifactResults results = (ArtifactResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertArtifact( results );
assertEquals( "check failure reason", "Single Failure Reason", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -266,7 +266,7 @@
assertEquals( "check failure cause", StringUtils.defaultString( artifact.getVersion() ), results.getVersion() );
assertEquals( "check failure cause", StringUtils.defaultString( artifact.getClassifier() ), results
.getClassifier() );
- assertEquals( "check failure cause", StringUtils.defaultString( artifact.getType() ), results.getType() );
+ assertEquals( "check failure cause", StringUtils.defaultString( artifact.getType() ), results.getArtifactType() );
}
public void testArtifactMultipleFailures()
@@ -282,13 +282,13 @@
ArtifactResults results = (ArtifactResults) failures.next();
failures = results.getFailures().iterator();
assertTrue( "check there is a failure", failures.hasNext() );
- Result result = (Result) failures.next();
+ ResultReason result = (ResultReason) failures.next();
assertArtifact( results );
assertEquals( "check failure reason", "First Failure Reason", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
assertTrue( "must have 2nd failure", failures.hasNext() );
- result = (Result) failures.next();
+ result = (ResultReason) failures.next();
assertEquals( "check failure reason", "Second Failure Reason", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -307,7 +307,7 @@
ArtifactResults results = (ArtifactResults) warnings.next();
warnings = results.getWarnings().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertArtifact( results );
assertEquals( "check failure reason", "Single Warning Message", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -328,13 +328,13 @@
ArtifactResults results = (ArtifactResults) warnings.next();
warnings = results.getWarnings().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertArtifact( results );
assertEquals( "check failure reason", "First Warning", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
assertTrue( "must have 2nd warning", warnings.hasNext() );
- result = (Result) warnings.next();
+ result = (ResultReason) warnings.next();
assertEquals( "check failure reason", "Second Warning", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -353,7 +353,7 @@
ArtifactResults results = (ArtifactResults) warnings.next();
warnings = results.getNotices().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertArtifact( results );
assertEquals( "check failure reason", "Single Notice Message", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -374,13 +374,13 @@
ArtifactResults results = (ArtifactResults) warnings.next();
warnings = results.getNotices().iterator();
assertTrue( "check there is a failure", warnings.hasNext() );
- Result result = (Result) warnings.next();
+ ResultReason result = (ResultReason) warnings.next();
assertArtifact( results );
assertEquals( "check failure reason", "First Notice", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
assertTrue( "must have 2nd warning", warnings.hasNext() );
- result = (Result) warnings.next();
+ result = (ResultReason) warnings.next();
assertEquals( "check failure reason", "Second Notice", result.getReason() );
assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
assertEquals( "check failure parameters", PROBLEM, result.getProblem() );