Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C663CC067 for ; Mon, 11 Jun 2012 21:43:59 +0000 (UTC) Received: (qmail 4689 invoked by uid 500); 11 Jun 2012 21:43:59 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 4591 invoked by uid 500); 11 Jun 2012 21:43:59 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 4515 invoked by uid 99); 11 Jun 2012 21:43:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 21:43:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 21:43:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D34EB23889FA; Mon, 11 Jun 2012 21:43:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1349031 [2/3] - in /jackrabbit/commons/ocm/trunk: ./ src/test/config/jackrabbit/ src/test/config/jeceira/ src/test/java/org/apache/jackrabbit/ocm/ src/test/java/org/apache/jackrabbit/ocm/manager/atomic/ src/test/java/org/apache/jackrabbit/... Date: Mon, 11 Jun 2012 21:43:30 -0000 To: commits@jackrabbit.apache.org From: ard@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120611214334.D34EB23889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java Mon Jun 11 21:43:27 2012 @@ -23,31 +23,18 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.ArrayListElement; import org.apache.jackrabbit.ocm.testmodel.collection.CustomList; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.Main; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author Christophe Lombart */ -public class AnnotationArrayListTest extends AnnotationTestBase +public class AnnotationArrayListTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationArrayListTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationArrayListTest(String testName) throws Exception - { - super(testName); - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -61,7 +48,6 @@ public class AnnotationArrayListTest ext { ObjectContentManager ocm = getObjectContentManager(); - // -------------------------------------------------------------------------------- // Create and store an object graph in the repository // with a null value for the arraylist Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -22,30 +22,18 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.C; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test DefaultCollectionConverterImpl * * @author Christophe Lombart */ -public class AnnotationDefaultCollectionConverterImplTest extends AnnotationTestBase +public class AnnotationDefaultCollectionConverterImplTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationDefaultCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationDefaultCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java Mon Jun 11 21:43:27 2012 @@ -22,32 +22,19 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.HashMapElement; import org.apache.jackrabbit.ocm.testmodel.collection.Main; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl * * @author Christophe Lombart */ -public class AnnotationHashMapTest extends AnnotationTestBase +public class AnnotationHashMapTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationHashMapTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationHashMapTest(String testName) throws Exception - { - super(testName); - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -21,30 +21,17 @@ import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl * * @author Christophe Lombart */ -public class AnnotationMultiValueCollectionConverterImplTest extends AnnotationTestBase +public class AnnotationMultiValueCollectionConverterImplTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationMultiValueCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationMultiValueCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -22,7 +22,7 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValueWithObjectCollection; @@ -32,16 +32,8 @@ import org.apache.jackrabbit.ocm.testmod * @author : Boni Gopalan */ public class AnnotationMultiValueWithObjectCollectionConverterImplTest extends - AnnotationTestBase { + AnnotationRepositoryTestBase { - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationMultiValueWithObjectCollectionConverterImplTest( - String testName) throws Exception { - super(testName); - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -23,30 +23,18 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Page; import org.apache.jackrabbit.ocm.testmodel.Paragraph; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl * * @author Christophe Lombart */ -public class AnnotationNTCollectionConverterImplTest extends AnnotationTestBase +public class AnnotationNTCollectionConverterImplTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationNTCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationNTCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java Mon Jun 11 21:43:27 2012 @@ -22,28 +22,15 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Person; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author Boni Gopalan */ -public class AnnotationPersonListTest extends AnnotationTestBase +public class AnnotationPersonListTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationPersonListTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationPersonListTest(String testName) throws Exception - { - super(testName); - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -21,12 +21,10 @@ import java.util.HashMap; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Paragraph; import org.apache.jackrabbit.ocm.testmodel.Residual; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test ResidualNodesCollectionConverterImpl @@ -34,19 +32,8 @@ import org.slf4j.LoggerFactory; * @author Felix Meschberger * */ -public class AnnotationResidualNodesCollectionConverterImplTest extends AnnotationTestBase +public class AnnotationResidualNodesCollectionConverterImplTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationResidualNodesCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationResidualNodesCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -23,11 +23,9 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Residual; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test ResidualPropertiesCollectionConverterImpl @@ -35,18 +33,8 @@ import org.slf4j.LoggerFactory; * @author Felix Meschberger * */ -public class AnnotationResidualPropertiesCollectionConverterImplTest extends AnnotationTestBase +public class AnnotationResidualPropertiesCollectionConverterImplTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationResidualPropertiesCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationResidualPropertiesCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -20,12 +20,10 @@ import javax.jcr.RepositoryException; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Main; import org.apache.jackrabbit.ocm.testmodel.uuid.A; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** @@ -40,17 +38,8 @@ import org.slf4j.LoggerFactory; * @author Vincent Giguère * */ -public class BeanReferenceMapConverterImplTest extends AnnotationTestBase { - private final static Logger log = LoggerFactory.getLogger(BeanReferenceMapConverterImplTest.class); +public class BeanReferenceMapConverterImplTest extends AnnotationRepositoryTestBase { - /** - *

Defines the test case name for junit.

- * - * @param testName The test case name. - */ - public BeanReferenceMapConverterImplTest(String testName) throws Exception { - super(testName); - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -61,9 +50,9 @@ public class BeanReferenceMapConverterIm public void test_map_of_referenced_nodes_is_persisted_and_reloaded_properly() throws RepositoryException { ObjectContentManager ocm = getObjectContentManager(); - this.getSession().getRootNode().addNode("test"); - this.getSession().getRootNode().addNode("references"); - this.getSession().save(); + ocm.getSession().getRootNode().addNode("test"); + ocm.getSession().getRootNode().addNode("references"); + ocm.getSession().save(); A firstA = new A(); A secondA = new A(); @@ -119,9 +108,9 @@ public class BeanReferenceMapConverterIm public void test_map_can_persist_and_restore_same_node_reference_under_multiple_keys() throws RepositoryException { ObjectContentManager ocm = getObjectContentManager(); - this.getSession().getRootNode().addNode("test"); - this.getSession().getRootNode().addNode("references"); - this.getSession().save(); + ocm.getSession().getRootNode().addNode("test"); + ocm.getSession().getRootNode().addNode("references"); + ocm.getSession().save(); A firstA = new A(); @@ -170,9 +159,9 @@ public class BeanReferenceMapConverterIm ObjectContentManager ocm = getObjectContentManager(); - this.getSession().getRootNode().addNode("test"); - this.getSession().getRootNode().addNode("references"); - this.getSession().save(); + ocm.getSession().getRootNode().addNode("test"); + ocm.getSession().getRootNode().addNode("references"); + ocm.getSession().save(); A firstA = new A(); A secondA = new A(); @@ -247,9 +236,9 @@ public class BeanReferenceMapConverterIm ObjectContentManager ocm = getObjectContentManager(); - this.getSession().getRootNode().addNode("test"); - this.getSession().getRootNode().addNode("references"); - this.getSession().save(); + ocm.getSession().getRootNode().addNode("test"); + ocm.getSession().getRootNode().addNode("references"); + ocm.getSession().save(); A firstA = new A(); A secondA = new A(); @@ -315,9 +304,9 @@ public class BeanReferenceMapConverterIm ObjectContentManager ocm = getObjectContentManager(); - this.getSession().getRootNode().addNode("test"); - this.getSession().getRootNode().addNode("references"); - this.getSession().save(); + ocm.getSession().getRootNode().addNode("test"); + ocm.getSession().getRootNode().addNode("references"); + ocm.getSession().save(); A firstA = new A(); A secondA = new A(); @@ -375,11 +364,11 @@ public class BeanReferenceMapConverterIm public void test_converter_can_add_and_remove_nodes_simultaneously_when_updating() throws RepositoryException { - ObjectContentManager ocm = getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); - this.getSession().getRootNode().addNode("test"); - this.getSession().getRootNode().addNode("references"); - this.getSession().save(); + ocm.getSession().getRootNode().addNode("test"); + ocm.getSession().getRootNode().addNode("references"); + ocm.getSession().save(); A firstA = new A(); A secondA = new A(); Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java Mon Jun 11 21:43:27 2012 @@ -23,30 +23,17 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.ArrayListElement; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.Main; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author Christophe Lombart */ -public class DigesterArrayListTest extends DigesterTestBase +public class DigesterArrayListTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterArrayListTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterArrayListTest(String testName) throws Exception - { - super(testName); - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -22,30 +22,18 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.C; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test DefaultCollectionConverterImpl * * @author Christophe Lombart */ -public class DigesterDefaultCollectionConverterImplTest extends DigesterTestBase +public class DigesterDefaultCollectionConverterImplTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterDefaultCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterDefaultCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java Mon Jun 11 21:43:27 2012 @@ -21,31 +21,19 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.HashMapElement; import org.apache.jackrabbit.ocm.testmodel.collection.Main; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl * * @author Christophe Lombart */ -public class DigesterHashMapTest extends DigesterTestBase +public class DigesterHashMapTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterHashMapTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterHashMapTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -21,29 +21,17 @@ import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl * * @author Christophe Lombart */ -public class DigesterMultiValueCollectionConverterImplTest extends DigesterTestBase +public class DigesterMultiValueCollectionConverterImplTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterMultiValueCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterMultiValueCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -22,29 +22,17 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValueWithObjectCollection; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl * * @author : Boni Gopalan */ -public class DigesterMultiValueWithObjectCollectionConverterImplTest extends DigesterTestBase +public class DigesterMultiValueWithObjectCollectionConverterImplTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterMultiValueWithObjectCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterMultiValueWithObjectCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -23,30 +23,18 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Page; import org.apache.jackrabbit.ocm.testmodel.Paragraph; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl * * @author Christophe Lombart */ -public class DigesterNTCollectionConverterImplTest extends DigesterTestBase +public class DigesterNTCollectionConverterImplTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterNTCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterNTCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java Mon Jun 11 21:43:27 2012 @@ -22,27 +22,15 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Person; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author Boni Gopalan */ -public class DigesterPersonListTest extends DigesterTestBase +public class DigesterPersonListTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterPersonListTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterPersonListTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -21,12 +21,10 @@ import java.util.HashMap; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Paragraph; import org.apache.jackrabbit.ocm.testmodel.Residual; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test ResidualNodesCollectionConverterImpl @@ -34,18 +32,8 @@ import org.slf4j.LoggerFactory; * @author Felix Meschberger * */ -public class DigesterResidualNodesCollectionConverterImplTest extends DigesterTestBase +public class DigesterResidualNodesCollectionConverterImplTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterResidualNodesCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterResidualNodesCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java Mon Jun 11 21:43:27 2012 @@ -23,11 +23,9 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Residual; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test ResidualPropertiesCollectionConverterImpl @@ -35,18 +33,8 @@ import org.slf4j.LoggerFactory; * @author Felix Meschberger * */ -public class DigesterResidualPropertiesCollectionConverterImplTest extends DigesterTestBase +public class DigesterResidualPropertiesCollectionConverterImplTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterResidualPropertiesCollectionConverterImplTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterResidualPropertiesCollectionConverterImplTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java Mon Jun 11 21:43:27 2012 @@ -19,23 +19,15 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; /** * Test Simple Enumeration mappings * * @author Boni Gopalan */ -public class AnnotationSimpleEnumerationTest extends AnnotationTestBase +public class AnnotationSimpleEnumerationTest extends AnnotationRepositoryTestBase { - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationSimpleEnumerationTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java Mon Jun 11 21:43:27 2012 @@ -19,27 +19,15 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; /** * Test Persisting and retrieving Enum values. * * @author Boni Gopalan */ -public class DigesterSimpleEnumerationTest extends DigesterTestBase +public class DigesterSimpleEnumerationTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterSimpleEnumerationTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterSimpleEnumerationTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -44,18 +44,9 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class AnnotationInheritanceConcreteClassTest extends AnnotationTestBase { +public class AnnotationInheritanceConcreteClassTest extends AnnotationRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(AnnotationInheritanceConcreteClassTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationInheritanceConcreteClassTest(String testName) throws Exception { - super(testName); - - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. return new TestSuite(AnnotationInheritanceConcreteClassTest.class); Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -31,25 +31,13 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test inheritance with node type per hierarchy stategy (with discreminator field) * * @author Christophe Lombart */ -public class AnnotationInheritanceHierarchyTest extends AnnotationTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationInheritanceHierarchyTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationInheritanceHierarchyTest(String testName) throws Exception { - super(testName); - - } +public class AnnotationInheritanceHierarchyTest extends AnnotationRepositoryTestBase { public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -60,7 +48,7 @@ public class AnnotationInheritanceHierar public void testRetrieveSingleton() { try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); //--------------------------------------------------------------------------------------------------------- // Insert a descendant object @@ -116,7 +104,7 @@ public class AnnotationInheritanceHierar public void testRetrieveCollection() { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); //--------------------------------------------------------------------------------------------------------- // Insert descendant objects Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -44,17 +44,9 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class DigesterInheritanceConcreteClassTest extends DigesterTestBase { +public class DigesterInheritanceConcreteClassTest extends DigesterRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(DigesterInheritanceConcreteClassTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterInheritanceConcreteClassTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -31,25 +31,13 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test inheritance with node type per hierarchy stategy (with discreminator field) * * @author Christophe Lombart */ -public class DigesterInheritanceHierarchyTest extends DigesterTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterInheritanceHierarchyTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterInheritanceHierarchyTest(String testName) throws Exception { - super(testName); - - } +public class DigesterInheritanceHierarchyTest extends DigesterRepositoryTestBase { public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -42,18 +42,10 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class AnnotationConcreteClassTest extends AnnotationTestBase +public class AnnotationConcreteClassTest extends AnnotationRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(AnnotationConcreteClassTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationConcreteClassTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -32,25 +32,13 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; import org.apache.jackrabbit.ocm.testmodel.interfaces.AnotherInterface; import org.apache.jackrabbit.ocm.testmodel.interfaces.Interface; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test interface (with discreminator field) * * @author Christophe Lombart */ -public class AnnotationInterfaceHierarchyTest extends AnnotationTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationInterfaceHierarchyTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationInterfaceHierarchyTest(String testName) throws Exception { - super(testName); - - } +public class AnnotationInterfaceHierarchyTest extends AnnotationRepositoryTestBase { public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -42,18 +42,9 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class DigesterConcreteClassTest extends DigesterTestBase { +public class DigesterConcreteClassTest extends DigesterRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(DigesterConcreteClassTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterConcreteClassTest(String testName) throws Exception { - super(testName); - - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. return new TestSuite(DigesterConcreteClassTest.class); Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java Mon Jun 11 21:43:27 2012 @@ -21,7 +21,7 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -32,25 +32,14 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; import org.apache.jackrabbit.ocm.testmodel.interfaces.AnotherInterface; import org.apache.jackrabbit.ocm.testmodel.interfaces.Interface; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test interface (with discreminator field) * * @author Christophe Lombart */ -public class DigesterInterfaceHierarchyTest extends DigesterTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterInterfaceHierarchyTest.class); +public class DigesterInterfaceHierarchyTest extends DigesterRepositoryTestBase { - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterInterfaceHierarchyTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java Mon Jun 11 21:43:27 2012 @@ -22,27 +22,15 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.interfaces.EntityA; import org.apache.jackrabbit.ocm.testmodel.interfaces.EntityB; import org.apache.jackrabbit.ocm.testmodel.interfaces.MyInterface; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -public class ListOfInterfaceTest extends AnnotationTestBase +public class ListOfInterfaceTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(ListOfInterfaceTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public ListOfInterfaceTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -54,7 +42,7 @@ public class ListOfInterfaceTest extends public void testListOfInterface() { try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); EntityA a = new EntityA(); a.setPath("/test"); Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java Mon Jun 11 21:43:27 2012 @@ -22,7 +22,7 @@ import java.util.Calendar; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.File; import org.apache.jackrabbit.ocm.testmodel.Folder; @@ -35,18 +35,9 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class AnnotationJcrNodeTypeTest extends AnnotationTestBase { +public class AnnotationJcrNodeTypeTest extends AnnotationRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(AnnotationJcrNodeTypeTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationJcrNodeTypeTest(String testName) throws Exception { - super(testName); - - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. return new TestSuite(AnnotationJcrNodeTypeTest.class); @@ -57,7 +48,7 @@ public class AnnotationJcrNodeTypeTest e try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); //--------------------------------------------------------------------------------------------------------- // Insert a folder (class mapped to jcr:folder) with one file (class mapped to jcr:file) Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java Mon Jun 11 21:43:27 2012 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.OcmTestProperty; import org.slf4j.Logger; @@ -30,19 +30,10 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class AnnotationJcrPropertyTest extends AnnotationTestBase +public class AnnotationJcrPropertyTest extends AnnotationRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(AnnotationJcrPropertyTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationJcrPropertyTest(String testName) throws Exception { - super(testName); - - } - public static Test suite() { // All methods starting with "test" will be executed in the test suite. return new TestSuite(AnnotationJcrPropertyTest.class); @@ -53,7 +44,7 @@ public class AnnotationJcrPropertyTest e try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); //--------------------------------------------------------------------------------------------------------- // Insert without the mandatory field //--------------------------------------------------------------------------------------------------------- Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java Mon Jun 11 21:43:27 2012 @@ -22,7 +22,7 @@ import java.util.Calendar; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.File; import org.apache.jackrabbit.ocm.testmodel.Folder; @@ -35,17 +35,9 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class DigesterJcrNodeTypeTest extends DigesterTestBase { +public class DigesterJcrNodeTypeTest extends DigesterRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(DigesterJcrNodeTypeTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterJcrNodeTypeTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -58,7 +50,7 @@ public class DigesterJcrNodeTypeTest ext try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); //--------------------------------------------------------------------------------------------------------- // Insert a folder (class mapped to jcr:folder) with one file (class mapped to jcr:file) Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java Mon Jun 11 21:43:27 2012 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.OcmTestProperty; import org.slf4j.Logger; @@ -30,17 +30,9 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class DigesterJcrPropertyTest extends DigesterTestBase { +public class DigesterJcrPropertyTest extends DigesterRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(DigesterJcrPropertyTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterJcrPropertyTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -52,7 +44,7 @@ public class DigesterJcrPropertyTest ext try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); //--------------------------------------------------------------------------------------------------------- // Insert without the mandatory field //--------------------------------------------------------------------------------------------------------- Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java Mon Jun 11 21:43:27 2012 @@ -22,33 +22,21 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.lock.Lock; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.B; import org.apache.jackrabbit.ocm.testmodel.C; import org.apache.jackrabbit.ocm.testmodel.Lockable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test object content Manager lock feature * * @author Christophe Lombart */ -public class AnnotationLockTest extends AnnotationTestBase +public class AnnotationLockTest extends AnnotationRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationLockTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationLockTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { @@ -115,7 +103,7 @@ public class AnnotationLockTest extends // -------------------------------------------------------------------------------- Lock lock = ocm.lock("/test", true, false); - assertTrue("the Lock owner is not correct", lock.getLockOwner().equals("superuser")); + assertTrue("the Lock owner is not correct", lock.getLockOwner().equals(ocm.getSession().getUserID())); // -------------------------------------------------------------------------------- // Check if the object is locked Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java Mon Jun 11 21:43:27 2012 @@ -22,33 +22,21 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.lock.Lock; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.B; import org.apache.jackrabbit.ocm.testmodel.C; import org.apache.jackrabbit.ocm.testmodel.Lockable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test object content Manager lock feature * * @author Christophe Lombart */ -public class DigesterLockTest extends DigesterTestBase +public class DigesterLockTest extends DigesterRepositoryTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterLockTest.class); - - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterLockTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { @@ -115,7 +103,7 @@ public class DigesterLockTest extends Di // -------------------------------------------------------------------------------- Lock lock = ocm.lock("/test", true, false); - assertTrue("the Lock owner is not correct", lock.getLockOwner().equals("superuser")); + assertTrue("the Lock owner is not correct", lock.getLockOwner().equals(ocm.getSession().getUserID())); // -------------------------------------------------------------------------------- // Check if the object is locked Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java Mon Jun 11 21:43:27 2012 @@ -22,31 +22,20 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.proxy.Detail; import org.apache.jackrabbit.ocm.testmodel.proxy.Main; import org.apache.jackrabbit.ocm.testmodel.proxy.NTDetail; import org.apache.jackrabbit.ocm.testmodel.proxy.NTMain; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test inheritance with node type per concrete class (without discreminator field) * * @author Christophe Lombart */ -public class AnnotationProxyTest extends AnnotationTestBase { - private final static Logger log = LoggerFactory.getLogger(AnnotationProxyTest.class); +public class AnnotationProxyTest extends AnnotationRepositoryTestBase { - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationProxyTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -57,7 +46,7 @@ public class AnnotationProxyTest extends public void testBeanProxy() { try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); Detail detail = new Detail(); detail.setField("FieldValue"); @@ -136,7 +125,7 @@ public class AnnotationProxyTest extends public void testDefaultCollectionConverterWithProxy() { try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); ArrayList details= new ArrayList(); for(int i=1; i<=100;i++) @@ -201,7 +190,7 @@ public class AnnotationProxyTest extends try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); NTMain main = new NTMain(); main.setPath("/test"); Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java Mon Jun 11 21:43:27 2012 @@ -22,31 +22,20 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.proxy.Detail; import org.apache.jackrabbit.ocm.testmodel.proxy.Main; import org.apache.jackrabbit.ocm.testmodel.proxy.NTDetail; import org.apache.jackrabbit.ocm.testmodel.proxy.NTMain; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test inheritance with node type per concrete class (without discreminator field) * * @author Christophe Lombart */ -public class DigesterProxyTest extends DigesterTestBase { - private final static Logger log = LoggerFactory.getLogger(DigesterProxyTest.class); +public class DigesterProxyTest extends DigesterRepositoryTestBase { - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public DigesterProxyTest(String testName) throws Exception { - super(testName); - - } public static Test suite() { // All methods starting with "test" will be executed in the test suite. @@ -56,7 +45,7 @@ public class DigesterProxyTest extends D public void testBeanProxy() { try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); Detail detail = new Detail(); detail.setField("FieldValue"); @@ -135,7 +124,7 @@ public class DigesterProxyTest extends D public void testDefaultCollectionConverterWithProxy() { try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); ArrayList details= new ArrayList(); for(int i=1; i<=100;i++) @@ -200,7 +189,7 @@ public class DigesterProxyTest extends D try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); NTMain main = new NTMain(); main.setPath("/test"); Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java Mon Jun 11 21:43:27 2012 @@ -25,7 +25,7 @@ import java.util.Date; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -39,20 +39,11 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class AnnotationAtomicQueryTest extends AnnotationTestBase +public class AnnotationAtomicQueryTest extends AnnotationRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(AnnotationAtomicQueryTest.class); private Date date = new Date(); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationAtomicQueryTest(String testName) throws Exception - { - super(testName); - - } public static Test suite() { @@ -72,10 +63,10 @@ public class AnnotationAtomicQueryTest e try { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); // Test Boolean value - QueryManager queryManager = this.getQueryManager(); + QueryManager queryManager = ocm.getQueryManager(); Filter filter = queryManager.createFilter(Atomic.class); filter.addEqualTo("booleanObject", new Boolean(true)); Query query = queryManager.createQuery(filter); @@ -187,10 +178,10 @@ public class AnnotationAtomicQueryTest e public void testQueryAtomicFieldsWithConverter() { - ObjectContentManager ocm = this.getObjectContentManager(); + ObjectContentManager ocm = getObjectContentManager(); // Test Boolean value - QueryManager queryManager = this.getQueryManager(); + QueryManager queryManager = ocm.getQueryManager(); Filter filter = queryManager.createFilter(Atomic.class); filter.addEqualTo("int2boolean", new Boolean(true)); Query query = queryManager.createQuery(filter); Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java Mon Jun 11 21:43:27 2012 @@ -25,10 +25,9 @@ import javax.jcr.Session; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.AnnotationTestBase; +import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; -import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; import org.apache.jackrabbit.ocm.manager.impl.ObjectIterator; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; @@ -44,18 +43,10 @@ import org.slf4j.LoggerFactory; * * @author Christophe Lombart */ -public class AnnotationIteratorQueryTest extends AnnotationTestBase +public class AnnotationIteratorQueryTest extends AnnotationRepositoryTestBase { private final static Logger log = LoggerFactory.getLogger(AnnotationIteratorQueryTest.class); - /** - *

Defines the test case name for junit.

- * @param testName The test case name. - */ - public AnnotationIteratorQueryTest(String testName) throws Exception - { - super(testName); - } public static Test suite() { @@ -84,7 +75,7 @@ public class AnnotationIteratorQueryTest { // No scope - QueryManager queryManager = this.getQueryManager(); + QueryManager queryManager = getObjectContentManager().getQueryManager(); Filter filter = queryManager.createFilter(Page.class); Query query = queryManager.createQuery(filter); // we need this to be sure about objects order in the iterator test @@ -133,10 +124,8 @@ public class AnnotationIteratorQueryTest { ocm.remove("/test"); } - - ObjectContentManagerImpl ocmImpl = (ObjectContentManagerImpl) ocm; - - Session session = ocmImpl.getSession(); + + Session session = ocm.getSession(); Node root = session.getRootNode(); root.addNode("test"); root.addNode("test/node1");