svn commit: r1358215 - in /archiva/trunk/archiva-modules: archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/

[olamy]

Author: olamy
Date: Fri Jul  6 14:00:00 2012
New Revision: 1358215

URL: http://svn.apache.org/viewvc?rev=1358215&view=rev
Log:
[MRM-1583] tests modifications
Submitted by Adrien Lecharpentier

Modified:
    
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
    
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
    
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java?rev=1358215&r1=1358214&r2=1358215&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
 Fri Jul  6 14:00:00 2012
@@ -54,6 +54,7 @@ public class TestRepositoryStatisticsMan
         repositoryStatistics.setScanEndTime( endTime );
         repositoryStatistics.setNewFileCount( newFiles );
         repositoryStatistics.setTotalFileCount( totalFiles );
+        repositoryStatistics.setRepositoryId( repositoryId );
 
         stats.add( repositoryStatistics );
     }

Modified: 
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java?rev=1358215&r1=1358214&r2=1358215&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
 Fri Jul  6 14:00:00 2012
@@ -73,6 +73,9 @@ public class JcrRepositoryStatisticsGath
         File dir = new File( "target/jcr" );
         FileUtils.deleteDirectory( dir );
 
+        assertTrue( confFile.exists() );
+        assertFalse( dir.exists() );
+
         TransientRepository repository = new TransientRepository( confFile, 
dir );
         session = repository.login( new SimpleCredentials( "username", 
"password".toCharArray() ) );
 
@@ -110,7 +113,10 @@ public class JcrRepositoryStatisticsGath
     public void tearDown()
         throws Exception
     {
-        session.logout();
+        if ( session != null )
+        {
+            session.logout();
+        }
 
         super.tearDown();
     }
@@ -146,6 +152,7 @@ public class JcrRepositoryStatisticsGath
         expectedStatistics.setTotalCountForType( "xml", 3 );
         expectedStatistics.setTotalCountForType( "war", 2 );
         expectedStatistics.setTotalCountForType( "pom", 144 );
+        expectedStatistics.setRepositoryId( TEST_REPO );
 
         verify( metadataRepository ).addMetadataFacet( TEST_REPO, 
expectedStatistics );
     }

Modified: 
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java?rev=1358215&r1=1358214&r2=1358215&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
 Fri Jul  6 14:00:00 2012
@@ -502,6 +502,7 @@ public class RepositoryStatisticsManager
     private RepositoryStatistics createTestStats( Date startTime, Date endTime 
)
     {
         RepositoryStatistics stats = new RepositoryStatistics();
+        stats.setRepositoryId( TEST_REPO_ID );
         stats.setScanStartTime( startTime );
         stats.setScanEndTime( endTime );
         stats.setTotalArtifactFileSize( 20 * 12345L );