svn commit: r529337 - in /maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src: main/java/org/apache/maven/archiva/scheduled/executors/ test/conf/ test/java/org/apache/maven/archiva/scheduled/executors/

[jmcconnell]

Author: jmcconnell
Date: Mon Apr 16 10:36:32 2007
New Revision: 529337

URL: http://svn.apache.org/viewvc?view=rev&rev=529337
Log:
working test case now that the model bug was found and squashed

Modified:
    
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
    
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/conf/repository-manager.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/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java?view=diff&rev=529337&r1=529336&r2=529337
==============================================================================
--- 
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
 (original)
+++ 
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
 Mon Apr 16 10:36:32 2007
@@ -111,6 +111,7 @@
 
         try
         {
+            getLogger().info( "Task: Updating unprocessed artifacts" );
             databaseUpdater.updateAllUnprocessed();
         }
         catch ( ArchivaDatabaseException e )
@@ -120,6 +121,7 @@
 
         try
         {
+            getLogger().info( "Task: Updating processed artifacts" );
             databaseUpdater.updateAllProcessed();
         }
         catch ( ArchivaDatabaseException e )

Modified: 
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/conf/repository-manager.xml
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/conf/repository-manager.xml?view=diff&rev=529337&r1=529336&r2=529337
==============================================================================
--- 
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/conf/repository-manager.xml
 (original)
+++ 
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/conf/repository-manager.xml
 Mon Apr 16 10:36:32 2007
@@ -165,12 +165,7 @@
   <databaseScanning>
     <cronExpression>0 0 * * ?</cronExpression>
     <unprocessedConsumers>
-      <unprocessedConsumer>index-artifact</unprocessedConsumer>
-      <unprocessedConsumer>update-db-project</unprocessedConsumer>
-      <unprocessedConsumer>validate-repository-metadata</unprocessedConsumer>
-      <unprocessedConsumer>index-archive-toc</unprocessedConsumer>
-      <unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer>
-      <unprocessedConsumer>index-public-methods</unprocessedConsumer>
+      <unprocessedConsumer>update-db-artifact</unprocessedConsumer>
     </unprocessedConsumers>
     <processedConsumers>
       <processedConsumer>not-present-remove-db-artifact</processedConsumer>

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=529337&r1=529336&r2=529337
==============================================================================
--- 
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
 Mon Apr 16 10:36:32 2007
@@ -179,10 +179,10 @@
         
         assertNotNull( artifact );
         
-        List results = dao.getArtifactDAO().queryArtifacts( new 
ArtifactsProcessedConstraint( false ) );
+        List unprocessedResultList = adao.queryArtifacts( new 
ArtifactsProcessedConstraint( false ) );
         
-        assertNotNull( results );
-        assertEquals("Incorrect number of unprocessed artifacts detected.", 
results.size(), 8 );
+        assertNotNull( unprocessedResultList );
+        assertEquals("Incorrect number of unprocessed artifacts detected.", 8, 
unprocessedResultList.size() );
         
         DatabaseTask dataTask = new DatabaseTask();
         
@@ -190,12 +190,10 @@
 
         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 );
+        List processedResultList = adao.queryArtifacts( new 
ArtifactsProcessedConstraint( true ) );
         
+        assertNotNull( processedResultList );
+        assertEquals("Incorrect number of processed artifacts detected.", 8, 
processedResultList.size() );      
 
     }