X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fserver%2Fjcr%2FJcrResourceAdapterTest.java;fp=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fserver%2Fjcr%2FJcrResourceAdapterTest.java;h=606b065b58ec8595d0154a952d633e14a4846028;hb=ff2edf71a6223a88a10d2f6c51db2797bfb0c4b9;hp=50f40c7313108d9ce2d474f04d29fd88767047be;hpb=92d282b306f1011fe31908b4dfffd99be8538fa2;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 50f40c731..606b065b5 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.jcr.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"; @@ -76,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(); @@ -92,8 +81,8 @@ public class JcrResourceAdapterTest extends TestCase { @Override protected void tearDown() throws Exception { + super.tearDown(); jra.destroy(); - // repository.shutdown(); } }