X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fserver%2Fjcr%2FJcrResourceAdapterTest.java;h=b6b1a1b03be5521ceee51aab1b6ee39e8ec9eb8c;hb=490d9907457c43acfa965e7979ce5974bc1ba6ca;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..b6b1a1b03 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 + * + * 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; @@ -9,6 +25,7 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.jcr.JcrResourceAdapter; import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -74,21 +91,12 @@ public class JcrResourceAdapterTest extends AbstractJcrTestCase { protected void setUp() throws Exception { super.setUp(); jra = new JcrResourceAdapter(); - jra.setRepository(getRepository()); - jra.setUsername("demo"); - jra.setPassword("demo"); - jra.afterPropertiesSet(); - } - - @Override - protected void tearDown() throws Exception { - jra.destroy(); - super.tearDown(); + jra.setSession(session()); } protected File getRepositoryFile() throws Exception { Resource res = new ClassPathResource( - "org/argeo/server/jcr/repository-inMemory.xml"); + "org/argeo/server/jcr/repository.xml"); return res.getFile(); }