You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ma...@apache.org on 2011/07/05 18:32:30 UTC
svn commit: r1143131 -
/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
Author: mahrwald
Date: Tue Jul 5 16:32:29 2011
New Revision: 1143131
URL: http://svn.apache.org/viewvc?rev=1143131&view=rev
Log:
ARIES-691: Remove TODOs that actually have been fixed two commits back :)
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java?rev=1143131&r1=1143130&r2=1143131&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java Tue Jul 5 16:32:29 2011
@@ -154,6 +154,8 @@ public abstract class JPAContextTest {
ensureTREBehaviour(false, managedEm, "setProperty", "hi", new Object());
ensureTREBehaviour(false, managedEm, "unwrap", Object.class);
+ // now test that with a transaction actually active we don't get *any* TransactionRequiredExceptions
+
UserTransaction ut = getOsgiService(UserTransaction.class);
ut.begin();
@@ -165,20 +167,11 @@ public abstract class JPAContextTest {
ensureTREBehaviour(false, managedEm, "createNativeQuery", "hi", "hi");
ensureTREBehaviour(false, managedEm, "createQuery", "hi");
ensureTREBehaviour(false, managedEm, "find", Object.class, new Object());
-
- // TODO sort out the correct behaviour:
- // OpenJpa false, EclipseLink true
- // ensureTREBehaviour(false, managedEm, "flush");
-
-
+ ensureTREBehaviour(false, managedEm, "flush");
ensureTREBehaviour(false, managedEm, "getDelegate");
ensureTREBehaviour(false, managedEm, "getFlushMode");
ensureTREBehaviour(false, managedEm, "getReference", Object.class, new Object());
-
- // TODO sort out the correct behaviour
- // OpenJPA false, EclipseLink true
- // ensureTREBehaviour(false, managedEm, "lock", new Object(), LockModeType.NONE);
-
+ ensureTREBehaviour(false, managedEm, "lock", new Object(), LockModeType.NONE);
ensureTREBehaviour(false, managedEm, "merge", new Object());
ensureTREBehaviour(false, managedEm, "persist", new Object());
ensureTREBehaviour(false, managedEm, "refresh", new Object());
@@ -206,11 +199,7 @@ public abstract class JPAContextTest {
ensureTREBehaviour(false, managedEm, "getLockMode", new Object());
ensureTREBehaviour(false, managedEm, "getMetamodel");
ensureTREBehaviour(false, managedEm, "getProperties");
-
- // TODO sort out the correct behaviour
- // OpenJPA false, EclipseLink true
- // ensureTREBehaviour(false, managedEm, "lock", new Object(), LockModeType.NONE, new HashMap());
-
+ ensureTREBehaviour(false, managedEm, "lock", new Object(), LockModeType.NONE, new HashMap());
ensureTREBehaviour(false, managedEm, "refresh", new Object(), new HashMap());
ensureTREBehaviour(false, managedEm, "refresh", new Object(), LockModeType.NONE);
ensureTREBehaviour(false, managedEm, "refresh", new Object(), LockModeType.NONE, new HashMap());