db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r491121 [1/3] - in /db/jdo/trunk: enhancer20/test/ fostore20/test/ fostore20/test/fsuid2/ tck11/test/java/org/apache/jdo/tck/util/ tck20/ tck20/src/java/org/apache/jdo/tck/api/jdohelper/ tck20/src/java/org/apache/jdo/tck/api/persistencemana...
Date Fri, 29 Dec 2006 22:18:42 GMT
Author: mbo
Date: Fri Dec 29 14:18:40 2006
New Revision: 491121

URL: http://svn.apache.org/viewvc?view=rev&rev=491121
Log:
JDO-441: prepare update license information
- Add <?xml ...> line to .xml files
- Remove DOS line endings (^M)
- Remove incomplete dual license hearder

Modified:
    db/jdo/trunk/enhancer20/test/common.xml
    db/jdo/trunk/fostore20/test/fsuid2/build.xml
    db/jdo/trunk/fostore20/test/fsuid2/dist.xml
    db/jdo/trunk/fostore20/test/runtest.xml
    db/jdo/trunk/tck11/test/java/org/apache/jdo/tck/util/ClassGenerator.java
    db/jdo/trunk/tck20/build.properties
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/shoppingcart/Undetachable.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/util/ClassGenerator.java
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm

Modified: db/jdo/trunk/enhancer20/test/common.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/test/common.xml?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/enhancer20/test/common.xml (original)
+++ db/jdo/trunk/enhancer20/test/common.xml Fri Dec 29 14:18:40 2006
@@ -1,3 +1,5 @@
+<?xml version="1.0"? encoding="UTF-8"?>
+
 <!--
    Copyright 2006 The Apache Software Foundation
 

Modified: db/jdo/trunk/fostore20/test/fsuid2/build.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/fsuid2/build.xml?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/fostore20/test/fsuid2/build.xml (original)
+++ db/jdo/trunk/fostore20/test/fsuid2/build.xml Fri Dec 29 14:18:40 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 

Modified: db/jdo/trunk/fostore20/test/fsuid2/dist.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/fsuid2/dist.xml?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/fostore20/test/fsuid2/dist.xml (original)
+++ db/jdo/trunk/fostore20/test/fsuid2/dist.xml Fri Dec 29 14:18:40 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 

Modified: db/jdo/trunk/fostore20/test/runtest.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/runtest.xml?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/fostore20/test/runtest.xml (original)
+++ db/jdo/trunk/fostore20/test/runtest.xml Fri Dec 29 14:18:40 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 

Modified: db/jdo/trunk/tck11/test/java/org/apache/jdo/tck/util/ClassGenerator.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck11/test/java/org/apache/jdo/tck/util/ClassGenerator.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck11/test/java/org/apache/jdo/tck/util/ClassGenerator.java (original)
+++ db/jdo/trunk/tck11/test/java/org/apache/jdo/tck/util/ClassGenerator.java Fri Dec 29 14:18:40 2006
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
  
-
-//Title:        Your Product Name
-//Version:
-//Copyright:    Copyright (c) 1998
-//Author:
-//Company:      Your Company
-//Description:  Your description
-
-
 package org.apache.jdo.tck.util;
 
 import java.io.*;

Modified: db/jdo/trunk/tck20/build.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/build.properties?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/build.properties (original)
+++ db/jdo/trunk/tck20/build.properties Fri Dec 29 14:18:40 2006
@@ -1,56 +1,56 @@
-#
-# Copyright 2005 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.
-#########################################################################
-
-# The Implementation Under Test may change properties listed in this file
-# You may add items to the classpath by placing jars in iut_jars
-#    or by setting properties iut.runtck.classpath and iut.enhancer.classpath
-#
-# ${path.separator} is the platform independent path separator character
-
-# Identity types to be tested. Modify if only one identity type is supported.
-#   If uncommented, this value overrides the value in project.properties.
-#jdo.tck.identitytypes = applicationidentity datastoreidentity
-
-##
-# Properties for the execution of the TCK
-#
-iut.runtck.sysproperties = -Xmx512m
-iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
-
-##
-# Properties for the execution of the IUT enhancer
-#
-# "${enhanced.dir}" is the output directory for the enhanced classes
-#
-# ${jdo.tck.jdometadata.files} contains the list of jdo metadata files
-#
-iut.enhancer.main = org.jpox.enhancer.JPOXEnhancer
-iut.enhancer.options = -v -d "${enhanced.dir}"
-iut.enhancer.args = ${jdo.tck.jdometadata.files}
-iut.enhancer.sysproperties =
-iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
-
-##
-# Properties for the datastore
-#
-# jdo.tck.dblist may list multiple databases, separated by spaces
-#   You must install the schema yourself for databases other than derby
-#   If uncommented, this value overrides the value in project.properties.
-#jdo.tck.dblist = 
-## fix maven.xml to handle this
-# Add system properties for each database in jdo.tck.dblist if needed
-#   If uncommented, this value overrides the value in project.properties.
-#database.runtck.sysproperties = 
+#
+# Copyright 2005 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.
+#########################################################################
+
+# The Implementation Under Test may change properties listed in this file
+# You may add items to the classpath by placing jars in iut_jars
+#    or by setting properties iut.runtck.classpath and iut.enhancer.classpath
+#
+# ${path.separator} is the platform independent path separator character
+
+# Identity types to be tested. Modify if only one identity type is supported.
+#   If uncommented, this value overrides the value in project.properties.
+#jdo.tck.identitytypes = applicationidentity datastoreidentity
+
+##
+# Properties for the execution of the TCK
+#
+iut.runtck.sysproperties = -Xmx512m
+iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
+
+##
+# Properties for the execution of the IUT enhancer
+#
+# "${enhanced.dir}" is the output directory for the enhanced classes
+#
+# ${jdo.tck.jdometadata.files} contains the list of jdo metadata files
+#
+iut.enhancer.main = org.jpox.enhancer.JPOXEnhancer
+iut.enhancer.options = -v -d "${enhanced.dir}"
+iut.enhancer.args = ${jdo.tck.jdometadata.files}
+iut.enhancer.sysproperties =
+iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
+
+##
+# Properties for the datastore
+#
+# jdo.tck.dblist may list multiple databases, separated by spaces
+#   You must install the schema yourself for databases other than derby
+#   If uncommented, this value overrides the value in project.properties.
+#jdo.tck.dblist = 
+## fix maven.xml to handle this
+# Add system properties for each database in jdo.tck.dblist if needed
+#   If uncommented, this value overrides the value in project.properties.
+#database.runtck.sysproperties = 

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java Fri Dec 29 14:18:40 2006
@@ -1,84 +1,84 @@
-/*
- * Copyright 2005 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.jdo.tck.api.jdohelper;
-
-import org.apache.jdo.tck.api.persistencemanager.detach.DetachTest;
-import org.apache.jdo.tck.pc.shoppingcart.Cart;
-import org.apache.jdo.tck.pc.shoppingcart.Undetachable;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-import javax.jdo.JDOHelper;
-import javax.jdo.Transaction;
-
-/**
- * <B>Title:</B> Test IsDetached
- * <BR>
- * <B>Keywords:</B>
- * <BR>
- * <B>Assertion IDs:</B> A8.5.6-1
- * <BR>
- * <B>Assertion Description: </B>
- * Instances that have been detached return true.
- * The method returns false if the instance is transient or null or if its class is not detachable.
- */
-public class IsDetached extends DetachTest {
-
-    private static final String ASSERTION_FAILED = "Assertion A8.5.6-1 JDOHelper.isDetached(Object) failed: ";
-
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     *
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(IsDetached.class);
-    }
-
-    public void testNullTransientAndUndetachableIsDetachedFalse() {
-        pm = getPM();
-        pm.currentTransaction().begin();
-
-        assertFalse(ASSERTION_FAILED + "null object is detached", JDOHelper.isDetached(null));
-        assertFalse(ASSERTION_FAILED + "transient object is detached", JDOHelper.isDetached(new Cart("bob")));
-        assertFalse(ASSERTION_FAILED + "object of class marked not detachabled is detached", JDOHelper.isDetached(new Undetachable()));
-
-        pm.currentTransaction().commit();
-    }
-
-    public void testDetachableIsDetachedTrue() {
-        pm = getPM();
-        Transaction txn = pm.currentTransaction();
-
-        Cart c, detached;
-        Object oid;
-        txn.begin();
-        {
-            c = new Cart("bob");
-            pm.makePersistent(c);
-            oid = pm.getObjectId(c);
-        }
-        txn.commit();
-
-        txn.begin();
-        {
-            c = (Cart) pm.getObjectById(oid);
-            detached = (Cart) pm.detachCopy(c);
-            assertTrue(JDOHelper.isDetached(detached));
-        }
-        txn.commit();
-    }
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.jdohelper;
+
+import org.apache.jdo.tck.api.persistencemanager.detach.DetachTest;
+import org.apache.jdo.tck.pc.shoppingcart.Cart;
+import org.apache.jdo.tck.pc.shoppingcart.Undetachable;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+import javax.jdo.JDOHelper;
+import javax.jdo.Transaction;
+
+/**
+ * <B>Title:</B> Test IsDetached
+ * <BR>
+ * <B>Keywords:</B>
+ * <BR>
+ * <B>Assertion IDs:</B> A8.5.6-1
+ * <BR>
+ * <B>Assertion Description: </B>
+ * Instances that have been detached return true.
+ * The method returns false if the instance is transient or null or if its class is not detachable.
+ */
+public class IsDetached extends DetachTest {
+
+    private static final String ASSERTION_FAILED = "Assertion A8.5.6-1 JDOHelper.isDetached(Object) failed: ";
+
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     *
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(IsDetached.class);
+    }
+
+    public void testNullTransientAndUndetachableIsDetachedFalse() {
+        pm = getPM();
+        pm.currentTransaction().begin();
+
+        assertFalse(ASSERTION_FAILED + "null object is detached", JDOHelper.isDetached(null));
+        assertFalse(ASSERTION_FAILED + "transient object is detached", JDOHelper.isDetached(new Cart("bob")));
+        assertFalse(ASSERTION_FAILED + "object of class marked not detachabled is detached", JDOHelper.isDetached(new Undetachable()));
+
+        pm.currentTransaction().commit();
+    }
+
+    public void testDetachableIsDetachedTrue() {
+        pm = getPM();
+        Transaction txn = pm.currentTransaction();
+
+        Cart c, detached;
+        Object oid;
+        txn.begin();
+        {
+            c = new Cart("bob");
+            pm.makePersistent(c);
+            oid = pm.getObjectId(c);
+        }
+        txn.commit();
+
+        txn.begin();
+        {
+            c = (Cart) pm.getObjectById(oid);
+            detached = (Cart) pm.detachCopy(c);
+            assertTrue(JDOHelper.isDetached(detached));
+        }
+        txn.commit();
+    }
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java Fri Dec 29 14:18:40 2006
@@ -1,168 +1,168 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.cache;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> Refresh All No Parameters Side Effects
- *<BR>
- *<B>Keywords:</B> cache
- *<BR>
- *<B>Assertion ID:</B> A12.5.1-5B
- *<BR>
- *<B>Assertion Description: </B>
-The refreshAll() updates the values in the parameter
-instance[s] from the data in the data store. ((The intended use is for optimistic transactions where the state of
-the JDO Instance is not guaranteed to reflect the state in the data store. This method can be used to minimize
-the occurrence of commit failures due to mismatch between the state of cached instances and the state of
-data in the data store.)) This can be tested by using 2 PersistenceManagers, independently change an object,
-then refresh.
- */
-
-/** */
-public class RefreshAllNoParameterSideEffects extends PersistenceManagerTest {
-    
-    /** */
-    private static final String ASSERTION_FAILED = 
-        "Assertion A12.5.1-5B (RefreshAllNoParameterSideEffects) failed: ";
-    Object oid = null;
-
-    PersistenceManager pm1;
-    PersistenceManager pm2;
-    PersistenceManager pmVerify;
-    
-    /** */
-
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(RefreshAllNoParameterSideEffects.class);
-    }
-
-    /** */
-    public void localSetUp () {
-        addTearDownClass(VersionedPCPoint.class);
-        pm = getPM();
-        Transaction tx = pm.currentTransaction();
-        tx.begin();
-        VersionedPCPoint pnt = new VersionedPCPoint (0,0);
-        pm.makePersistent(pnt);
-        oid = pm.getObjectId((Object)pnt);
-        tx.commit();
-    }
-
-    /** */
-    public void test() throws Exception {
-        if (!isOptimisticSupported()) {
-            printUnsupportedOptionalFeatureNotTested(
-                "RefreshAllNoParameterSideEffect",
-                "javax.jdo.option.Optimistic");
-            return;
-        }
-
-        pm1 = pmf.getPersistenceManager();
-        pm2 = pmf.getPersistenceManager();
-        pmVerify = pmf.getPersistenceManager();
-        
-        try {
-            // don't refresh cache
-            runTestRefreshAllNoParameterSideEffects(false);
-            // refresh cache
-            runTestRefreshAllNoParameterSideEffects(true);
-        }
-        finally {
-            cleanupPM(pmVerify);
-            pmVerify = null;
-            cleanupPM(pm1);
-            pm1 = null;
-            cleanupPM(pm1);
-            pm2 = null;
-        }
-        failOnError();
-    }
-    
-    /** */
-    private void runTestRefreshAllNoParameterSideEffects(boolean doRefresh)
-            throws Exception {
-
-        if (debug) logger.debug ("\nSTART RefreshAllNoParameterSideEffects");
-
-        Transaction tx1 = pm1.currentTransaction();
-        tx1.setOptimistic(true);
-        tx1.begin();
-        VersionedPCPoint pnt1 = (VersionedPCPoint)pm1.getObjectById(oid, true);
-        pnt1.setX(11);  // make transactional
-
-        Transaction tx2 = pm2.currentTransaction();
-        tx2.begin();
-        VersionedPCPoint pnt2 = (VersionedPCPoint)pm2.getObjectById(oid);
-        pnt2.setX(22);
-        pnt2.setY(Integer.valueOf("22"));
-        tx2.commit();
-
-        if (doRefresh) 
-            pm1.refreshAll();
-        pnt1.setX(33);
-        pnt1.setY(Integer.valueOf("33"));
-        try {
-            tx1.commit();
-        } catch (javax.jdo.JDOOptimisticVerificationException ove) {
-            if (doRefresh) {
-                appendMessage("Expected no exception on commit with doRefresh "
-                        + "true, but got " + ove.toString());
-            }
-            // else expect exception
-        } catch (Exception e) {
-            appendMessage("Unexpected exception on commit. doRefresh is " 
-                    + doRefresh + ".  Exception is: " + e.toString());
-        }
-
-        // verify that correct value was committed
-        VersionedPCPoint pntExpected = new VersionedPCPoint(33, 33);
-        if (!doRefresh) {
-            pntExpected.setX(22);
-            pntExpected.setY(Integer.valueOf("22"));
-        }
-            
-        Transaction txVerify = pmVerify.currentTransaction();
-        txVerify.begin();
-        VersionedPCPoint pntVerify = 
-                (VersionedPCPoint)pmVerify.getObjectById(oid, true);
-        if (pntVerify.getX() != pntExpected.getX() 
-                || pntVerify.getY().intValue() != pntExpected.getY().intValue())
-        {
-            appendMessage("After commit with doRefresh " + doRefresh
-                    + " expected ("
-                    + pntExpected.getX() + ", " + pntExpected.getY() 
-                    + ") but actual is (" 
-                    + pntVerify.getX() + ", " + pntVerify.getY() + ").");
-        }
-        txVerify.commit();
-        
-        if (debug) logger.debug ("END RefreshAllNoParameterSideEffects"
-                + "doRefresh is " + doRefresh);
-    }
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.cache;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
+import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> Refresh All No Parameters Side Effects
+ *<BR>
+ *<B>Keywords:</B> cache
+ *<BR>
+ *<B>Assertion ID:</B> A12.5.1-5B
+ *<BR>
+ *<B>Assertion Description: </B>
+The refreshAll() updates the values in the parameter
+instance[s] from the data in the data store. ((The intended use is for optimistic transactions where the state of
+the JDO Instance is not guaranteed to reflect the state in the data store. This method can be used to minimize
+the occurrence of commit failures due to mismatch between the state of cached instances and the state of
+data in the data store.)) This can be tested by using 2 PersistenceManagers, independently change an object,
+then refresh.
+ */
+
+/** */
+public class RefreshAllNoParameterSideEffects extends PersistenceManagerTest {
+    
+    /** */
+    private static final String ASSERTION_FAILED = 
+        "Assertion A12.5.1-5B (RefreshAllNoParameterSideEffects) failed: ";
+    Object oid = null;
+
+    PersistenceManager pm1;
+    PersistenceManager pm2;
+    PersistenceManager pmVerify;
+    
+    /** */
+
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(RefreshAllNoParameterSideEffects.class);
+    }
+
+    /** */
+    public void localSetUp () {
+        addTearDownClass(VersionedPCPoint.class);
+        pm = getPM();
+        Transaction tx = pm.currentTransaction();
+        tx.begin();
+        VersionedPCPoint pnt = new VersionedPCPoint (0,0);
+        pm.makePersistent(pnt);
+        oid = pm.getObjectId((Object)pnt);
+        tx.commit();
+    }
+
+    /** */
+    public void test() throws Exception {
+        if (!isOptimisticSupported()) {
+            printUnsupportedOptionalFeatureNotTested(
+                "RefreshAllNoParameterSideEffect",
+                "javax.jdo.option.Optimistic");
+            return;
+        }
+
+        pm1 = pmf.getPersistenceManager();
+        pm2 = pmf.getPersistenceManager();
+        pmVerify = pmf.getPersistenceManager();
+        
+        try {
+            // don't refresh cache
+            runTestRefreshAllNoParameterSideEffects(false);
+            // refresh cache
+            runTestRefreshAllNoParameterSideEffects(true);
+        }
+        finally {
+            cleanupPM(pmVerify);
+            pmVerify = null;
+            cleanupPM(pm1);
+            pm1 = null;
+            cleanupPM(pm1);
+            pm2 = null;
+        }
+        failOnError();
+    }
+    
+    /** */
+    private void runTestRefreshAllNoParameterSideEffects(boolean doRefresh)
+            throws Exception {
+
+        if (debug) logger.debug ("\nSTART RefreshAllNoParameterSideEffects");
+
+        Transaction tx1 = pm1.currentTransaction();
+        tx1.setOptimistic(true);
+        tx1.begin();
+        VersionedPCPoint pnt1 = (VersionedPCPoint)pm1.getObjectById(oid, true);
+        pnt1.setX(11);  // make transactional
+
+        Transaction tx2 = pm2.currentTransaction();
+        tx2.begin();
+        VersionedPCPoint pnt2 = (VersionedPCPoint)pm2.getObjectById(oid);
+        pnt2.setX(22);
+        pnt2.setY(Integer.valueOf("22"));
+        tx2.commit();
+
+        if (doRefresh) 
+            pm1.refreshAll();
+        pnt1.setX(33);
+        pnt1.setY(Integer.valueOf("33"));
+        try {
+            tx1.commit();
+        } catch (javax.jdo.JDOOptimisticVerificationException ove) {
+            if (doRefresh) {
+                appendMessage("Expected no exception on commit with doRefresh "
+                        + "true, but got " + ove.toString());
+            }
+            // else expect exception
+        } catch (Exception e) {
+            appendMessage("Unexpected exception on commit. doRefresh is " 
+                    + doRefresh + ".  Exception is: " + e.toString());
+        }
+
+        // verify that correct value was committed
+        VersionedPCPoint pntExpected = new VersionedPCPoint(33, 33);
+        if (!doRefresh) {
+            pntExpected.setX(22);
+            pntExpected.setY(Integer.valueOf("22"));
+        }
+            
+        Transaction txVerify = pmVerify.currentTransaction();
+        txVerify.begin();
+        VersionedPCPoint pntVerify = 
+                (VersionedPCPoint)pmVerify.getObjectById(oid, true);
+        if (pntVerify.getX() != pntExpected.getX() 
+                || pntVerify.getY().intValue() != pntExpected.getY().intValue())
+        {
+            appendMessage("After commit with doRefresh " + doRefresh
+                    + " expected ("
+                    + pntExpected.getX() + ", " + pntExpected.getY() 
+                    + ") but actual is (" 
+                    + pntVerify.getX() + ", " + pntVerify.getY() + ").");
+        }
+        txVerify.commit();
+        
+        if (debug) logger.debug ("END RefreshAllNoParameterSideEffects"
+                + "doRefresh is " + doRefresh);
+    }
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java Fri Dec 29 14:18:40 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
-
-import java.util.Collection;
-
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> deletePersistent with Null Arguments
- *<BR>
- *<B>Keywords:</B>
- *<BR>
- *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
- *<BR>
- *<B>Assertion Description: </B>
-A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
- */
-
-public class DeletePersistentNullArgs extends PersistenceManagerNullsTest {
-    
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(DeletePersistentNullArgs.class);
-    }
-
-    static MethodUnderTest deletePersistent = 
-            new MethodUnderTestDeletePersistent();
-    static class MethodUnderTestDeletePersistent extends MethodUnderTest {
-        public void pmApi(PersistenceManager pm, Object pc) {
-            pm.deletePersistent(pc);
-        }
-        public void pmApi(PersistenceManager pm, Collection pcs) {
-            pm.deletePersistentAll(pcs);
-        }
-        public void pmApi(PersistenceManager pm, Object[] pcs) {
-            pm.deletePersistentAll(pcs);
-        }
-    };
-
-    /** 
-     * Test that deletePersistent() with null valued argument does nothing.
-     */
-    public void testDeletePersistentNullObject() {
-        executeNullObjectParameter(deletePersistent, "deletePersistent(null)");
-    }
-
-    /** 
-     * Test that deletePersistentAll() with null valued Collection argument
-     * throws NullPointerException.
-     */
-    public void testDeletePersistentNullCollection() {
-        executeNullCollectionParameter(deletePersistent,
-                "deletePersistentAll((Collection)null)");
-    }
-
-    /** 
-     * Test that deletePersistentAll() with null valued array argument
-     * throws NullPointerException.
-     */
-    public void testDeletePersistentNullArray() {
-        executeNullArrayParameter(deletePersistent, 
-                "deletePersistentAll((Object[])null)");
-    }
-
-    /** 
-     * Test that deletePersistentAll() with a null element of a 
-     * Collection argument throws NullPointerException.
-     */
-    public void testDeletePersistentCollectionNullElement() {
-        executeCollectionNullElement(collNullElem, deletePersistent, 
-                "deletePersistentAll(Collection)");
-    }
-
-    /** 
-     * Test that deletePersistentAll() with a null element of a 
-     * array argument throws NullPointerException.
-     */
-    public void testDeletePersistentArrayNullElement() {
-        executeArrayNullElement(arrayNullElem, deletePersistent, 
-                "deletePersistentAll(Object[])");
-    }
-
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
+
+import java.util.Collection;
+
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> deletePersistent with Null Arguments
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
+ *<BR>
+ *<B>Assertion Description: </B>
+A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
+ */
+
+public class DeletePersistentNullArgs extends PersistenceManagerNullsTest {
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(DeletePersistentNullArgs.class);
+    }
+
+    static MethodUnderTest deletePersistent = 
+            new MethodUnderTestDeletePersistent();
+    static class MethodUnderTestDeletePersistent extends MethodUnderTest {
+        public void pmApi(PersistenceManager pm, Object pc) {
+            pm.deletePersistent(pc);
+        }
+        public void pmApi(PersistenceManager pm, Collection pcs) {
+            pm.deletePersistentAll(pcs);
+        }
+        public void pmApi(PersistenceManager pm, Object[] pcs) {
+            pm.deletePersistentAll(pcs);
+        }
+    };
+
+    /** 
+     * Test that deletePersistent() with null valued argument does nothing.
+     */
+    public void testDeletePersistentNullObject() {
+        executeNullObjectParameter(deletePersistent, "deletePersistent(null)");
+    }
+
+    /** 
+     * Test that deletePersistentAll() with null valued Collection argument
+     * throws NullPointerException.
+     */
+    public void testDeletePersistentNullCollection() {
+        executeNullCollectionParameter(deletePersistent,
+                "deletePersistentAll((Collection)null)");
+    }
+
+    /** 
+     * Test that deletePersistentAll() with null valued array argument
+     * throws NullPointerException.
+     */
+    public void testDeletePersistentNullArray() {
+        executeNullArrayParameter(deletePersistent, 
+                "deletePersistentAll((Object[])null)");
+    }
+
+    /** 
+     * Test that deletePersistentAll() with a null element of a 
+     * Collection argument throws NullPointerException.
+     */
+    public void testDeletePersistentCollectionNullElement() {
+        executeCollectionNullElement(collNullElem, deletePersistent, 
+                "deletePersistentAll(Collection)");
+    }
+
+    /** 
+     * Test that deletePersistentAll() with a null element of a 
+     * array argument throws NullPointerException.
+     */
+    public void testDeletePersistentArrayNullElement() {
+        executeArrayNullElement(arrayNullElem, deletePersistent, 
+                "deletePersistentAll(Object[])");
+    }
+
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java Fri Dec 29 14:18:40 2006
@@ -1,107 +1,107 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
-
-import java.util.Collection;
-
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> detachCopy with Null Arguments
- *<BR>
- *<B>Keywords:</B>
- *<BR>
- *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
- *<BR>
- *<B>Assertion Description: </B>
-A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
- */
-
-public class DetachCopyNullArgs extends PersistenceManagerNullsTest {
-    
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(DetachCopyNullArgs.class);
-    }
-
-    static MethodUnderTest detachCopy = new MethodUnderTestDetachCopy();
-    static class MethodUnderTestDetachCopy extends MethodUnderTest {
-        public Object pmApiReturn(PersistenceManager pm, Object pc) {
-            return pm.detachCopy(pc);
-        }
-        public Collection pmApiReturn(PersistenceManager pm, Collection pcs) {
-            return pm.detachCopyAll(pcs);
-        }
-        public Object[] pmApiReturn(PersistenceManager pm, Object[] pcs) {
-            return pm.detachCopyAll(pcs);
-        }
-    };
-
-    /** 
-     * Test that detachCopy() with null valued argument does nothing.
-     */
-    public void testDetachCopyNullObject() {
-        executeNullObjectParameterReturn(detachCopy, "detachCopy(null)");
-    }
-
-    /** 
-     * Test that detachCopyAll() with null valued Collection argument
-     * throws NullPointerException.
-     */
-    public void testDetachCopyNullCollection() {
-        executeNullCollectionParameterReturn(detachCopy, 
-                "detachCopyAll((Collection)null)");
-    }
-
-    /** 
-     * Test that detachCopyAll() with null valued array argument
-     * throws NullPointerException.
-     */
-    public void testDetachCopyNullArray() {
-        executeNullArrayParameterReturn(detachCopy, 
-                "detachCopyAll((Array)null)");
-    }
-
-    /** 
-     * Test that detachCopyAll() with a null element of a 
-     * Collection argument throws NullPointerException.
-     */
-    public void testDetachCopyCollectionNullElement() {
-        executeCollectionNullElementReturn(collNullElem, detachCopy, 
-                "detachCopyAll(Collection)");
-    }
-
-    /** 
-     * Test that detachCopyAll() with a null element of a 
-     * array argument throws NullPointerException.
-     */
-    public void testDetachCopyArrayNullElement() {
-        executeArrayNullElementReturn(arrayNullElem, detachCopy, 
-                "detachCopyAll(Array)");
-    }
-
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
+
+import java.util.Collection;
+
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> detachCopy with Null Arguments
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
+ *<BR>
+ *<B>Assertion Description: </B>
+A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
+ */
+
+public class DetachCopyNullArgs extends PersistenceManagerNullsTest {
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(DetachCopyNullArgs.class);
+    }
+
+    static MethodUnderTest detachCopy = new MethodUnderTestDetachCopy();
+    static class MethodUnderTestDetachCopy extends MethodUnderTest {
+        public Object pmApiReturn(PersistenceManager pm, Object pc) {
+            return pm.detachCopy(pc);
+        }
+        public Collection pmApiReturn(PersistenceManager pm, Collection pcs) {
+            return pm.detachCopyAll(pcs);
+        }
+        public Object[] pmApiReturn(PersistenceManager pm, Object[] pcs) {
+            return pm.detachCopyAll(pcs);
+        }
+    };
+
+    /** 
+     * Test that detachCopy() with null valued argument does nothing.
+     */
+    public void testDetachCopyNullObject() {
+        executeNullObjectParameterReturn(detachCopy, "detachCopy(null)");
+    }
+
+    /** 
+     * Test that detachCopyAll() with null valued Collection argument
+     * throws NullPointerException.
+     */
+    public void testDetachCopyNullCollection() {
+        executeNullCollectionParameterReturn(detachCopy, 
+                "detachCopyAll((Collection)null)");
+    }
+
+    /** 
+     * Test that detachCopyAll() with null valued array argument
+     * throws NullPointerException.
+     */
+    public void testDetachCopyNullArray() {
+        executeNullArrayParameterReturn(detachCopy, 
+                "detachCopyAll((Array)null)");
+    }
+
+    /** 
+     * Test that detachCopyAll() with a null element of a 
+     * Collection argument throws NullPointerException.
+     */
+    public void testDetachCopyCollectionNullElement() {
+        executeCollectionNullElementReturn(collNullElem, detachCopy, 
+                "detachCopyAll(Collection)");
+    }
+
+    /** 
+     * Test that detachCopyAll() with a null element of a 
+     * array argument throws NullPointerException.
+     */
+    public void testDetachCopyArrayNullElement() {
+        executeArrayNullElementReturn(arrayNullElem, detachCopy, 
+                "detachCopyAll(Array)");
+    }
+
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java Fri Dec 29 14:18:40 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
-
-import java.util.Collection;
-
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> evict with Null Arguments
- *<BR>
- *<B>Keywords:</B>
- *<BR>
- *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
- *<BR>
- *<B>Assertion Description: </B>
-A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
- */
-
-public class EvictNullArgs extends PersistenceManagerNullsTest {
-    
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(EvictNullArgs.class);
-    }
-
-    static MethodUnderTest evict = 
-            new MethodUnderTestEvict();
-    static class MethodUnderTestEvict extends MethodUnderTest {
-        public void pmApi(PersistenceManager pm, Object pc) {
-            pm.evict(pc);
-        }
-        public void pmApi(PersistenceManager pm, Collection pcs) {
-            pm.evictAll(pcs);
-        }
-        public void pmApi(PersistenceManager pm, Object[] pcs) {
-            pm.evictAll(pcs);
-        }
-    };
-
-    /** 
-     * Test that evict() with null valued argument does nothing.
-     */
-    public void testEvictNullObject() {
-        executeNullObjectParameter(evict, "evict(null)");
-    }
-
-    /** 
-     * Test that evictAll() with null valued Collection argument
-     * throws NullPointerException.
-     */
-    public void testEvictNullCollection() {
-        executeNullCollectionParameter(evict,
-                "evictAll((Collection)null)");
-    }
-
-    /** 
-     * Test that evictAll() with null valued array argument
-     * throws NullPointerException.
-     */
-    public void testEvictNullArray() {
-        executeNullArrayParameter(evict, 
-                "evictAll((Object[])null)");
-    }
-
-    /** 
-     * Test that evictAll() with a null element of a 
-     * Collection argument throws NullPointerException.
-     */
-    public void testEvictCollectionNullElement() {
-        executeCollectionNullElement(collNullElem, evict, 
-                "evictAll(Collection)");
-    }
-
-    /** 
-     * Test that evictAll() with a null element of a 
-     * array argument throws NullPointerException.
-     */
-    public void testEvictArrayNullElement() {
-        executeArrayNullElement(arrayNullElem, evict, 
-                "evictAll(Object[])");
-    }
-
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
+
+import java.util.Collection;
+
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> evict with Null Arguments
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
+ *<BR>
+ *<B>Assertion Description: </B>
+A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
+ */
+
+public class EvictNullArgs extends PersistenceManagerNullsTest {
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(EvictNullArgs.class);
+    }
+
+    static MethodUnderTest evict = 
+            new MethodUnderTestEvict();
+    static class MethodUnderTestEvict extends MethodUnderTest {
+        public void pmApi(PersistenceManager pm, Object pc) {
+            pm.evict(pc);
+        }
+        public void pmApi(PersistenceManager pm, Collection pcs) {
+            pm.evictAll(pcs);
+        }
+        public void pmApi(PersistenceManager pm, Object[] pcs) {
+            pm.evictAll(pcs);
+        }
+    };
+
+    /** 
+     * Test that evict() with null valued argument does nothing.
+     */
+    public void testEvictNullObject() {
+        executeNullObjectParameter(evict, "evict(null)");
+    }
+
+    /** 
+     * Test that evictAll() with null valued Collection argument
+     * throws NullPointerException.
+     */
+    public void testEvictNullCollection() {
+        executeNullCollectionParameter(evict,
+                "evictAll((Collection)null)");
+    }
+
+    /** 
+     * Test that evictAll() with null valued array argument
+     * throws NullPointerException.
+     */
+    public void testEvictNullArray() {
+        executeNullArrayParameter(evict, 
+                "evictAll((Object[])null)");
+    }
+
+    /** 
+     * Test that evictAll() with a null element of a 
+     * Collection argument throws NullPointerException.
+     */
+    public void testEvictCollectionNullElement() {
+        executeCollectionNullElement(collNullElem, evict, 
+                "evictAll(Collection)");
+    }
+
+    /** 
+     * Test that evictAll() with a null element of a 
+     * array argument throws NullPointerException.
+     */
+    public void testEvictArrayNullElement() {
+        executeArrayNullElement(arrayNullElem, evict, 
+                "evictAll(Object[])");
+    }
+
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java Fri Dec 29 14:18:40 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
-
-import java.util.Collection;
-
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> makeNontransactional with Null Arguments
- *<BR>
- *<B>Keywords:</B>
- *<BR>
- *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
- *<BR>
- *<B>Assertion Description: </B>
-A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
- */
-
-public class MakeNontransactionalNullArgs extends PersistenceManagerNullsTest {
-    
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(MakeNontransactionalNullArgs.class);
-    }
-
-    static MethodUnderTest makeNontransactional = 
-            new MethodUnderTestMakeNontransactional();
-    static class MethodUnderTestMakeNontransactional extends MethodUnderTest {
-        public void pmApi(PersistenceManager pm, Object pc) {
-            pm.makeNontransactional(pc);
-        }
-        public void pmApi(PersistenceManager pm, Collection pcs) {
-            pm.makeNontransactionalAll(pcs);
-        }
-        public void pmApi(PersistenceManager pm, Object[] pcs) {
-            pm.makeNontransactionalAll(pcs);
-        }
-    };
-
-    /** 
-     * Test that makeNontransactional() with null valued argument does nothing.
-     */
-    public void testMakeNontransactionalNullObject() {
-        executeNullObjectParameter(makeNontransactional, "makeNontransactional(null)");
-    }
-
-    /** 
-     * Test that makeNontransactionalAll() with null valued Collection argument
-     * throws NullPointerException.
-     */
-    public void testMakeNontransactionalNullCollection() {
-        executeNullCollectionParameter(makeNontransactional,
-                "makeNontransactionalAll((Collection)null)");
-    }
-
-    /** 
-     * Test that makeNontransactionalAll() with null valued array argument
-     * throws NullPointerException.
-     */
-    public void testMakeNontransactionalNullArray() {
-        executeNullArrayParameter(makeNontransactional, 
-                "makeNontransactionalAll((Object[])null)");
-    }
-
-    /** 
-     * Test that makeNontransactionalAll() with a null element of a 
-     * Collection argument throws NullPointerException.
-     */
-    public void testMakeNontransactionalCollectionNullElement() {
-        executeCollectionNullElement(collNullElem, makeNontransactional, 
-                "makeNontransactionalAll(Collection)");
-    }
-
-    /** 
-     * Test that makeNontransactionalAll() with a null element of a 
-     * array argument throws NullPointerException.
-     */
-    public void testMakeNontransactionalArrayNullElement() {
-        executeArrayNullElement(arrayNullElem, makeNontransactional, 
-                "makeNontransactionalAll(Object[])");
-    }
-
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
+
+import java.util.Collection;
+
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> makeNontransactional with Null Arguments
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
+ *<BR>
+ *<B>Assertion Description: </B>
+A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
+ */
+
+public class MakeNontransactionalNullArgs extends PersistenceManagerNullsTest {
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(MakeNontransactionalNullArgs.class);
+    }
+
+    static MethodUnderTest makeNontransactional = 
+            new MethodUnderTestMakeNontransactional();
+    static class MethodUnderTestMakeNontransactional extends MethodUnderTest {
+        public void pmApi(PersistenceManager pm, Object pc) {
+            pm.makeNontransactional(pc);
+        }
+        public void pmApi(PersistenceManager pm, Collection pcs) {
+            pm.makeNontransactionalAll(pcs);
+        }
+        public void pmApi(PersistenceManager pm, Object[] pcs) {
+            pm.makeNontransactionalAll(pcs);
+        }
+    };
+
+    /** 
+     * Test that makeNontransactional() with null valued argument does nothing.
+     */
+    public void testMakeNontransactionalNullObject() {
+        executeNullObjectParameter(makeNontransactional, "makeNontransactional(null)");
+    }
+
+    /** 
+     * Test that makeNontransactionalAll() with null valued Collection argument
+     * throws NullPointerException.
+     */
+    public void testMakeNontransactionalNullCollection() {
+        executeNullCollectionParameter(makeNontransactional,
+                "makeNontransactionalAll((Collection)null)");
+    }
+
+    /** 
+     * Test that makeNontransactionalAll() with null valued array argument
+     * throws NullPointerException.
+     */
+    public void testMakeNontransactionalNullArray() {
+        executeNullArrayParameter(makeNontransactional, 
+                "makeNontransactionalAll((Object[])null)");
+    }
+
+    /** 
+     * Test that makeNontransactionalAll() with a null element of a 
+     * Collection argument throws NullPointerException.
+     */
+    public void testMakeNontransactionalCollectionNullElement() {
+        executeCollectionNullElement(collNullElem, makeNontransactional, 
+                "makeNontransactionalAll(Collection)");
+    }
+
+    /** 
+     * Test that makeNontransactionalAll() with a null element of a 
+     * array argument throws NullPointerException.
+     */
+    public void testMakeNontransactionalArrayNullElement() {
+        executeArrayNullElement(arrayNullElem, makeNontransactional, 
+                "makeNontransactionalAll(Object[])");
+    }
+
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java Fri Dec 29 14:18:40 2006
@@ -1,107 +1,107 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
-
-import java.util.Collection;
-
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> makePersistent with Null Arguments
- *<BR>
- *<B>Keywords:</B>
- *<BR>
- *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
- *<BR>
- *<B>Assertion Description: </B>
-A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
- */
-
-public class MakePersistentNullArgs extends PersistenceManagerNullsTest {
-    
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(MakePersistentNullArgs.class);
-    }
-
-    static MethodUnderTest makePersistent = new MethodUnderTestMakePersistent();
-    static class MethodUnderTestMakePersistent extends MethodUnderTest {
-        public Object pmApiReturn(PersistenceManager pm, Object pc) {
-            return pm.makePersistent(pc);
-        }
-        public Collection pmApiReturn(PersistenceManager pm, Collection pcs) {
-            return pm.makePersistentAll(pcs);
-        }
-        public Object[] pmApiReturn(PersistenceManager pm, Object[] pcs) {
-            return pm.makePersistentAll(pcs);
-        }
-    };
-
-    /** 
-     * Test that makePersistent() with null valued argument does nothing.
-     */
-    public void testMakePersistentNullObject() {
-        executeNullObjectParameterReturn(makePersistent, "makePersistent(null)");
-    }
-
-    /** 
-     * Test that makePersistentAll() with null valued Collection argument
-     * throws NullPointerException.
-     */
-    public void testMakePersistentNullCollection() {
-        executeNullCollectionParameterReturn(makePersistent, 
-                "makePersistentAll((Collection)null)");
-    }
-
-    /** 
-     * Test that makePersistentAll() with null valued array argument
-     * throws NullPointerException.
-     */
-    public void testMakePersistentNullArray() {
-        executeNullArrayParameterReturn(makePersistent, 
-                "makePersistentAll((Array)null)");
-    }
-
-    /** 
-     * Test that makePersistentAll() with a null element of a 
-     * Collection argument throws NullPointerException.
-     */
-    public void testMakePersistentCollectionNullElement() {
-        executeCollectionNullElementReturn(collNullElem, makePersistent, 
-                "makePersistentAll(Collection)");
-    }
-
-    /** 
-     * Test that makePersistentAll() with a null element of a 
-     * array argument throws NullPointerException.
-     */
-    public void testMakePersistentArrayNullElement() {
-        executeArrayNullElementReturn(arrayNullElem, makePersistent, 
-                "makePersistentAll(Array)");
-    }
-
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
+
+import java.util.Collection;
+
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> makePersistent with Null Arguments
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
+ *<BR>
+ *<B>Assertion Description: </B>
+A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
+ */
+
+public class MakePersistentNullArgs extends PersistenceManagerNullsTest {
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(MakePersistentNullArgs.class);
+    }
+
+    static MethodUnderTest makePersistent = new MethodUnderTestMakePersistent();
+    static class MethodUnderTestMakePersistent extends MethodUnderTest {
+        public Object pmApiReturn(PersistenceManager pm, Object pc) {
+            return pm.makePersistent(pc);
+        }
+        public Collection pmApiReturn(PersistenceManager pm, Collection pcs) {
+            return pm.makePersistentAll(pcs);
+        }
+        public Object[] pmApiReturn(PersistenceManager pm, Object[] pcs) {
+            return pm.makePersistentAll(pcs);
+        }
+    };
+
+    /** 
+     * Test that makePersistent() with null valued argument does nothing.
+     */
+    public void testMakePersistentNullObject() {
+        executeNullObjectParameterReturn(makePersistent, "makePersistent(null)");
+    }
+
+    /** 
+     * Test that makePersistentAll() with null valued Collection argument
+     * throws NullPointerException.
+     */
+    public void testMakePersistentNullCollection() {
+        executeNullCollectionParameterReturn(makePersistent, 
+                "makePersistentAll((Collection)null)");
+    }
+
+    /** 
+     * Test that makePersistentAll() with null valued array argument
+     * throws NullPointerException.
+     */
+    public void testMakePersistentNullArray() {
+        executeNullArrayParameterReturn(makePersistent, 
+                "makePersistentAll((Array)null)");
+    }
+
+    /** 
+     * Test that makePersistentAll() with a null element of a 
+     * Collection argument throws NullPointerException.
+     */
+    public void testMakePersistentCollectionNullElement() {
+        executeCollectionNullElementReturn(collNullElem, makePersistent, 
+                "makePersistentAll(Collection)");
+    }
+
+    /** 
+     * Test that makePersistentAll() with a null element of a 
+     * array argument throws NullPointerException.
+     */
+    public void testMakePersistentArrayNullElement() {
+        executeArrayNullElementReturn(arrayNullElem, makePersistent, 
+                "makePersistentAll(Array)");
+    }
+
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java Fri Dec 29 14:18:40 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
-
-import java.util.Collection;
-
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> makeTransactional with Null Arguments
- *<BR>
- *<B>Keywords:</B>
- *<BR>
- *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
- *<BR>
- *<B>Assertion Description: </B>
-A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
- */
-
-public class MakeTransactionalNullArgs extends PersistenceManagerNullsTest {
-    
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(MakeTransactionalNullArgs.class);
-    }
-
-    static MethodUnderTest makeTransactional = 
-            new MethodUnderTestMakeTransactional();
-    static class MethodUnderTestMakeTransactional extends MethodUnderTest {
-        public void pmApi(PersistenceManager pm, Object pc) {
-            pm.makeTransactional(pc);
-        }
-        public void pmApi(PersistenceManager pm, Collection pcs) {
-            pm.makeTransactionalAll(pcs);
-        }
-        public void pmApi(PersistenceManager pm, Object[] pcs) {
-            pm.makeTransactionalAll(pcs);
-        }
-    };
-
-    /** 
-     * Test that makeTransactional() with null valued argument does nothing.
-     */
-    public void testMakeTransactionalNullObject() {
-        executeNullObjectParameter(makeTransactional, "makeTransactional(null)");
-    }
-
-    /** 
-     * Test that makeTransactionalAll() with null valued Collection argument
-     * throws NullPointerException.
-     */
-    public void testMakeTransactionalNullCollection() {
-        executeNullCollectionParameter(makeTransactional,
-                "makeTransactionalAll((Collection)null)");
-    }
-
-    /** 
-     * Test that makeTransactionalAll() with null valued array argument
-     * throws NullPointerException.
-     */
-    public void testMakeTransactionalNullArray() {
-        executeNullArrayParameter(makeTransactional, 
-                "makeTransactionalAll((Object[])null)");
-    }
-
-    /** 
-     * Test that makeTransactionalAll() with a null element of a 
-     * Collection argument throws NullPointerException.
-     */
-    public void testMakeTransactionalCollectionNullElement() {
-        executeCollectionNullElement(collNullElem, makeTransactional, 
-                "makeTransactionalAll(Collection)");
-    }
-
-    /** 
-     * Test that makeTransactionalAll() with a null element of a 
-     * array argument throws NullPointerException.
-     */
-    public void testMakeTransactionalArrayNullElement() {
-        executeArrayNullElement(arrayNullElem, makeTransactional, 
-                "makeTransactionalAll(Object[])");
-    }
-
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
+
+import java.util.Collection;
+
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> makeTransactional with Null Arguments
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
+ *<BR>
+ *<B>Assertion Description: </B>
+A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
+ */
+
+public class MakeTransactionalNullArgs extends PersistenceManagerNullsTest {
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(MakeTransactionalNullArgs.class);
+    }
+
+    static MethodUnderTest makeTransactional = 
+            new MethodUnderTestMakeTransactional();
+    static class MethodUnderTestMakeTransactional extends MethodUnderTest {
+        public void pmApi(PersistenceManager pm, Object pc) {
+            pm.makeTransactional(pc);
+        }
+        public void pmApi(PersistenceManager pm, Collection pcs) {
+            pm.makeTransactionalAll(pcs);
+        }
+        public void pmApi(PersistenceManager pm, Object[] pcs) {
+            pm.makeTransactionalAll(pcs);
+        }
+    };
+
+    /** 
+     * Test that makeTransactional() with null valued argument does nothing.
+     */
+    public void testMakeTransactionalNullObject() {
+        executeNullObjectParameter(makeTransactional, "makeTransactional(null)");
+    }
+
+    /** 
+     * Test that makeTransactionalAll() with null valued Collection argument
+     * throws NullPointerException.
+     */
+    public void testMakeTransactionalNullCollection() {
+        executeNullCollectionParameter(makeTransactional,
+                "makeTransactionalAll((Collection)null)");
+    }
+
+    /** 
+     * Test that makeTransactionalAll() with null valued array argument
+     * throws NullPointerException.
+     */
+    public void testMakeTransactionalNullArray() {
+        executeNullArrayParameter(makeTransactional, 
+                "makeTransactionalAll((Object[])null)");
+    }
+
+    /** 
+     * Test that makeTransactionalAll() with a null element of a 
+     * Collection argument throws NullPointerException.
+     */
+    public void testMakeTransactionalCollectionNullElement() {
+        executeCollectionNullElement(collNullElem, makeTransactional, 
+                "makeTransactionalAll(Collection)");
+    }
+
+    /** 
+     * Test that makeTransactionalAll() with a null element of a 
+     * array argument throws NullPointerException.
+     */
+    public void testMakeTransactionalArrayNullElement() {
+        executeArrayNullElement(arrayNullElem, makeTransactional, 
+                "makeTransactionalAll(Object[])");
+    }
+
+}

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java?view=diff&rev=491121&r1=491120&r2=491121
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java Fri Dec 29 14:18:40 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
-
-import java.util.Collection;
-
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> makeTransient with Null Arguments
- *<BR>
- *<B>Keywords:</B>
- *<BR>
- *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
- *<BR>
- *<B>Assertion Description: </B>
-A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
- */
-
-public class MakeTransientNullArgs extends PersistenceManagerNullsTest {
-    
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(MakeTransientNullArgs.class);
-    }
-
-    static MethodUnderTest makeTransient = 
-            new MethodUnderTestMakeTransient();
-    static class MethodUnderTestMakeTransient extends MethodUnderTest {
-        public void pmApi(PersistenceManager pm, Object pc) {
-            pm.makeTransient(pc);
-        }
-        public void pmApi(PersistenceManager pm, Collection pcs) {
-            pm.makeTransientAll(pcs);
-        }
-        public void pmApi(PersistenceManager pm, Object[] pcs) {
-            pm.makeTransientAll(pcs);
-        }
-    };
-
-    /** 
-     * Test that makeTransient() with null valued argument does nothing.
-     */
-    public void testMakeTransientNullObject() {
-        executeNullObjectParameter(makeTransient, "makeTransient(null)");
-    }
-
-    /** 
-     * Test that makeTransientAll() with null valued Collection argument
-     * throws NullPointerException.
-     */
-    public void testMakeTransientNullCollection() {
-        executeNullCollectionParameter(makeTransient,
-                "makeTransientAll((Collection)null)");
-    }
-
-    /** 
-     * Test that makeTransientAll() with null valued array argument
-     * throws NullPointerException.
-     */
-    public void testMakeTransientNullArray() {
-        executeNullArrayParameter(makeTransient, 
-                "makeTransientAll((Object[])null)");
-    }
-
-    /** 
-     * Test that makeTransientAll() with a null element of a 
-     * Collection argument throws NullPointerException.
-     */
-    public void testMakeTransientCollectionNullElement() {
-        executeCollectionNullElement(collNullElem, makeTransient, 
-                "makeTransientAll(Collection)");
-    }
-
-    /** 
-     * Test that makeTransientAll() with a null element of a 
-     * array argument throws NullPointerException.
-     */
-    public void testMakeTransientArrayNullElement() {
-        executeArrayNullElement(arrayNullElem, makeTransient, 
-                "makeTransientAll(Object[])");
-    }
-
-}
+/*
+ * Copyright 2005 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.jdo.tck.api.persistencemanager.nullargs;
+
+import java.util.Collection;
+
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> makeTransient with Null Arguments
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.3, A12.6.4, A12.6.5
+ *<BR>
+ *<B>Assertion Description: </B>
+A12.6-3 [Null arguments to APIs that take an Object parameter cause the API to have no effect.] A12.6-4 [Null arguments to APIs that take Object[] or Collection will cause the API to throw NullPointerException.] A12.6-5 [Non-null Object[] or Collection arguments that contain null elements will have the documented behavior for non-null elements, and the null elements will be ignored.]
+ */
+
+public class MakeTransientNullArgs extends PersistenceManagerNullsTest {
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(MakeTransientNullArgs.class);
+    }
+
+    static MethodUnderTest makeTransient = 
+            new MethodUnderTestMakeTransient();
+    static class MethodUnderTestMakeTransient extends MethodUnderTest {
+        public void pmApi(PersistenceManager pm, Object pc) {
+            pm.makeTransient(pc);
+        }
+        public void pmApi(PersistenceManager pm, Collection pcs) {
+            pm.makeTransientAll(pcs);
+        }
+        public void pmApi(PersistenceManager pm, Object[] pcs) {
+            pm.makeTransientAll(pcs);
+        }
+    };
+
+    /** 
+     * Test that makeTransient() with null valued argument does nothing.
+     */
+    public void testMakeTransientNullObject() {
+        executeNullObjectParameter(makeTransient, "makeTransient(null)");
+    }
+
+    /** 
+     * Test that makeTransientAll() with null valued Collection argument
+     * throws NullPointerException.
+     */
+    public void testMakeTransientNullCollection() {
+        executeNullCollectionParameter(makeTransient,
+                "makeTransientAll((Collection)null)");
+    }
+
+    /** 
+     * Test that makeTransientAll() with null valued array argument
+     * throws NullPointerException.
+     */
+    public void testMakeTransientNullArray() {
+        executeNullArrayParameter(makeTransient, 
+                "makeTransientAll((Object[])null)");
+    }
+
+    /** 
+     * Test that makeTransientAll() with a null element of a 
+     * Collection argument throws NullPointerException.
+     */
+    public void testMakeTransientCollectionNullElement() {
+        executeCollectionNullElement(collNullElem, makeTransient, 
+                "makeTransientAll(Collection)");
+    }
+
+    /** 
+     * Test that makeTransientAll() with a null element of a 
+     * array argument throws NullPointerException.
+     */
+    public void testMakeTransientArrayNullElement() {
+        executeArrayNullElement(arrayNullElem, makeTransient, 
+                "makeTransientAll(Object[])");
+    }
+
+}



Mime
View raw message