Author: jmcconnell
Date: Fri Apr 13 12:58:09 2007
New Revision: 528637
URL: http://svn.apache.org/viewvc?view=rev&rev=528637
Log:
adding in some tests for making sure the tasks are executing correctly
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml?view=diff&rev=528637&r1=528636&r2=528637
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/pom.xml
Fri Apr 13 12:58:09 2007
@@ -50,10 +50,6 @@
<artifactId>archiva-database-consumers</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-lucene-consumers</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-taskqueue</artifactId>
<version>1.0-alpha-6</version>
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java?view=diff&rev=528637&r1=528636&r2=528637
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
Fri Apr 13 12:58:09 2007
@@ -22,6 +22,7 @@
import java.io.File;
import java.net.URL;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -31,8 +32,12 @@
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.database.ArchivaDAO;
+import org.apache.maven.archiva.database.ArtifactDAO;
import org.apache.maven.archiva.database.RepositoryDAO;
+import
org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
+import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaRepository;
+import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
@@ -163,10 +168,34 @@
RepositoryTask repoTask = new RepositoryTask();
- repoTask.setName( "testTask" );
+ repoTask.setName( "testRepoTask" );
repoTask.setRepositoryId( "testRepo" );
taskExecutor.executeTask( repoTask );
+
+ ArtifactDAO adao = dao.getArtifactDAO();
+
+ ArchivaArtifact artifact = adao.getArtifact( "javax.sql", "jdbc",
"2.0", null, "jar" );
+
+ assertNotNull( artifact );
+
+ List results = dao.getArtifactDAO().queryArtifacts( new
ArtifactsProcessedConstraint( false ) );
+
+ assertNotNull( results );
+ assertEquals("Incorrect number of unprocessed artifacts detected.",
results.size(), 8 );
+
+ DatabaseTask dataTask = new DatabaseTask();
+
+ dataTask.setName( "testDataTask" );
+
+ taskExecutor.executeTask( dataTask );
+
+ List newResults = dao.getArtifactDAO().queryArtifacts( new
ArtifactsProcessedConstraint( false ) );
+
+ assertNotNull( newResults );
+ assertEquals("Incorrect number of unprocessed artifacts detected.",
newResults.size(), 0 );
+ assertEquals("Incorrect number of processed artifacts detected.",
newResults.size(), 8 );
+
}