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/10/19 18:40:07 UTC
svn commit: r586524 - in
/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test:
java/org/apache/maven/archiva/repository/scanner/ resources/
resources/org/apache/maven/archiva/repository/scanner/
Author: joakime
Date: Fri Oct 19 09:40:05 2007
New Revision: 586524
URL: http://svn.apache.org/viewvc?rev=586524&view=rev
Log:
Beefing up tests for RepositoryContentConsumers.
Added:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java
- copied, changed from r586088, maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.xml
- copied, changed from r586088, maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.xml
Removed:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.xml
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/SampleKnownConsumer.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/scanner-archiva.xml
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java?rev=586524&r1=586523&r2=586524&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java Fri Oct 19 09:40:05 2007
@@ -36,6 +36,11 @@
extends AbstractMonitoredConsumer
implements InvalidRepositoryContentConsumer
{
+ /**
+ * @plexus.configuration default-value="unset-id"
+ */
+ private String id = "unset-id";
+
private int processCount = 0;
public void beginScan( ManagedRepositoryConfiguration repository )
@@ -72,7 +77,7 @@
public String getId()
{
- return "test-invalid-consumer";
+ return id;
}
public boolean isPermanent()
Copied: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java (from r586088, maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java)
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java?p2=maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java&p1=maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java&r1=586088&r2=586524&rev=586524&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java Fri Oct 19 09:40:05 2007
@@ -23,98 +23,173 @@
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.codehaus.plexus.PlexusTestCase;
import org.easymock.MockControl;
-import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
-
import java.io.File;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
/**
- * RepositoryContentConsumerUtilTest
+ * RepositoryContentConsumersTest
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
-public class RepositoryContentConsumerUtilTest
+public class RepositoryContentConsumersTest
extends AbstractRepositoryLayerTestCase
{
- private RepositoryContentConsumers lookupRepositoryConsumerUtil()
+ private RepositoryContentConsumers lookupRepositoryConsumers()
throws Exception
{
RepositoryContentConsumers consumerUtil = (RepositoryContentConsumers) lookup( RepositoryContentConsumers.class
.getName() );
- assertNotNull( "RepositoryContentConsumerUtil should not be null.", consumerUtil );
+ assertNotNull( "RepositoryContentConsumers should not be null.", consumerUtil );
return consumerUtil;
}
- public void testGetSelectedIds()
+ public void testGetSelectedKnownIds()
throws Exception
{
- RepositoryContentConsumers consumerutil = lookupRepositoryConsumerUtil();
+ RepositoryContentConsumers consumerutil = lookupRepositoryConsumers();
+
+ String expectedKnownIds[] = new String[] {
+ "update-db-artifact",
+ "create-missing-checksums",
+ "update-db-repository-metadata",
+ "validate-checksum",
+ "validate-signature",
+ "index-content",
+ "auto-remove",
+ "auto-rename" };
- List knownConsumers = consumerutil.getSelectedKnownConsumerIds();
+ List<String> knownConsumers = consumerutil.getSelectedKnownConsumerIds();
assertNotNull( "Known Consumer IDs should not be null", knownConsumers );
- assertEquals( "Known Consumer IDs.size", 9, knownConsumers.size() );
+ assertEquals( "Known Consumer IDs.size", expectedKnownIds.length, knownConsumers.size() );
+
+ for ( String expectedId : expectedKnownIds )
+ {
+ assertTrue( "Known id [" + expectedId + "] exists.", knownConsumers.contains( expectedId ) );
+ }
+ }
+
+ public void testGetSelectedInvalidIds()
+ throws Exception
+ {
+ RepositoryContentConsumers consumerutil = lookupRepositoryConsumers();
- List invalidConsumers = consumerutil.getSelectedInvalidConsumerIds();
+ String expectedInvalidIds[] = new String[] { "update-db-bad-content" };
+
+ List<String> invalidConsumers = consumerutil.getSelectedInvalidConsumerIds();
assertNotNull( "Invalid Consumer IDs should not be null", invalidConsumers );
- assertEquals( "Invalid Consumer IDs.size", 1, invalidConsumers.size() );
+ assertEquals( "Invalid Consumer IDs.size", expectedInvalidIds.length, invalidConsumers.size() );
+
+ for ( String expectedId : expectedInvalidIds )
+ {
+ assertTrue( "Invalid id [" + expectedId + "] exists.", invalidConsumers.contains( expectedId ) );
+ }
}
- public void testGetSelectedConsumersMaps()
+ public void testGetSelectedKnownConsumerMap()
throws Exception
{
- RepositoryContentConsumers consumerutil = lookupRepositoryConsumerUtil();
+ RepositoryContentConsumers consumerutil = lookupRepositoryConsumers();
- Map knownConsumerMap = consumerutil.getSelectedKnownConsumersMap();
+ String expectedSelectedKnownIds[] = new String[] {
+ "update-db-artifact",
+ "create-missing-checksums",
+ "update-db-repository-metadata",
+ "validate-checksum",
+ "index-content",
+ "auto-remove",
+ "auto-rename" };
+
+ Map<String, KnownRepositoryContentConsumer> knownConsumerMap = consumerutil.getSelectedKnownConsumersMap();
assertNotNull( "Known Consumer Map should not be null", knownConsumerMap );
- assertEquals( "Known Consumer Map.size", 1, knownConsumerMap.size() );
+ assertEquals( "Known Consumer Map.size", expectedSelectedKnownIds.length, knownConsumerMap.size() );
+
+ for ( String expectedId : expectedSelectedKnownIds )
+ {
+ KnownRepositoryContentConsumer consumer = knownConsumerMap.get( expectedId );
+ assertNotNull( "Known[" + expectedId + "] should not be null.", consumer );
+ assertEquals( "Known[" + expectedId + "].id", expectedId, consumer.getId() );
+ }
+ }
- Object o = knownConsumerMap.get( "sample-known" );
- assertNotNull( "Known[sample-known] should not be null.", o );
- assertInstanceof( "Known[sample-known]", RepositoryContentConsumer.class, o );
- assertInstanceof( "Known[sample-known]", KnownRepositoryContentConsumer.class, o );
+ public void testGetSelectedInvalidConsumerMap()
+ throws Exception
+ {
+ RepositoryContentConsumers consumerutil = lookupRepositoryConsumers();
- Map invalidConsumerMap = consumerutil.getSelectedInvalidConsumersMap();
+ String expectedSelectedInvalidIds[] = new String[] { "update-db-bad-content" };
+
+ Map<String, InvalidRepositoryContentConsumer> invalidConsumerMap = consumerutil
+ .getSelectedInvalidConsumersMap();
assertNotNull( "Invalid Consumer Map should not be null", invalidConsumerMap );
- assertEquals( "Invalid Consumer Map.size", 0, invalidConsumerMap.size() );
+ assertEquals( "Invalid Consumer Map.size", expectedSelectedInvalidIds.length, invalidConsumerMap.size() );
+
+ for ( String expectedId : expectedSelectedInvalidIds )
+ {
+ InvalidRepositoryContentConsumer consumer = invalidConsumerMap.get( expectedId );
+ assertNotNull( "Known[" + expectedId + "] should not be null.", consumer );
+ assertEquals( "Known[" + expectedId + "].id", expectedId, consumer.getId() );
+ }
}
- private void assertInstanceof( String msg, Class clazz, Object o )
+ public void testGetAvailableKnownList()
+ throws Exception
{
- if ( clazz.isInstance( o ) == false )
+ RepositoryContentConsumers consumerutil = lookupRepositoryConsumers();
+
+ String expectedKnownIds[] = new String[] {
+ "update-db-artifact",
+ "create-missing-checksums",
+ "update-db-repository-metadata",
+ "validate-checksum",
+ "index-content",
+ "auto-remove",
+ "auto-rename",
+ "available-but-unselected" };
+
+ List<KnownRepositoryContentConsumer> knownConsumers = consumerutil.getAvailableKnownConsumers();
+ assertNotNull( "known consumers should not be null.", knownConsumers );
+ assertEquals( "known consumers", expectedKnownIds.length, knownConsumers.size() );
+
+ List<String> expectedIds = Arrays.asList( expectedKnownIds );
+ for ( KnownRepositoryContentConsumer consumer : knownConsumers )
{
- fail( msg + ": Object [" + o.getClass().getName() + "] should have been an instanceof [" + clazz.getName() +
- "]" );
+ assertTrue( "Consumer [" + consumer.getId() + "] returned by .getAvailableKnownConsumers() is unexpected.",
+ expectedIds.contains( consumer.getId() ) );
}
}
- public void testGetAvailableLists()
+ public void testGetAvailableInvalidList()
throws Exception
{
- RepositoryContentConsumers consumerutil = lookupRepositoryConsumerUtil();
+ RepositoryContentConsumers consumerutil = lookupRepositoryConsumers();
- List knownConsumers = consumerutil.getAvailableKnownConsumers();
- assertNotNull( "known consumers should not be null.", knownConsumers );
- assertEquals( "known consumers", 1, knownConsumers.size() );
- assertInstanceof( "Available Known Consumers", RepositoryContentConsumer.class, knownConsumers.get( 0 ) );
+ String expectedInvalidIds[] = new String[] { "update-db-bad-content", "move-to-trash-then-notify" };
- List invalidConsumers = consumerutil.getAvailableInvalidConsumers();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = consumerutil.getAvailableInvalidConsumers();
assertNotNull( "invalid consumers should not be null.", invalidConsumers );
- assertEquals( "invalid consumers", 0, invalidConsumers.size() );
+ assertEquals( "invalid consumers", expectedInvalidIds.length, invalidConsumers.size() );
+
+ List<String> expectedIds = Arrays.asList( expectedInvalidIds );
+ for ( InvalidRepositoryContentConsumer consumer : invalidConsumers )
+ {
+ assertTrue( "Consumer [" + consumer.getId()
+ + "] returned by .getAvailableInvalidConsumers() is unexpected.", expectedIds.contains( consumer
+ .getId() ) );
+ }
}
public void testExecution()
throws Exception
{
MockControl knownControl = MockControl.createNiceControl( KnownRepositoryContentConsumer.class );
- RepositoryContentConsumers consumers = lookupRepositoryConsumerUtil();
+ RepositoryContentConsumers consumers = lookupRepositoryConsumers();
KnownRepositoryContentConsumer knownConsumer = (KnownRepositoryContentConsumer) knownControl.getMock();
consumers.setAvailableKnownConsumers( Collections.singletonList( knownConsumer ) );
@@ -124,18 +199,18 @@
ManagedRepositoryConfiguration repo = createRepository( "id", "name", getTestFile( "target/test-repo" ) );
File testFile = getTestFile( "target/test-repo/path/to/test-file.txt" );
-
+
knownConsumer.beginScan( repo );
knownConsumer.getExcludes();
knownControl.setReturnValue( Collections.EMPTY_LIST );
knownConsumer.getIncludes();
knownControl.setReturnValue( Collections.singletonList( "**/*.txt" ) );
- knownConsumer.processFile( _OS("path/to/test-file.txt") );
-// knownConsumer.completeScan();
+ knownConsumer.processFile( _OS( "path/to/test-file.txt" ) );
+ // knownConsumer.completeScan();
knownControl.replay();
invalidConsumer.beginScan( repo );
-// invalidConsumer.completeScan();
+ // invalidConsumer.completeScan();
invalidControl.replay();
consumers.executeConsumers( repo, testFile );
@@ -153,14 +228,14 @@
knownControl.setReturnValue( Collections.EMPTY_LIST );
knownConsumer.getIncludes();
knownControl.setReturnValue( Collections.singletonList( "**/*.txt" ) );
-// knownConsumer.completeScan();
+ // knownConsumer.completeScan();
knownControl.replay();
invalidConsumer.beginScan( repo );
- invalidConsumer.processFile( _OS("path/to/test-file.xml") );
+ invalidConsumer.processFile( _OS( "path/to/test-file.xml" ) );
invalidConsumer.getId();
invalidControl.setReturnValue( "invalid" );
-// invalidConsumer.completeScan();
+ // invalidConsumer.completeScan();
invalidControl.replay();
consumers.executeConsumers( repo, notIncludedTestFile );
@@ -176,14 +251,14 @@
knownConsumer.beginScan( repo );
knownConsumer.getExcludes();
knownControl.setReturnValue( Collections.singletonList( "**/test-file.txt" ) );
-// knownConsumer.completeScan();
+ // knownConsumer.completeScan();
knownControl.replay();
invalidConsumer.beginScan( repo );
- invalidConsumer.processFile( _OS("path/to/test-file.txt") );
+ invalidConsumer.processFile( _OS( "path/to/test-file.txt" ) );
invalidConsumer.getId();
invalidControl.setReturnValue( "invalid" );
-// invalidConsumer.completeScan();
+ // invalidConsumer.completeScan();
invalidControl.replay();
consumers.executeConsumers( repo, excludedTestFile );
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/SampleKnownConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/SampleKnownConsumer.java?rev=586524&r1=586523&r2=586524&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/SampleKnownConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/SampleKnownConsumer.java Fri Oct 19 09:40:05 2007
@@ -39,6 +39,11 @@
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer
{
+ /**
+ * @plexus.configuration default-value="unset-id"
+ */
+ private String id = "unset-id";
+
public void beginScan( ManagedRepositoryConfiguration repository )
throws ConsumerException
{
@@ -73,7 +78,7 @@
public String getId()
{
- return "sample-known";
+ return id;
}
public boolean isPermanent()
Copied: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.xml (from r586088, maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.xml)
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.xml?p2=maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.xml&p1=maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.xml&r1=586088&r2=586524&rev=586524&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.xml Fri Oct 19 09:40:05 2007
@@ -43,10 +43,88 @@
</configuration>
</component>
+ <!-- Known Content Consumers -->
<component>
<role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
- <role-hint>sample-known</role-hint>
+ <role-hint>update-db-artifact</role-hint>
<implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>update-db-artifact</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role-hint>create-missing-checksums</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>create-missing-checksums</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role-hint>update-db-repository-metadata</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>update-db-repository-metadata</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role-hint>validate-checksum</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>validate-checksum</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role-hint>index-content</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>index-content</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role-hint>auto-remove</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>auto-remove</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role-hint>auto-rename</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>auto-rename</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role-hint>available-but-unselected</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
+ <configuration>
+ <id>available-but-unselected</id>
+ </configuration>
+ </component>
+
+ <!-- Invalid Content Consumers -->
+ <component>
+ <role>org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer</role>
+ <role-hint>update-db-bad-content</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.InvalidScanConsumer</implementation>
+ <configuration>
+ <id>update-db-bad-content</id>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer</role>
+ <role-hint>move-to-trash-then-notify</role-hint>
+ <implementation>org.apache.maven.archiva.repository.scanner.InvalidScanConsumer</implementation>
+ <configuration>
+ <id>move-to-trash-then-notify</id>
+ </configuration>
</component>
</components>
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/scanner-archiva.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/scanner-archiva.xml?rev=586524&r1=586523&r2=586524&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/scanner-archiva.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/resources/scanner-archiva.xml Fri Oct 19 09:40:05 2007
@@ -75,7 +75,6 @@
</fileType>
</fileTypes>
<knownContentConsumers>
- <knownContentConsumer>sample-known</knownContentConsumer>
<knownContentConsumer>update-db-artifact</knownContentConsumer>
<knownContentConsumer>create-missing-checksums</knownContentConsumer>
<knownContentConsumer>update-db-repository-metadata</knownContentConsumer>