You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2006/11/01 21:58:45 UTC
svn commit: r470100 - in
/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager:
cache/RefreshAllNoParameterSideEffects.java
cache/RefreshAllSideEffects.java nullargs/PersistenceManagerNullsTest.java
Author: mcaisse
Date: Wed Nov 1 12:58:45 2006
New Revision: 470100
URL: http://svn.apache.org/viewvc?view=rev&rev=470100
Log:
bugs
Modified:
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/cache/RefreshAllSideEffects.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
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=470100&r1=470099&r2=470100
==============================================================================
--- 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 Wed Nov 1 12:58:45 2006
@@ -128,13 +128,13 @@
tx2.begin();
VersionedPCPoint pnt2 = (VersionedPCPoint)pm2.getObjectById(oid);
pnt2.setX(22);
- pnt2.setY(Integer.valueOf(22));
+ pnt2.setY(Integer.valueOf("22"));
tx2.commit();
if (doRefresh)
pm1.refreshAll();
pnt1.setX(33);
- pnt1.setY(Integer.valueOf(33));
+ pnt1.setY(Integer.valueOf("33"));
try {
tx1.commit();
} catch (javax.jdo.JDOOptimisticVerificationException ove) {
@@ -152,7 +152,7 @@
VersionedPCPoint pntExpected = new VersionedPCPoint(33, 33);
if (!doRefresh) {
pntExpected.setX(22);
- pntExpected.setY(Integer.valueOf(22));
+ pntExpected.setY(Integer.valueOf("22"));
}
Transaction txVerify = pmVerify.currentTransaction();
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java?view=diff&rev=470100&r1=470099&r2=470100
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java Wed Nov 1 12:58:45 2006
@@ -145,8 +145,8 @@
Collection points2 = pm2.getObjectsById(oids);
((VersionedPCPoint)points2.toArray()[0]).setX(22);
((VersionedPCPoint)points2.toArray()[1]).setX(22);
- ((VersionedPCPoint)points2.toArray()[0]).setY(Integer.valueOf(22));
- ((VersionedPCPoint)points2.toArray()[1]).setY(Integer.valueOf(22));
+ ((VersionedPCPoint)points2.toArray()[0]).setY(Integer.valueOf("22"));
+ ((VersionedPCPoint)points2.toArray()[1]).setY(Integer.valueOf("22"));
tx2.commit();
if (doRefresh) {
@@ -156,8 +156,8 @@
}
((VersionedPCPoint)points1.toArray()[0]).setX(33);
((VersionedPCPoint)points1.toArray()[1]).setX(33);
- ((VersionedPCPoint)points1.toArray()[0]).setY(Integer.valueOf(33));
- ((VersionedPCPoint)points1.toArray()[1]).setY(Integer.valueOf(33));
+ ((VersionedPCPoint)points1.toArray()[0]).setY(Integer.valueOf("33"));
+ ((VersionedPCPoint)points1.toArray()[1]).setY(Integer.valueOf("33"));
try {
tx1.commit();
} catch (javax.jdo.JDOOptimisticVerificationException ove) {
@@ -175,7 +175,7 @@
VersionedPCPoint pntExpected = new VersionedPCPoint(33, 33);
if (!doRefresh) {
pntExpected.setX(22);
- pntExpected.setY(Integer.valueOf(22));
+ pntExpected.setY(Integer.valueOf("22"));
}
Transaction txVerify = pmVerify.currentTransaction();
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java?view=diff&rev=470100&r1=470099&r2=470100
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java Wed Nov 1 12:58:45 2006
@@ -528,8 +528,9 @@
if (!checkReturn(expectedArray, returnVal))
fail(ASSERTION5_FAILED,
method + " returns incorrect Object. Expected "
- + Arrays.toString(expectedArray) + " actual was "
- + Arrays.toString(returnVal));
+ + Arrays.asList(expectedArray).toString()
+ + " actual was "
+ + Arrays.asList(returnVal).toString());
tx.commit();
} finally {