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/22 20:16:36 UTC

svn commit: r408747 - in /incubator/graffito/trunk/jcr/jcr-mapping/src/test-config: jcrmapping-auto.xml jcrmapping-beandescriptor.xml jcrmapping-sibling.xml jcrmapping.xml

Author: clombart
Date: Mon May 22 13:16:35 2006
New Revision: 408747

URL: http://svn.apache.org/viewvc?rev=408747&view=rev
Log:
Reorganise the unit tests into subpackages
Add more unit tests

Added:
    incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-auto.xml
    incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-sibling.xml
Modified:
    incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-beandescriptor.xml
    incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping.xml

Added: incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-auto.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-auto.xml?rev=408747&view=auto
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-auto.xml (added)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-auto.xml Mon May 22 13:16:35 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
+<graffito-jcr>    
+
+     <!-- INTERFACE MAPPING   -->	
+     
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject"  interface="true" discriminator="false"
+	                                   jcrNodeType="graffito:cmsobject" />
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Folder"  interface="true" discriminator="false" 
+	                                   extend="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject"  jcrNodeType="graffito:folder" />
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Content"  interface="true" discriminator="false" 
+	                                   extend="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject"  jcrNodeType="graffito:content"  />
+	                                   
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Document"  interface="true" discriminator="false" 
+	                                   extend="org.apache.portals.graffito.jcr.testmodel.interfaces.Content"  jcrNodeType="graffito:document"  />
+	                                   
+	                                   
+	
+     <!-- CLASS MAPPING. The FolderImpl has  the autoRetrieve, autoUpdate & autoInsert parameters set to false  -->	
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" jcrNodeType="graffito:cmsobjectimpl"  
+	                                   discriminator="false" abstract="true" >
+		<implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" />	  	                                    
+		
+		<field-descriptor fieldName="path" path="true" />
+		<field-descriptor fieldName="name" jcrName="graffito:name"  id="true" />
+		<bean-descriptor  fieldName="parentFolder"  					 
+						  converter="org.apache.portals.graffito.jcr.persistence.objectconverter.impl.ParentBeanConverterImpl" />
+
+	</class-descriptor>     
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.FolderImpl" jcrNodeType="graffito:folderimpl" 
+	                                    extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false"  >
+		<implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Folder" />	  		                                    
+		<collection-descriptor fieldName="children" proxy="true" autoUpdate="false" autoInsert="false" autoRetrieve="false" 
+		                       elementClassName="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" 
+		                       collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+	</class-descriptor >	
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl" jcrNodeType="graffito:contentimpl" abstract="true"
+	                                   extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false"  >
+       		<implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Content" />	  		                                    
+	</class-descriptor>	
+		
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentImpl" jcrNodeType="graffito:documentimpl" 
+	                                    extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl" discriminator="false" >
+		<implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Document" />	  		                                    	                                    
+		<field-descriptor fieldName="contentType" jcrName="graffito:contenttype" />  
+		<field-descriptor fieldName="size" jcrName="graffito:size" />  	
+		<bean-descriptor fieldName="documentStream" jcrName="graffito:documentstream"  autoUpdate="false" autoInsert="false" autoRetrieve="false"  />			
+	</class-descriptor >	
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentStream" jcrNodeType="graffito:documentstream"  discriminator="false"  >
+		<field-descriptor fieldName="path" path="true" />
+		<field-descriptor fieldName="encoding" jcrName="graffito:encoding" />
+		<field-descriptor fieldName="content" jcrName="graffito:binarycontent" />
+	</class-descriptor>     
+	
+</graffito-jcr>
+ 
+ 
+ 
\ No newline at end of file

Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-beandescriptor.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-beandescriptor.xml?rev=408747&r1=408746&r2=408747&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-beandescriptor.xml (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-beandescriptor.xml Mon May 22 13:16:35 2006
@@ -24,7 +24,7 @@
 		
 		<bean-descriptor  fieldName="b1" 
 						  jcrName="b1"
-						  converter="org.apache.portals.graffito.jcr.persistence.objectconverter.impl.BeanDescriptorTest$FakeBeanConverter" />
+						  converter="org.apache.portals.graffito.jcr.persistence.beanconverter.FakeBeanConverter" />
 
 	</class-descriptor>
 	

Added: incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-sibling.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-sibling.xml?rev=408747&view=auto
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-sibling.xml (added)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping-sibling.xml Mon May 22 13:16:35 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
+<graffito-jcr>
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Page" jcrNodeType="graffito:pagewithoutsibling" discriminator="false" >
+		<field-descriptor fieldName="path" path="true" />
+		<field-descriptor fieldName="title" jcrName="graffito:title" />
+		<collection-descriptor fieldName="paragraphs" proxy="false" 
+		                       elementClassName="org.apache.portals.graffito.jcr.testmodel.Paragraph" 
+		                       collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+	</class-descriptor>
+
+	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrNodeType="graffito:paragraph" discriminator="false" >
+		<field-descriptor fieldName="path" path="true" />
+		<field-descriptor fieldName="text" jcrName="graffito:text"/>
+	</class-descriptor>
+
+<class-descriptor
+		className="org.apache.portals.graffito.jcr.testmodel.Atomic" jcrNodeType="nt:unstructured" discriminator="true" >
+		<field-descriptor fieldName="path" path="true" />
+		<field-descriptor fieldName="string" jcrName="string" />
+		<field-descriptor fieldName="booleanObject" jcrName="booleanObject" />
+		<field-descriptor fieldName="booleanPrimitive" jcrName="booleanPrimitive" />
+		<field-descriptor fieldName="integerObject" jcrName="integerObject" />
+		<field-descriptor fieldName="intPrimitive" jcrName="intPrimitive" />
+		<field-descriptor fieldName="byteArray" jcrName="byteArray" />
+		<field-descriptor fieldName="calendar" jcrName="calendar" />
+		<field-descriptor fieldName="date" jcrName="date" />
+		<field-descriptor fieldName="doubleObject" jcrName="doubleObject" />
+		<field-descriptor fieldName="doublePrimitive" jcrName="doublePrimitive" />
+		<field-descriptor fieldName="inputStream" jcrName="inputStream" />
+		<field-descriptor fieldName="timestamp" jcrName="timestamp" />
+	</class-descriptor>
+
+</graffito-jcr>
+ 
\ No newline at end of file

Modified: incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping.xml?rev=408747&r1=408746&r2=408747&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping.xml (original)
+++ incubator/graffito/trunk/jcr/jcr-mapping/src/test-config/jcrmapping.xml Mon May 22 13:16:35 2006
@@ -87,6 +87,12 @@
 	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.hashmap.Element" jcrNodeType="graffito:element" discriminator="false" >
 		<field-descriptor fieldName="id" jcrName="graffito:id"  />
 		<field-descriptor fieldName="text" jcrName="graffito:text" />
-	</class-descriptor>
+	</class-descriptor>
+	
+	
+	<class-descriptor 	className="org.apache.portals.graffito.jcr.testmodel.Discriminator" 	jcrNodeType="graffito:discriminatorobject" discriminator="true" >
+		<field-descriptor fieldName="path" path="true" />
+		<field-descriptor fieldName="content" jcrName="graffito:content" />
+	</class-descriptor>		
 </graffito-jcr>