[Joafip-svn] SF.net SVN: joafip:[3001] trunk/joafip-4test/src/main/java/net/sf/joafip/ performance/items/service

[<luc...@us...>]

Revision: 3001
          http://joafip.svn.sourceforge.net/joafip/?rev=3001&view=rev
Author:   luc_peuvrier
Date:     2012-04-10 03:02:47 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
new tests with babudb library

Modified Paths:
--------------
    trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
    trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java

Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java	2012-04-10 01:24:27 UTC (rev 3000)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java	2012-04-10 03:02:47 UTC (rev 3001)
@@ -42,6 +42,8 @@
 @StorableAccess
 public class AbstractPerfService {
 
+	private static final String FAILED_DELETE = "failed delete ";
+
 	protected final JoafipLogger logger = JoafipLogger.getLogger(getClass());// NOPMD
 
 	protected static final String RUNTIME_DIR = "runtime_perf";
@@ -227,4 +229,39 @@
 		}
 		byItemIndex = 0;
 	}
+	
+	protected static void initializeDirectory(final String rootDir) throws FilePersistenceException {
+		initializeDirectory(new File(rootDir));
+	}
+	
+	protected static void initializeDirectory(final File rootDir) throws FilePersistenceException {
+		if( rootDir.exists()) {
+			if( rootDir.isDirectory()) {
+				deleteDir(rootDir);
+			} else {
+				if( !rootDir.delete() ) {
+					throw new FilePersistenceException(FAILED_DELETE+rootDir);
+				}
+			}
+		}
+		if( !rootDir.mkdirs()) {
+			throw new FilePersistenceException("failed create "+rootDir);
+		}
+	}
+	
+	private static void deleteDir(final File dir) throws FilePersistenceException {
+		final File[] files = dir.listFiles();
+		for(File file:files) {
+			if( file.isDirectory()) {
+				deleteDir(file);
+			} else {
+				if( file.delete() ) {
+					throw new FilePersistenceException(FAILED_DELETE+file);
+				}
+			}
+		}
+		if( !dir.delete() ) {
+			throw new FilePersistenceException(FAILED_DELETE+dir);
+		}
+	}
 }

Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java	2012-04-10 01:24:27 UTC (rev 3000)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java	2012-04-10 03:02:47 UTC (rev 3001)
@@ -39,7 +39,8 @@
 	private static final JoafipLogger LOGGER = JoafipLogger
 			.getLogger(InserterBabuDB.class);
 
-	public InserterBabuDB(final IHeapDataManager dataManager) throws FilePersistenceException,
+	public InserterBabuDB(final IHeapDataManager dataManager)
+			throws FilePersistenceException,
 			FilePersistenceInvalidClassException,
 			FilePersistenceNotSerializableException,
 			FilePersistenceClassNotFoundException,
@@ -49,15 +50,13 @@
 	}
 
 	public static void main(final String[] args) {
-		/* remove existing data */
-		final File dataDirectory = new File(RUNTIME_DIR);
-		for (final File file : dataDirectory.listFiles()) {
-			file.delete();
-		}
-		dataDirectory.mkdirs();
-		InserterBabuDB inserter;
 		try {
-			final BabudbDataManager babudbDataManager=new BabudbDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+			/* remove existing data */
+			initializeDirectory(RUNTIME_DIR);
+			final File dataDirectory = new File(RUNTIME_DIR);
+			InserterBabuDB inserter;
+			final BabudbDataManager babudbDataManager = new BabudbDataManager(
+					(new File(dataDirectory, "banana.data")).getAbsolutePath());
 			inserter = new InserterBabuDB(babudbDataManager);
 			inserter.run(NUMBER_OF_ITEM);
 			inserter.close();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.