X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fserver%2Fjcr%2FJcrResourceAdapterTest.java;h=dc6e26c1e827d57d832f3e00b8f1de8bfc374b6d;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=65063e040faa29a0df7e18331a71eb4c13229752;hpb=0e11f046c7af8c6b95aa7372bd912455b40955d5;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
index 65063e040..dc6e26c1e 100644
--- a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
+++ b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
@@ -1,22 +1,34 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 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 javax.jcr.SimpleCredentials;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.jcr.AbstractInternalJackrabbitTestCase;
 import org.argeo.jcr.JcrResourceAdapter;
-import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
-public class JcrResourceAdapterTest extends AbstractJcrTestCase {
+public class JcrResourceAdapterTest extends AbstractInternalJackrabbitTestCase {
 	private static SimpleDateFormat sdf = new SimpleDateFormat(
 			"yyyyMMdd:hhmmss.SSS");
 
@@ -30,7 +42,7 @@ public class JcrResourceAdapterTest extends AbstractJcrTestCase {
 		jra.mkdirs(basePath);
 		Resource res = new ClassPathResource("org/argeo/server/jcr/dummy00.xls");
 		String filePath = basePath + "/dummy.xml";
-		jra.create(filePath, res, "application/vnd.ms-excel");
+		jra.create(filePath, res.getInputStream(), "application/vnd.ms-excel");
 		InputStream in = jra.retrieve(filePath);
 		assertTrue(IOUtils.contentEquals(res.getInputStream(), in));
 	}
@@ -41,13 +53,13 @@ public class JcrResourceAdapterTest extends AbstractJcrTestCase {
 		String filePath = basePath + "/dummy.xml";
 		Resource res00 = new ClassPathResource(
 				"org/argeo/server/jcr/dummy00.xls");
-		jra.create(filePath, res00, "application/vnd.ms-excel");
+		jra.create(filePath, res00.getInputStream(), "application/vnd.ms-excel");
 		Resource res01 = new ClassPathResource(
 				"org/argeo/server/jcr/dummy01.xls");
-		jra.update(filePath, res01);
+		jra.update(filePath, res01.getInputStream());
 		Resource res02 = new ClassPathResource(
 				"org/argeo/server/jcr/dummy02.xls");
-		jra.update(filePath, res02);
+		jra.update(filePath, res02.getInputStream());
 
 		List<Calendar> versions = jra.listVersions(filePath);
 		log.debug("Versions of " + filePath);
@@ -68,23 +80,22 @@ public class JcrResourceAdapterTest extends AbstractJcrTestCase {
 		assertTrue(IOUtils.contentEquals(res02.getInputStream(), in));
 		Resource res03 = new ClassPathResource(
 				"org/argeo/server/jcr/dummy03.xls");
-		jra.update(filePath, res03);
+		jra.update(filePath, res03.getInputStream());
 		in = jra.retrieve(filePath, 1);
 		assertTrue(IOUtils.contentEquals(res01.getInputStream(), in));
 	}
 
 	@Override
 	protected void setUp() throws Exception {
+		log.debug("SET UP");
 		super.setUp();
 		jra = new JcrResourceAdapter();
-		jra.setSession(getRepository().login(
-				new SimpleCredentials("demo", "demo".toCharArray())));
+		jra.setSession(session());
 	}
 
-	protected File getRepositoryFile() throws Exception {
-		Resource res = new ClassPathResource(
-				"org/argeo/server/jcr/repository-inMemory.xml");
-		return res.getFile();
+	@Override
+	protected void tearDown() throws Exception {
+		log.debug("TEAR DOWN");
+		super.tearDown();
 	}
-
 }