X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fserver%2Fjcr%2FJcrResourceAdapterTest.java;h=32bfa9fc277ac9f555d557c263ecf49ee8ad1977;hb=149023e5969377045847bbecf24b0898b18a67a9;hp=1588fd7e019ce3e621ce7df8558e8b4d35627176;hpb=a668345e948f3f6da7475279bbe330e129fb1841;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 1588fd7e0..32bfa9fc2 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,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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;
@@ -6,10 +22,14 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
 
+import javax.jcr.Repository;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
+import org.apache.jackrabbit.core.TransientRepository;
+import org.argeo.jcr.JcrResourceAdapter;
+import org.argeo.jcr.unit.AbstractJcrTestCase;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
@@ -27,7 +47,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));
 	}
@@ -38,13 +58,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);
@@ -65,31 +85,35 @@ 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.setRepository(getRepository());
-		jra.setUsername("demo");
-		jra.setPassword("demo");
-		jra.afterPropertiesSet();
+		jra.setSession(session());
 	}
 
 	@Override
 	protected void tearDown() throws Exception {
-		jra.destroy();
+		log.debug("TEAR DOWN");
 		super.tearDown();
 	}
 
 	protected File getRepositoryFile() throws Exception {
 		Resource res = new ClassPathResource(
-				"org/argeo/server/jcr/repository-inMemory.xml");
+				"org/argeo/server/jcr/repository-h2.xml");
 		return res.getFile();
 	}
 
+	protected Repository createRepository() throws Exception {
+		Repository repository = new TransientRepository(getRepositoryFile(),
+				getHomeDir());
+		return repository;
+	}
+
 }