X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fserver%2Fjcr%2FJcrResourceAdapterTest.java;h=f7e22b964cd3e65a58d82777311606b707518ebc;hb=460170049599090170c48ae447c6c68f1fcb2f63;hp=9c72a1e158f7ad024d30196b12a3ed0f8632bd60;hpb=5f097724cb2f64045c3e636db5804a5909db096f;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java b/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
index 9c72a1e15..f7e22b964 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
@@ -1,22 +1,18 @@
 package org.argeo.server.jcr;
 
-import java.io.File;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
 
-import junit.framework.TestCase;
-
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jackrabbit.core.TransientRepository;
+import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
-public class JcrResourceAdapterTest extends TestCase {
+public class JcrResourceAdapterTest extends AbstractJcrTestCase {
 	private static SimpleDateFormat sdf = new SimpleDateFormat(
 			"yyyyMMdd:hhmmss.SSS");
 
@@ -24,7 +20,6 @@ public class JcrResourceAdapterTest extends TestCase {
 			.getLog(JcrResourceAdapterTest.class);
 
 	private JcrResourceAdapter jra;
-	private TransientRepository repository;
 
 	public void testCreate() throws Exception {
 		String basePath = "/test/subdir";
@@ -51,8 +46,14 @@ public class JcrResourceAdapterTest extends TestCase {
 		jra.update(filePath, res02);
 
 		List<Calendar> versions = jra.listVersions(filePath);
-		for (Calendar version : versions)
-			log.debug(sdf.format(version.getTime()));
+		log.debug("Versions of " + filePath);
+		int count = 0;
+		for (Calendar version : versions) {
+			log.debug(" " + (count == 0 ? "base" : count - 1) + "\t"
+					+ sdf.format(version.getTime()));
+			count++;
+		}
+
 		assertEquals(4, versions.size());
 
 		InputStream in = jra.retrieve(filePath, 1);
@@ -70,15 +71,9 @@ public class JcrResourceAdapterTest extends TestCase {
 
 	@Override
 	protected void setUp() throws Exception {
-		File homeDir = new File(System.getProperty("java.io.tmpdir"),
-				JcrResourceAdapterTest.class.getSimpleName());
-		FileUtils.deleteDirectory(homeDir);
-		Resource res = new ClassPathResource(
-				"org/argeo/server/jcr/repository.xml");
-		repository = new TransientRepository(res.getFile(), homeDir);
-
+		super.setUp();
 		jra = new JcrResourceAdapter();
-		jra.setRepository(repository);
+		jra.setRepository(getRepository());
 		jra.setUsername("demo");
 		jra.setPassword("demo");
 		jra.afterPropertiesSet();
@@ -87,7 +82,7 @@ public class JcrResourceAdapterTest extends TestCase {
 	@Override
 	protected void tearDown() throws Exception {
 		jra.destroy();
-		// repository.shutdown();
+		super.tearDown();
 	}
 
 }