revert previous changes for this test as it fail on jenkins but not locally... It...

Signed-off-by: olivier lamy <olamy@apache.org>

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
index 4a537234de967e12ca4e7d103d846d0530b7e25c..6631339bb9c74bf5da29ba422757f870ed988ae6 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
@@ -45,12 +45,12 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
     public void testExecutorScanOnlyNewArtifacts()
         throws Exception
     {
-        createAndSaveTestStats();
 
         RepositoryTask repoTask = new RepositoryTask();
 
         repoTask.setRepositoryId( TEST_REPO_ID );
         repoTask.setScanAll( false );
+        createAndSaveTestStats();
         taskExecutor.executeTask( repoTask );
 
         // check no artifacts processed
@@ -64,7 +64,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
         RepositoryStatistics newStats =
             repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
         assertEquals( 0, newStats.getNewFileCount() );
-        assertEquals( 41, newStats.getTotalFileCount() );
+        assertEquals( 31, newStats.getTotalFileCount() );
         // FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
@@ -97,7 +97,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
         RepositoryStatistics updatedStats =
             repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
         assertEquals( 2, updatedStats.getNewFileCount() );
-        assertEquals( 43, updatedStats.getTotalFileCount() );
+        assertEquals( 33, updatedStats.getTotalFileCount() );
         // FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
@@ -144,7 +144,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
         RepositoryStatistics newStats =
             repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
         assertEquals( 2, newStats.getNewFileCount() );
-        assertEquals( 43, newStats.getTotalFileCount() );
+        assertEquals( 33, newStats.getTotalFileCount() );
         // FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
@@ -191,7 +191,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
         RepositoryStatistics newStats =
             repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
         assertEquals( 2, newStats.getNewFileCount() );
-        assertEquals( 43, newStats.getTotalFileCount() );
+        assertEquals( 33, newStats.getTotalFileCount() );
         // FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
@@ -225,9 +225,18 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
         throws MetadataRepositoryException
     {
         Date date = Calendar.getInstance().getTime();
+        RepositoryStatistics stats = new RepositoryStatistics();
+        stats.setScanStartTime( new Date( date.getTime() - 1234567 ) );
+        stats.setScanEndTime( date );
+        stats.setNewFileCount( 31 );
+        stats.setTotalArtifactCount( 8 );
+        stats.setTotalFileCount( 31 );
+        stats.setTotalGroupCount( 3 );
+        stats.setTotalProjectCount( 5 );
+        stats.setTotalArtifactFileSize( 38545 );
 
         repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, //
-                                                            new Date( date.getTime() - 1234567 ), date, //
-                                                            41, 41 );
+                                                            new Date( date.getTime() - 1234567 ), //
+                                                            date, 31, 31 );
     }
 }