You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/12/04 05:07:13 UTC
svn commit: r887051 - in
/archiva/trunk/archiva-modules/archiva-scheduled/src:
main/java/org/apache/maven/archiva/scheduled/executors/
test/java/org/apache/maven/archiva/scheduled/executors/
Author: brett
Date: Fri Dec 4 04:07:12 2009
New Revision: 887051
URL: http://svn.apache.org/viewvc?rev=887051&view=rev
Log:
exclude .svn directories in the test:wq
Modified:
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java?rev=887051&r1=887050&r2=887051&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java Fri Dec 4 04:07:12 2009
@@ -187,7 +187,7 @@
log.error( "Error occurred while querying artifacts for artifact count : " + ae.getMessage() );
}
- // total repo size
+ // total repo size -- TODO: needs to exclude ignored files (eg .svn)
long size = FileUtils.sizeOfDirectory( new File( arepo.getLocation() ) );
dbstats.setTotalSize( size );
Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=887051&r1=887050&r2=887051&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java Fri Dec 4 04:07:12 2009
@@ -154,6 +154,10 @@
{
f.setLastModified( cal.getTimeInMillis() );
}
+ for ( String dir : (List<String>) FileUtils.getDirectoryNames( repoDir, "**/.svn", null, false ) )
+ {
+ FileUtils.deleteDirectory( new File( repoDir, dir ) );
+ }
assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() );
@@ -226,7 +230,7 @@
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
// assertEquals( 5, newStats.getTotalProjectCount() );
- assertEquals( 38545, newStats.getTotalSize() );
+ assertEquals( 14159, newStats.getTotalSize() );
File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
@@ -260,7 +264,7 @@
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
// assertEquals( 5, newStats.getTotalProjectCount() );
- assertEquals( 43687, updatedStats.getTotalSize() );
+ assertEquals( 19301, updatedStats.getTotalSize() );
}
public void testExecutorScanOnlyNewArtifactsChangeTimes()
@@ -308,7 +312,7 @@
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
// assertEquals( 5, newStats.getTotalProjectCount() );
- assertEquals( 43687, newStats.getTotalSize() );
+ assertEquals( 19301, newStats.getTotalSize() );
}
public void testExecutorScanOnlyNewArtifactsMidScan()
@@ -356,7 +360,7 @@
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
// assertEquals( 5, newStats.getTotalProjectCount() );
- assertEquals( 43687, newStats.getTotalSize() );
+ assertEquals( 19301, newStats.getTotalSize() );
}
private void createAndSaveTestStats()
@@ -369,7 +373,7 @@
stats.setTotalFileCount( 31 );
stats.setTotalGroupCount( 3 );
stats.setTotalProjectCount( 5 );
- stats.setTotalSize( 38545 );
+ stats.setTotalSize( 14159 );
stats.setWhenGathered( Calendar.getInstance().getTime() );
dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );