db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r703057 - in /db/jdo/branches/2.2/tck2/src: conf/iut-pmf.properties java/org/apache/jdo/tck/transactions/SetIsolationLevel.java
Date Thu, 09 Oct 2008 05:00:49 GMT
Author: mcaisse
Date: Wed Oct  8 22:00:49 2008
New Revision: 703057

URL: http://svn.apache.org/viewvc?rev=703057&view=rev
Log:
Fix test to match dn1.0.1 behavior. Make iut-pmf.properties match jdori-pmf properties so
that the RI runs out of the box as an iut.

Modified:
    db/jdo/branches/2.2/tck2/src/conf/iut-pmf.properties
    db/jdo/branches/2.2/tck2/src/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java

Modified: db/jdo/branches/2.2/tck2/src/conf/iut-pmf.properties
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.2/tck2/src/conf/iut-pmf.properties?rev=703057&r1=703056&r2=703057&view=diff
==============================================================================
--- db/jdo/branches/2.2/tck2/src/conf/iut-pmf.properties (original)
+++ db/jdo/branches/2.2/tck2/src/conf/iut-pmf.properties Wed Oct  8 22:00:49 2008
@@ -27,8 +27,8 @@
 javax.jdo.option.Optimistic=false
 javax.jdo.option.RetainValues=false
 javax.jdo.option.RestoreValues=false
-javax.jdo.option.Mapping=derby
 
+datanucleus.metadata.validate=false
 datanucleus.validateTables=false
 datanucleus.validateConstraints=false
 datanucleus.autoCreateSchema=false
@@ -37,5 +37,8 @@
 datanucleus.autoCreateColumns=false
 datanucleus.rdbms.CheckExistTablesOrViews=false
 datanucleus.autoStartMechanism=None
+#datanucleus.initializePrimaryKeyColumnInfo=true
 #datanucleus.connectionPoolingType=DBCP
 datanucleus.connectionPoolingType=C3P0
+datanucleus.implementationCreatorName=asm
+datanucleus.rdbms.omitDatabaseMetaDataGetColumns=true

Modified: db/jdo/branches/2.2/tck2/src/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.2/tck2/src/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java?rev=703057&r1=703056&r2=703057&view=diff
==============================================================================
--- db/jdo/branches/2.2/tck2/src/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java
(original)
+++ db/jdo/branches/2.2/tck2/src/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java
Wed Oct  8 22:00:49 2008
@@ -18,7 +18,7 @@
 package org.apache.jdo.tck.transactions;
 
 import javax.jdo.Constants;
-import javax.jdo.JDOUnsupportedOptionException;
+import javax.jdo.JDOUserException;
 import javax.jdo.Transaction;
 import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.util.BatchTestRunner;
@@ -94,12 +94,12 @@
                 appendMessage(ASSERTION_25_FAILED + 
                         "active datastore transaction; no exception thrown for "
                         + "setIsolationLevel(" + isolationLevel + ").");
-            } catch (JDOUnsupportedOptionException ex) {
+            } catch (JDOUserException ex) {
                 // good catch
             } catch (Throwable t) {
                 appendMessage(ASSERTION_25_FAILED + 
                         "active datastore transaction; " +
-                        "JDOUnsupportedOptionException not thrown for " +
+                        "JDOUserException not thrown for " +
                         "setIsolationLevel(" + isolationLevel +
                         "). Unexpected exception: \n" + t);
                 
@@ -150,14 +150,14 @@
                 // no exception thrown; bad
                 appendMessage(ASSERTION_29_FAILED
                         + "\nThe expected JDOUserException was not thrown.");           

-            } catch (JDOUnsupportedOptionException ex) {
+            } catch (JDOUserException ex) {
                 // good catch
                 return;
             } catch (Throwable t) {
                 // wrong exception thrown; bad
                 appendMessage(ASSERTION_29_FAILED +
                         "active datastore transaction; " +
-                        "JDOUnsupportedOptionException not thrown for " +
+                        "JDOJDOUserException not thrown for " +
                         "setIsolationLevel(" + level +
                         "). Unexpected exception: \n" + t);
                 return;



Mime
View raw message