Author: aadamchik
Date: Tue Aug  1 20:15:12 2006
New Revision: 427869

URL: http://svn.apache.org/viewvc?rev=427869&view=rev
Log:
adding tests for metadata-complete XML attribute

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/XMLMappingAssertion.java
    
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/XMLMappingAssertion.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/XMLMappingAssertion.java?rev=427869&r1=427868&r2=427869&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/XMLMappingAssertion.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/XMLMappingAssertion.java
 Tue Aug  1 20:15:12 2006
@@ -23,6 +23,7 @@
 import org.apache.cayenne.jpa.map.JpaEmbeddable;
 import org.apache.cayenne.jpa.map.JpaEntity;
 import org.apache.cayenne.jpa.map.JpaEntityMap;
+import org.apache.cayenne.jpa.map.JpaMappedSuperclass;
 
 class XMLMappingAssertion extends MappingAssertion {
 
@@ -41,12 +42,26 @@
     @Override
     protected void assertEntity1(JpaEntity entity1) {
         super.assertEntity1(entity1);
+        assertTrue(entity1.isMetadataComplete());
         assertSame(AccessType.PROPERTY, entity1.getAccess());
     }
+    
+    @Override
+    protected void assertEntity2(JpaEntity entity2) {
+        super.assertEntity2(entity2);
+        assertFalse(entity2.isMetadataComplete());
+    }
 
     @Override
     protected void assertEmbeddable1(JpaEmbeddable embeddable1) {
         super.assertEmbeddable1(embeddable1);
+        assertTrue(embeddable1.isMetadataComplete());
         assertSame(AccessType.FIELD, embeddable1.getAccess());
+    }
+    
+    @Override
+    protected void assertMappedSuperclass1(JpaMappedSuperclass 
mappedSuperclass1) {
+        super.assertMappedSuperclass1(mappedSuperclass1);
+        assertTrue(mappedSuperclass1.isMetadataComplete());
     }
 }

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml?rev=427869&r1=427868&r2=427869&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml
 Tue Aug  1 20:15:12 2006
@@ -105,7 +105,7 @@
        <sql-result-set-mapping name="result-map2"/>
        
        <!-- MAPPED SUPERCLASSES -->
-       <mapped-superclass 
class="org.apache.cayenne.jpa.entity.MockMappedSuperclass1" access="FIELD">
+       <mapped-superclass 
class="org.apache.cayenne.jpa.entity.MockMappedSuperclass1" access="FIELD" 
metadata-complete="true">
                <id-class class="org.apache.cayenne.jpa.entity.MockIdClass"/>
        
                <exclude-default-listeners/>
@@ -249,7 +249,7 @@
        <!-- ENTITIES -->
        
        <!-- no inheritance -->
-       <entity name="MockEntity1" 
class="org.apache.cayenne.jpa.entity.MockEntity1" access="PROPERTY">
+       <entity name="MockEntity1" 
class="org.apache.cayenne.jpa.entity.MockEntity1" access="PROPERTY" 
metadata-complete="true">
                
                <table name="mock_persistent_1" catalog="catalog1" 
schema="schema1">
                        <unique-constraint>
@@ -501,7 +501,7 @@
        
        <!-- EMBEDDABLES -->
        
-       <embeddable class="org.apache.cayenne.jpa.entity.MockEmbed1" 
access="FIELD">
+       <embeddable class="org.apache.cayenne.jpa.entity.MockEmbed1" 
access="FIELD" metadata-complete="true">
                <attributes>
                        <basic fetch="EAGER" optional="true" name="ea1">
                                <column name="column9"/>


Reply via email to