From e08088f2e11563c39ad78b4430d87bea577b669c Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 16 Sep 2016 12:07:23 +0000
Subject: [PATCH] Better clean up unit tests

git-svn-id: https://svn.argeo.org/commons/trunk@9180 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../osgi/useradmin/LdifUserAdminTest.java     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
index 06f1e6d2e..4cfb58b77 100644
--- a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
+++ b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
@@ -3,10 +3,14 @@ package org.argeo.osgi.useradmin;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.Dictionary;
@@ -16,8 +20,6 @@ import java.util.UUID;
 
 import javax.transaction.TransactionManager;
 
-import junit.framework.TestCase;
-
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
@@ -26,14 +28,16 @@ import org.osgi.service.useradmin.User;
 import bitronix.tm.BitronixTransactionManager;
 import bitronix.tm.TransactionManagerServices;
 import bitronix.tm.resource.ehcache.EhCacheXAResourceProducer;
+import junit.framework.TestCase;
 
 public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 	private BitronixTransactionManager tm;
 	private URI uri;
 	private AbstractUserDirectory userAdmin;
+	private Path tempDir;
 
-	public void testConcurrent() throws Exception {
-	}
+	// public void testConcurrent() throws Exception {
+	// }
 
 	@SuppressWarnings("unchecked")
 	public void testEdition() throws Exception {
@@ -133,7 +137,8 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 
 	@Override
 	protected void setUp() throws Exception {
-		Path tempDir = Files.createTempDirectory(getClass().getName());
+		tempDir = Files.createTempDirectory(getClass().getName());
+		tempDir.toFile().deleteOnExit();
 		String uriProp = System.getProperty("argeo.userdirectory.uri");
 		if (uriProp != null)
 			uri = new URI(uriProp);
@@ -187,6 +192,21 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 		tm.shutdown();
 		if (userAdmin != null)
 			userAdmin.destroy();
+		if (tempDir != null)
+			Files.walkFileTree(tempDir, new SimpleFileVisitor<Path>() {
+				@Override
+				public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+					Files.delete(file);
+					return FileVisitResult.CONTINUE;
+				}
+
+				@Override
+				public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+					Files.delete(dir);
+					return FileVisitResult.CONTINUE;
+				}
+
+			});
 	}
 
 }
-- 
2.30.2