You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2006/03/29 02:34:55 UTC

svn commit: r389639 - in /db/jdo/trunk/tck20/src: conf/schemaAttributeClass.conf conf/schemaAttributeOrm.conf conf/schemaAttributePackage.conf java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java

Author: mcaisse
Date: Tue Mar 28 16:34:52 2006
New Revision: 389639

URL: http://svn.apache.org/viewcvs?rev=389639&view=rev
Log:
JDO-354

Modified:
    db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf
    db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf
    db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java

Modified: db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf?rev=389639&r1=389638&r2=389639&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf (original)
+++ db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf Tue Mar 28 16:34:52 2006
@@ -1,4 +1,4 @@
-jdo.tck.description = MakePersistent test with schema name specified as class attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 1 is overriden in orm
+jdo.tck.description = MakePersistent test with schema name specified as class attribute in orm for PCPoint. The schema name derived from jdo.tck.mapping 7, applicationidentity7 or datastoreidentity7, is overriden in the orm to specify schema applicationidentity_cls or datastoreidentity_cls.
 jdo.tck.mapping.companyfactory =
 jdo.tck.classes = org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent
 jdo.tck.testdata = 

Modified: db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf?rev=389639&r1=389638&r2=389639&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf (original)
+++ db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf Tue Mar 28 16:34:52 2006
@@ -1,4 +1,4 @@
-jdo.tck.description = MakePersistent test with schema name specified as orm attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 1 is overriden in orm
+jdo.tck.description = MakePersistent test with schema name specified as orm attribute in orm for PCPoint. The schema name derived from jdo.tck.mapping 5, applicationidentity5 or datastoreidentity5, is overriden in the orm to specify schema applicationidentity_orm or datastoreidentity_orm.
 jdo.tck.mapping.companyfactory =
 jdo.tck.classes = org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent
 jdo.tck.testdata = 

Modified: db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf?rev=389639&r1=389638&r2=389639&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf (original)
+++ db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf Tue Mar 28 16:34:52 2006
@@ -1,4 +1,4 @@
-jdo.tck.description = MakePersistent test with schema name specified as package attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 1 is overriden in orm
+jdo.tck.description = MakePersistent test with schema name specified as package attribute in orm for PCPoint. The schema name derived from jdo.tck.mapping 6, applicationidentity6 or datastoreidentity6, is overriden in the orm to specify schema applicationidentity_pkg or datastoreidentity_pkg.
 jdo.tck.mapping.companyfactory =
 jdo.tck.classes = org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent
 jdo.tck.testdata = 

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java?rev=389639&r1=389638&r2=389639&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java Tue Mar 28 16:34:52 2006
@@ -64,6 +64,14 @@
     private PCPoint p4 = null;
     private PCPoint p5 = null;
 
+    /** 
+     * Overrides parent method to avoid querying for classes
+     * that may not exist in the schema
+     */
+    protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
+    }
+
     /** */
     public void testMakePersistent() {
         pm = getPM();