db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r604247 - in /db/jdo/trunk/tck2/src: conf/ java/org/apache/jdo/tck/api/persistencemanager/ java/org/apache/jdo/tck/pc/newInstance/ orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/ orm/datastoreidentity/org/apache/jdo/tck/pc/newIns...
Date Fri, 14 Dec 2007 18:20:31 GMT
Author: mcaisse
Date: Fri Dec 14 10:20:30 2007
New Revision: 604247

URL: http://svn.apache.org/viewvc?rev=604247&view=rev
Log:
JDO-453 Backed out some tests, modified comments

Removed:
    db/jdo/trunk/tck2/src/conf/newInstanceBadMapping.conf
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstanceBadMapping.java
    db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard1.orm
    db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard1.orm
Modified:
    db/jdo/trunk/tck2/src/conf/configurations.list
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java

Modified: db/jdo/trunk/tck2/src/conf/configurations.list
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/configurations.list?rev=604247&r1=604246&r2=604247&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/configurations.list (original)
+++ db/jdo/trunk/tck2/src/conf/configurations.list Fri Dec 14 10:20:30 2007
@@ -18,7 +18,6 @@
                  instancecallbacks.conf \
                  jdohelper.conf \
                  pm.conf \
-                 newInstanceBadMapping.conf \
                  pmf.conf \
                  detach.conf \
                  enhancement.conf \

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java?rev=604247&r1=604246&r2=604247&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
Fri Dec 14 10:20:30 2007
@@ -33,21 +33,21 @@
  *<BR>
  *<B>Keywords:</B>
  *<BR>
- *<B>Assertion IDs:</B> A12.6.6-1
+ *<B>Assertion IDs:</B> A[Need new number]
  *<BR>
  *<B>Assertion Description: </B>
-[The parameter must be one of the following:
-- an abstract class that is declared in the metadata as persistence-capable, in which all
abstract methods are declared as persistent properties, or
-- an interface that is declared in the metadata as persistence-capable, in which all methods
are declared as persistent properties, or
-- a concrete class that is declared in the metadata as persistence-capable. In this case,
the concrete class must declare a public no-args constructor.
-If the parameter does not satisfy the above requirements, JDOUserException is thrown.
+ * Persistent properties declared in the interface are defined as those that have both a
get and a set method
+ * or both an is and a set method, named according to the JavaBeans naming conventions, and
+ * of a type supported as a persistent type.
+ * The implementing class will provide a suitable implementation for all property access
methods and
+ * will throw JDOUserException for all other methods of the interface.
  */
 
 public class NewInstance extends PersistenceManagerTest {
     
     /** */
     private static final String ASSERTION_FAILED = 
-        "Assertion A12.5.7-9 (NewInstance) failed: ";
+        "Assertion A[Need new number] (NewInstance) failed: ";
     
     /**
      * The <code>main</code> is called when the class
@@ -97,8 +97,7 @@
         try {
             pm.newInstance(IAddress_bad.class);
             fail("Expected JDOUserException but no exception thrown.  "
-                + "Interface contains method "
-                + "not declared as persistent property.");
+                + "Interface contains a method that is not property.");
         } catch (javax.jdo.JDOUserException jdoe) {
             // Expected exception
         } catch (Exception e) {
@@ -113,8 +112,7 @@
         try {
             pm.newInstance(AAddress_bad.class);
             fail("Expected JDOUserException but no exception thrown.  "
-                + "Abstract class contains abstract method "
-                + "not declared as persistent property.");
+                + "Abstract class contains a method that is not property.");
         } catch (javax.jdo.JDOUserException jdoe) {
             // Expected exception
         } catch (Exception e) {

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java?rev=604247&r1=604246&r2=604247&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/AAddress_bad.java Fri Dec
14 10:20:30 2007
@@ -31,8 +31,8 @@
     public abstract String getZipcode();
     public abstract String getCountry();
 
-    // Not declared as a persistent property => JDOUserException on
-    //   pm.newInstance(this)
+    // Lacks setter, so not a persistent property 
+    //    Expect JDOUserException on pm.newInstance(this)
     public abstract String getAString();
     
     public abstract void setAddrid(long addrid);

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java?rev=604247&r1=604246&r2=604247&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/Address_bad.java Fri Dec
14 10:20:30 2007
@@ -34,7 +34,8 @@
     private String  zipcode;
     private String  country;
 
-    // pm.newInstance(this) throws JDOUserException with non-public constructor
+    // Expect JDOUserException on pm.newInstance(this)
+    //    with non-public constructor
     private Address_bad() {}
 
     /**

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java?rev=604247&r1=604246&r2=604247&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/newInstance/IAddress_bad.java Fri Dec
14 10:20:30 2007
@@ -31,8 +31,8 @@
     String getZipcode();
     String getCountry();
 
-    // Not declared as a persistent property => JDOUserException on
-    //   pm.newInstance(this)
+    // Lacks setter, so not a persistent property
+    //   Expect JDOUserException on pm.newInstance(this)
     String getAString();
     
     void setAddrid(long addrid);



Mime
View raw message