You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by cl...@apache.org on 2006/05/17 21:49:44 UTC
svn commit: r407383 [2/2] - in /incubator/graffito/trunk/jcr/jcr-mapping/src:
java/org/apache/portals/graffito/jcr/persistence/
java/org/apache/portals/graffito/jcr/persistence/collectionconverter/impl/
java/org/apache/portals/graffito/jcr/persistence/...
Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceConcreteClassTest.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceConcreteClassTest.java?rev=407383&r1=407382&r2=407383&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceConcreteClassTest.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceConcreteClassTest.java Wed May 17 14:49:42 2006
@@ -94,7 +94,7 @@
//---------------------------------------------------------------------------------------------------------
// Retrieve
//---------------------------------------------------------------------------------------------------------
- document = (Document) persistenceManager.getObject(Document.class, "/document1");
+ document = (Document) persistenceManager.getObject( "/document1");
assertTrue("Invalid implementation for Document", document instanceof DocumentImpl);
assertEquals("Document path is invalid", document.getPath(), "/document1");
assertEquals("Content type is invalid", document.getContentType(), "plain/text");
@@ -111,7 +111,7 @@
// ---------------------------------------------------------------------------------------------------------
// Retrieve the updated descendant object
//---------------------------------------------------------------------------------------------------------
- document = (Document) persistenceManager.getObject(Document.class, "/document1");
+ document = (Document) persistenceManager.getObject( "/document1");
assertTrue("Invalid implementation for Document", document instanceof DocumentImpl);
assertEquals("document name is incorrect", document.getName(), "anotherName");
assertEquals("Document path is invalid", document.getPath(), "/document1");
@@ -119,7 +119,7 @@
assertNotNull("document stream is null", document.getDocumentStream());
assertTrue("Invalid document stream", document.getDocumentStream().getEncoding().equals("utf-8"));
- CmsObject cmsObject = (CmsObject) persistenceManager.getObject(CmsObject.class, "/document1");
+ CmsObject cmsObject = (CmsObject) persistenceManager.getObject( "/document1");
assertEquals("cmsObject name is incorrect", cmsObject.getName(), "anotherName");
assertEquals("cmsObject path is invalid", cmsObject.getPath(), "/document1");
@@ -190,7 +190,7 @@
folder.addChild(document);
folder.addChild(subFolder);
persistenceManager.insert(folder);
-
+
Atomic a = new Atomic();
a.setPath("/atomic");
@@ -230,20 +230,28 @@
//---------------------------------------------------------------------------------------------------------
// Retrieve folder2
//---------------------------------------------------------------------------------------------------------
- Folder folder2 = (Folder) persistenceManager.getObject(Folder.class, "/folder2");
+ Folder folder2 = (Folder) persistenceManager.getObject( "/folder2");
assertNotNull("folder 2 is null", folder2);
assertEquals("Invalid number of cms object found in folder2 children", folder2.getChildren().size() ,2);
assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/document4", DocumentImpl.class));
assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/subfolder", FolderImpl.class));
- CmsObject cmsObject = (CmsObject) persistenceManager.getObject(CmsObject.class, "/folder2");
+ CmsObject cmsObject = (CmsObject) persistenceManager.getObject( "/folder2");
assertNotNull("folder 2 is null", cmsObject);
assertTrue("Invalid instance for folder 2", cmsObject instanceof FolderImpl);
assertEquals("Invalid number of documents found in folder2 children", folder2.getChildren().size(),2);
assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/document4", DocumentImpl.class));
assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/subfolder", FolderImpl.class));
+ Folder childFolder = (Folder) persistenceManager.getObject( "/folder2/subfolder");
+ Folder parenFolder = childFolder.getParentFolder();
+ assertNotNull("parent folder is null", parenFolder);
+ assertTrue("Invalid instance for parent folder", parenFolder instanceof FolderImpl);
+ assertEquals("Invalid number of documents found in folder2 children", parenFolder.getChildren().size(),2);
+ assertTrue("Invalid item in the collection", this.contains(parenFolder.getChildren(), "/folder2/document4", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(parenFolder.getChildren(), "/folder2/subfolder", FolderImpl.class));
+
//---------------------------------------------------------------------------------------------------------
// Retrieve Contents (ancestor of Documents)
//---------------------------------------------------------------------------------------------------------
@@ -330,7 +338,7 @@
//---------------------------------------------------------------------------------------------------------
// Retrieve Folder
//---------------------------------------------------------------------------------------------------------
- folder = (Folder) persistenceManager.getObject(Folder.class,"/mainfolder");
+ folder = (Folder) persistenceManager.getObject("/mainfolder");
assertNotNull("Folder is null",folder);
Collection children = folder.getChildren();
assertEquals("Invalid number of children", children.size(), 200);
Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceHierarchyTest.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceHierarchyTest.java?rev=407383&r1=407382&r2=407383&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceHierarchyTest.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerInterfaceHierarchyTest.java Wed May 17 14:49:42 2006
@@ -86,7 +86,7 @@
//---------------------------------------------------------------------------------------------------------
// Retrieve
//---------------------------------------------------------------------------------------------------------
- Interface result = (Interface) persistenceManager.getObject(Interface.class, "/test");
+ Interface result = (Interface) persistenceManager.getObject("/test");
assertNotNull("Object is null", result);
anotherDescendant = (AnotherDescendant) result;
Added: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerQueryInheritanceConcreteClassTest.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerQueryInheritanceConcreteClassTest.java?rev=407383&view=auto
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerQueryInheritanceConcreteClassTest.java (added)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerQueryInheritanceConcreteClassTest.java Wed May 17 14:49:42 2006
@@ -0,0 +1,280 @@
+/* ========================================================================
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.apache.portals.graffito.jcr.persistence.impl;
+
+import java.util.Collection;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+import org.apache.portals.graffito.jcr.TestBase;
+import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
+import org.apache.portals.graffito.jcr.query.Filter;
+import org.apache.portals.graffito.jcr.query.Query;
+import org.apache.portals.graffito.jcr.query.QueryManager;
+import org.apache.portals.graffito.jcr.testmodel.Atomic;
+import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl;
+import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl;
+import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentImpl;
+import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentStream;
+import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.FolderImpl;
+
+/**
+ * Test inheritance with node type per concrete class (without discreminator field)
+ *
+ * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
+ */
+public class PersistenceManagerQueryInheritanceConcreteClassTest extends TestBase {
+ private final static Log log = LogFactory.getLog(PersistenceManagerQueryInheritanceConcreteClassTest.class);
+
+ /**
+ * <p>Defines the test case name for junit.</p>
+ * @param testName The test case name.
+ */
+ public PersistenceManagerQueryInheritanceConcreteClassTest(String testName) throws Exception {
+ super(testName);
+
+ }
+
+ public static Test suite() {
+ // All methods starting with "test" will be executed in the test suite.
+ return new RepositoryLifecycleTestSetup(new TestSuite(
+ PersistenceManagerQueryInheritanceConcreteClassTest.class));
+ }
+
+ public void tearDown() throws Exception {
+
+ cleanUpRepisotory();
+ super.tearDown();
+
+ }
+
+
+ public void testRetrieveCollection() {
+ PersistenceManager persistenceManager = this.getPersistenceManager();
+
+ //---------------------------------------------------------------------------------------------------------
+ // Insert cmsobjects
+ //---------------------------------------------------------------------------------------------------------
+ DocumentImpl document = new DocumentImpl();
+ document.setPath("/document1");
+ document.setName("document name 1");
+ document.setContentType("plain/text");
+ DocumentStream documentStream = new DocumentStream();
+ documentStream.setEncoding("utf-8");
+ documentStream.setContent("Test Content".getBytes());
+ document.setDocumentStream(documentStream);
+ persistenceManager.insert(document);
+
+ document = new DocumentImpl();
+ document.setPath("/document2");
+ document.setName("document name 2");
+ document.setContentType("plain/text");
+ documentStream = new DocumentStream();
+ documentStream.setEncoding("utf-8");
+ documentStream.setContent("Test Content".getBytes());
+ document.setDocumentStream(documentStream);
+ persistenceManager.insert(document);
+
+ document = new DocumentImpl();
+ document.setPath("/document3");
+ document.setName("document 3");
+ document.setContentType("plain/text");
+ documentStream = new DocumentStream();
+ documentStream.setEncoding("utf-8");
+ documentStream.setContent("Test Content 3".getBytes());
+ document.setDocumentStream(documentStream);
+ persistenceManager.insert(document);
+
+ FolderImpl folder = new FolderImpl();
+ folder.setPath("/folder1");
+ folder.setName("folder1");
+ persistenceManager.insert(folder);
+
+
+ document = new DocumentImpl();
+ document.setName("document4");
+ document.setContentType("plain/text");
+ documentStream = new DocumentStream();
+ documentStream.setEncoding("utf-8");
+ documentStream.setContent("Test Content 4".getBytes());
+ document.setDocumentStream(documentStream);
+
+ FolderImpl subFolder = new FolderImpl();
+ subFolder.setName("subfolder");
+
+ folder = new FolderImpl();
+ folder.setPath("/folder2");
+ folder.setName("folder2");
+ folder.addChild(document);
+ folder.addChild(subFolder);
+ persistenceManager.insert(folder);
+
+
+ Atomic a = new Atomic();
+ a.setPath("/atomic");
+ a.setBooleanPrimitive(true);
+ persistenceManager.insert(a);
+
+ persistenceManager.save();
+
+ //---------------------------------------------------------------------------------------------------------
+ // Retrieve Folders found on the root level
+ //---------------------------------------------------------------------------------------------------------
+ QueryManager queryManager = persistenceManager.getQueryManager();
+ Filter filter = queryManager.createFilter(FolderImpl.class);
+ Query query = queryManager.createQuery(filter);
+ filter.setScope("/");
+ Collection result = persistenceManager.getObjects(query);
+ assertEquals("Invalid number of folders found", result.size(), 2);
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder1",FolderImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder2", FolderImpl.class));
+
+
+ //---------------------------------------------------------------------------------------------------------
+ // Retrieve Documents
+ //---------------------------------------------------------------------------------------------------------
+ queryManager = persistenceManager.getQueryManager();
+ filter = queryManager.createFilter(DocumentImpl.class);
+
+ filter.addLike("name", "document name%");
+ query = queryManager.createQuery(filter);
+
+ result = persistenceManager.getObjects(query);
+ assertEquals("Invalid number of documents found", result.size(),2);
+ assertTrue("Invalid item in the collection", this.contains(result, "/document1", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/document2", DocumentImpl.class));
+
+
+ //---------------------------------------------------------------------------------------------------------
+ // Retrieve folder2
+ //---------------------------------------------------------------------------------------------------------
+ FolderImpl folder2 = (FolderImpl) persistenceManager.getObject( "/folder2");
+ assertNotNull("folder 2 is null", folder2);
+ assertEquals("Invalid number of cms object found in folder2 children", folder2.getChildren().size() ,2);
+ assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/document4", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/subfolder", FolderImpl.class));
+
+
+ CmsObjectImpl cmsObject = (CmsObjectImpl) persistenceManager.getObject( "/folder2");
+ assertNotNull("folder 2 is null", cmsObject);
+ assertTrue("Invalid instance for folder 2", cmsObject instanceof FolderImpl);
+ assertEquals("Invalid number of documents found in folder2 children", folder2.getChildren().size(),2);
+ assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/document4", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/subfolder", FolderImpl.class));
+
+ //---------------------------------------------------------------------------------------------------------
+ // Retrieve Contents (ancestor of Documents)
+ //---------------------------------------------------------------------------------------------------------
+ queryManager = persistenceManager.getQueryManager();
+ filter = queryManager.createFilter(ContentImpl.class);
+ filter.addLike("name", "document name%");
+ query = queryManager.createQuery(filter);
+
+ result = persistenceManager.getObjects(query);
+ assertEquals("Invalid number of documents found", result.size(),2);
+ assertTrue("Invalid item in the collection", this.contains(result, "/document1", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/document2", DocumentImpl.class));
+
+
+ //---------------------------------------------------------------------------------------------------------
+ // Retrieve all cmsobjects found on the root level
+ //---------------------------------------------------------------------------------------------------------
+ queryManager = persistenceManager.getQueryManager();
+ filter = queryManager.createFilter(CmsObjectImpl.class);
+ filter.setScope("/");
+ query = queryManager.createQuery(filter);
+
+ result = persistenceManager.getObjects(query);
+ assertEquals("Invalid ancestor object found", result.size(),5);
+ assertTrue("Invalid item in the collection", this.contains(result, "/document1", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/document2", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/document3", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder1",FolderImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder2",FolderImpl.class));
+
+
+ //---------------------------------------------------------------------------------------------------------
+ // Retrieve all cmsobjects found anywhere
+ //---------------------------------------------------------------------------------------------------------
+ queryManager = persistenceManager.getQueryManager();
+ filter = queryManager.createFilter(CmsObjectImpl.class);
+ query = queryManager.createQuery(filter);
+
+ result = persistenceManager.getObjects(query);
+ assertEquals("Invalid ancestor object found", result.size(),7);
+ assertTrue("Invalid item in the collection", this.contains(result, "/document1", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/document2", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/document3", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder2/document4", DocumentImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder1",FolderImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder2",FolderImpl.class));
+ assertTrue("Invalid item in the collection", this.contains(result, "/folder2/subfolder",FolderImpl.class));
+
+ }
+
+ public void testBeanCollection() {
+ PersistenceManager persistenceManager = this.getPersistenceManager();
+
+ //---------------------------------------------------------------------------------------------------------
+ // Insert cmsobjects
+ //---------------------------------------------------------------------------------------------------------
+ FolderImpl folder = new FolderImpl();
+ folder.setPath("/mainfolder");
+ folder.setName("Main folder");
+
+ for (int i=1; i<=100;i++)
+ {
+ DocumentImpl document = new DocumentImpl();
+ document.setName("document" + i);
+ document.setContentType("plain/text");
+ DocumentStream documentStream = new DocumentStream();
+ documentStream.setEncoding("utf-8");
+ documentStream.setContent("Test Content".getBytes());
+ document.setDocumentStream(documentStream);
+ folder.addChild(document);
+
+ FolderImpl subFolder = new FolderImpl();
+ subFolder.setName("folder" + i);
+ subFolder.addChild(document);
+ folder.addChild(subFolder);
+
+ }
+ log.debug("Save the folder and its 200 children");
+ persistenceManager.insert(folder);
+ persistenceManager.save();
+ log.debug("End - Save the folder and its 200 children");
+
+ //---------------------------------------------------------------------------------------------------------
+ // Retrieve Folder
+ //---------------------------------------------------------------------------------------------------------
+ folder = (FolderImpl) persistenceManager.getObject("/mainfolder");
+ assertNotNull("Folder is null",folder);
+ Collection children = folder.getChildren();
+ assertEquals("Invalid number of children", children.size(), 200);
+ for (int i=1; i<=100;i++)
+ {
+ assertTrue("Invalid item in the collection : " +"/mainfolder/document" + i , this.contains(children, "/mainfolder/document" + i,DocumentImpl.class));
+ assertTrue("Invalid item in the collection : " + "/mainfolder/folder" + i, this.contains(children, "/mainfolder/folder" + i, FolderImpl.class));
+ }
+
+
+ }
+}
\ No newline at end of file
Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerSameNameSiblingTest.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerSameNameSiblingTest.java?rev=407383&r1=407382&r2=407383&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerSameNameSiblingTest.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerSameNameSiblingTest.java Wed May 17 14:49:42 2006
@@ -83,10 +83,10 @@
assertEquals("Incorrect number of objects found", 10, result.size());
// Get objects
- Atomic atomic = (Atomic) persistenceManager.getObject(Atomic.class, "/test[2]");
+ Atomic atomic = (Atomic) persistenceManager.getObject( "/test[2]");
assertNotNull("Object /test[2] not found", atomic);
- atomic = (Atomic) persistenceManager.getObject(Atomic.class, "/test[10]");
+ atomic = (Atomic) persistenceManager.getObject( "/test[10]");
assertNotNull("Object /test[2] not found", atomic);
// Update the object
Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerTest.java?rev=407383&r1=407382&r2=407383&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerTest.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/impl/PersistenceManagerTest.java Wed May 17 14:49:42 2006
@@ -115,7 +115,7 @@
// --------------------------------------------------------------------------------
// Get the object
// --------------------------------------------------------------------------------
- a = (A) persistenceManager.getObject(A.class, "/test");
+ a = (A) persistenceManager.getObject( "/test");
assertNotNull("a is null", a);
assertTrue("Incorrect a1", a.getA1().equals("a1"));
assertNotNull("a.b is null", a.getB());
@@ -139,7 +139,7 @@
// --------------------------------------------------------------------------------
// Get the object
// --------------------------------------------------------------------------------
- a = (A) persistenceManager.getObject(A.class, "/test");
+ a = (A) persistenceManager.getObject("/test");
assertNotNull("a is null", a);
assertTrue("Incorrect a1", a.getA1().equals("new value"));
assertNotNull("a.b is null", a.getB());
Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/BeanDescriptorTest.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/BeanDescriptorTest.java?rev=407383&r1=407382&r2=407383&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/BeanDescriptorTest.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/BeanDescriptorTest.java Wed May 17 14:49:42 2006
@@ -99,13 +99,13 @@
this.objectConverter.insert(getSession(), expD);
getSession().save();
- D actD = (D) this.objectConverter.getObject(getSession(), D.class, "/someD");
+ D actD = (D) this.objectConverter.getObject(getSession(), "/someD");
assertEquals(expD.getD1(), actD.getD1());
assertEquals(expB.getB1(), actD.getB1().getB1());
assertEquals(expB.getB2(), actD.getB1().getB2());
- DFull actDFull = (DFull) this.objectConverter.getObject(getSession(), DFull.class, "/someD");
+ DFull actDFull = (DFull) this.objectConverter.getObject(getSession(), DFull.class, "/someD");
assertEquals(expD.getD1(), actDFull.getD1());
assertEquals(expB.getB1(), actDFull.getB1());
@@ -116,13 +116,13 @@
this.objectConverter.update(getSession(), expD);
getSession().save();
- actD = (D) this.objectConverter.getObject(getSession(), D.class, "/someD");
+ actD = (D) this.objectConverter.getObject(getSession(), "/someD");
assertEquals(expD.getD1(), actD.getD1());
assertEquals(expB.getB1(), actD.getB1().getB1());
assertEquals(expB.getB2(), actD.getB1().getB2());
- actDFull = (DFull) this.objectConverter.getObject(getSession(), DFull.class, "/someD");
+ actDFull = (DFull) this.objectConverter.getObject(getSession(), DFull.class, "/someD");
assertEquals(expD.getD1(), actDFull.getD1());
assertEquals(expB.getB1(), actDFull.getB1());
@@ -133,12 +133,12 @@
this.objectConverter.update(getSession(), expD);
getSession().save();
- actD = (D) this.objectConverter.getObject(getSession(), D.class, "/someD");
+ actD = (D) this.objectConverter.getObject(getSession(), "/someD");
assertEquals(expD.getD1(), actD.getD1());
assertNull("b1 was not removed", actD.getB1());
- actDFull = (DFull) this.objectConverter.getObject(getSession(), DFull.class, "/someD");
+ actDFull = (DFull) this.objectConverter.getObject(getSession(), DFull.class, "/someD");
assertEquals(expD.getD1(), actDFull.getD1());
assertNull("b1 was not removed", actDFull.getB1());
@@ -146,13 +146,12 @@
}
+ /*
public void testBeanDescriptorConverter() throws Exception {
- BeanDescriptor beanDescriptor = this.mapper.getClassDescriptor(E.class).getBeanDescriptor("b1");
- FakeBeanConverter converter = (FakeBeanConverter) beanDescriptor.getBeanConverter();
- List messages = new ArrayList();
- converter.setLog(messages);
+ BeanDescriptor beanDescriptor = this.mapper.getClassDescriptorByClass(E.class).getBeanDescriptor("b1");
+ //FakeBeanConverter converter = new FakeBeanConverter(this.objectConverter);
- assertNotNull("E.b1 should be using the FakeBeanConverter", converter);
+ //assertNotNull("E.b1 should be using the FakeBeanConverter", converter);
B expB = new B();
expB.setB1("b1value");
@@ -167,7 +166,7 @@
// HINT: FakeBeanConverter should set expB
converter.setB(expB);
- E actE = (E) this.objectConverter.getObject(getSession(), E.class, "/someD");
+ E actE = (E) this.objectConverter.getObject(getSession(), "/someD");
assertEquals(expE.getD1(), actE.getD1());
@@ -180,7 +179,7 @@
getSession().save();
converter.setB(expB);
- actE = (E) this.objectConverter.getObject(getSession(), E.class, "/someD");
+ actE = (E) this.objectConverter.getObject(getSession(), "/someD");
assertEquals(expE.getD1(), actE.getD1());
assertEquals(expB, actE.getB1());
@@ -190,12 +189,13 @@
getSession().save();
converter.setB(null);
- actE = (E) this.objectConverter.getObject(getSession(), E.class, "/someD");
+ actE = (E) this.objectConverter.getObject(getSession(), "/someD");
assertEquals(expE.getD1(), actE.getD1());
assertNull(actE.getB1());
// HINT: check messages
+ List messages = converter.getLog();
assertEquals(6, messages.size());
assertEquals("insert at path /someD", messages.get(0));
assertEquals("get from path /someD", messages.get(1));
@@ -204,13 +204,20 @@
assertEquals("remove from path /someD", messages.get(4));
assertEquals("get from path /someD", messages.get(5));
}
-
- public static class FakeBeanConverter implements BeanConverter {
- private B returnB;
+ */
+ public static class FakeBeanConverter extends AbstractBeanConverterImpl {
+ private static B returnB;
private List log;
- public void setLog(List log) {
- this.log = log;
+
+
+ public FakeBeanConverter(ObjectConverter objectConverter) {
+ super(objectConverter);
+ log = new ArrayList();
+ }
+
+ public List getLog() {
+ return this.log;
}
public void setB(B b) {
Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/ProxyTest.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/ProxyTest.java?rev=407383&r1=407382&r2=407383&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/ProxyTest.java (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test/org/apache/portals/graffito/jcr/persistence/objectconverter/impl/ProxyTest.java Wed May 17 14:49:42 2006
@@ -83,7 +83,7 @@
//---------------------------------------------------------------------------------------------------------
// Retrieve the main object
//---------------------------------------------------------------------------------------------------------
- main = (Main) persistenceManager.getObject(Main.class, "/test");
+ main = (Main) persistenceManager.getObject( "/test");
assertNotNull("detail is null", main.getDetail());
assertTrue("Invalid detail bean", main.getDetail().getField().equals("FieldValue"));
@@ -115,7 +115,7 @@
// Retrieve the main object
//---------------------------------------------------------------------------------------------------------
- main = (Main) persistenceManager.getObject(Main.class, "/test");
+ main = (Main) persistenceManager.getObject( "/test");
assertNotNull("detail is null", main.getDetail());
assertTrue("Invalid detail bean", main.getDetail().getField().equals("AnotherFieldValue"));
@@ -158,7 +158,7 @@
//---------------------------------------------------------------------------------------------------------
// Retrieve the main object
//---------------------------------------------------------------------------------------------------------
- main = (Main) persistenceManager.getObject(Main.class, "/test");
+ main = (Main) persistenceManager.getObject( "/test");
assertNotNull("main is null", main);
Collection result = main.getProxyCollection();
@@ -179,7 +179,7 @@
//---------------------------------------------------------------------------------------------------------
// Retrieve the main object
//---------------------------------------------------------------------------------------------------------
- main = (Main) persistenceManager.getObject(Main.class, "/test");
+ main = (Main) persistenceManager.getObject("/test");
assertNotNull("main is null", main);
assertEquals("Invalide size",main.getProxyCollection().size(), 101);
assertNull("nullcollectionproxy is not null", main.getNullProxyCollection());