From 284ce857038be3f6d20f510e14fdd9af211dd1da Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 13 Apr 2007 19:58:09 +0000 Subject: [PATCH] adding in some tests for making sure the tasks are executing correctly git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@528637 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-scheduled/pom.xml | 4 --- .../ArchivaScheduledTaskExecutorTest.java | 31 ++++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/archiva-scheduled/pom.xml b/archiva-scheduled/pom.xml index eab4dd58c..ce05eb74c 100644 --- a/archiva-scheduled/pom.xml +++ b/archiva-scheduled/pom.xml @@ -49,10 +49,6 @@ org.apache.maven.archiva archiva-database-consumers - - org.apache.maven.archiva - archiva-lucene-consumers - org.codehaus.plexus plexus-taskqueue diff --git a/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java b/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java index 19516a448..7a60d5f99 100644 --- a/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java +++ b/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java @@ -22,6 +22,7 @@ package org.apache.maven.archiva.scheduled.executors; 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 javax.jdo.PersistenceManagerFactory; 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 @@ public class ArchivaScheduledTaskExecutorTest 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 ); + } -- 2.39.5