Author: allee8285
Date: Thu Feb 26 19:27:19 2009
New Revision: 748276
URL: http://svn.apache.org/viewvc?rev=748276&view=rev
Log:
Remove @Allowfailure in lock manager tests after FinderCache fix.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java?rev=748276&r1=748275&r2=748276&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java
Thu Feb 26 19:27:19 2009
@@ -20,8 +20,6 @@
import javax.persistence.LockModeType;
-import org.apache.openjpa.persistence.test.AllowFailure;
-
/**
* Test JPA 2.0 LockMode type behaviors with "jpa2" lock manager.
*/
@@ -824,12 +822,11 @@
);
}
- // TODO:
- @AllowFailure(message="OPENJPA-924 is preventing RR behavior: pessimistic
lock "
- + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
- + "with pre-thread 1 committed data. hence causing an "
- + "OptimisticLockException. Disable FinderCache to workaround the "
- + "problem.")
+// @AllowFailure(message="OPENJPA-924 is preventing RR behavior:
pessimistic lock "
+// + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
+// + "with pre-thread 1 committed data. hence causing an "
+// + "OptimisticLockException. Disable FinderCache to workaround the "
+// + "problem.")
public void testConcurrentThread1PessimisticReadTest() {
getLog().info("---> testConcurrentThread1PessimisticReadTest()");
String baseFirstName;
@@ -1191,12 +1188,11 @@
);
}
- // TODO:
- @AllowFailure(message="OPENJPA-924 is preventing RR behavior: pessimistic
lock "
- + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
- + "with pre-thread 1 committed data. hence causing an "
- + "OptimisticLockException. Disable FinderCache to workaround the "
- + "problem.")
+// @AllowFailure(message="OPENJPA-924 is preventing RR behavior:
pessimistic lock "
+// + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
+// + "with pre-thread 1 committed data. hence causing an "
+// + "OptimisticLockException. Disable FinderCache to workaround the "
+// + "problem.")
public void testConcurrentThread1PessimisticForceIncTest() {
getLog().info("---> testConcurrentThread1PessimisticForceIncTest()");
String baseFirstName;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java?rev=748276&r1=748275&r2=748276&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java
Thu Feb 26 19:27:19 2009
@@ -20,8 +20,6 @@
import javax.persistence.LockModeType;
-import org.apache.openjpa.persistence.test.AllowFailure;
-
/**
* Test JPA 2.0 LockTypeMode semantics using OpenJPA pessimistic
* "pessimistic" lock manager.
@@ -132,12 +130,11 @@
);
}
- // TODO:
- @AllowFailure(message="OPENJPA-924 is preventing RR behavior: pessimistic
lock "
- + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
- + "with pre-thread 1 committed data. hence causing an "
- + "OptimisticLockException. Disable FinderCache to workaround the "
- + "problem.")
+// @AllowFailure(message="OPENJPA-924 is preventing RR behavior:
pessimistic lock "
+// + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
+// + "with pre-thread 1 committed data. hence causing an "
+// + "OptimisticLockException. Disable FinderCache to workaround the "
+// + "problem.")
public void testConcurrentThread1ReadTest() {
getLog().info("---> testConcurrentThread1ReadTest()");
String baseFirstName;
@@ -487,12 +484,11 @@
);
}
- // TODO:
- @AllowFailure(message="OPENJPA-924 is preventing RR behavior: pessimistic
lock "
- + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
- + "with pre-thread 1 committed data. hence causing an "
- + "OptimisticLockException. Disable FinderCache to workaround the "
- + "problem.")
+// @AllowFailure(message="OPENJPA-924 is preventing RR behavior:
pessimistic lock "
+// + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
+// + "with pre-thread 1 committed data. hence causing an "
+// + "OptimisticLockException. Disable FinderCache to workaround the "
+// + "problem.")
public void testConcurrentThread1WriteTest() {
getLog().info("---> testConcurrentThread1WriteTest()");
String baseFirstName;
@@ -842,12 +838,11 @@
);
}
- // TODO:
- @AllowFailure(message="OPENJPA-924 is preventing RR behavior: pessimistic
lock "
- + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
- + "with pre-thread 1 committed data. hence causing an "
- + "OptimisticLockException. Disable FinderCache to workaround the "
- + "problem.")
+// @AllowFailure(message="OPENJPA-924 is preventing RR behavior:
pessimistic lock "
+// + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
+// + "with pre-thread 1 committed data. hence causing an "
+// + "OptimisticLockException. Disable FinderCache to workaround the "
+// + "problem.")
public void testConcurrentThread1PessimisticReadTest() {
getLog().info("---> testConcurrentThread1PessimisticReadTest()");
String baseFirstName;
@@ -1209,12 +1204,11 @@
);
}
- // TODO:
- @AllowFailure(message="OPENJPA-924 is preventing RR behavior: pessimistic
lock "
- + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
- + "with pre-thread 1 committed data. hence causing an "
- + "OptimisticLockException. Disable FinderCache to workaround the "
- + "problem.")
+// @AllowFailure(message="OPENJPA-924 is preventing RR behavior:
pessimistic lock "
+// + "blocked read on thread 2, once thread-1 commit, thread-2 returns "
+// + "with pre-thread 1 committed data. hence causing an "
+// + "OptimisticLockException. Disable FinderCache to workaround the "
+// + "problem.")
public void testConcurrentThread1PessimisticForceIncTest() {
getLog().info("---> testConcurrentThread1PessimisticForceIncTest()");
String baseFirstName;