From bcfb4e9c8379ec26d2c86876cdf34edc37e1979c Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Thu, 26 Feb 2009 19:27:19 +0000 Subject: [PATCH] Remove @Allowfailure in lock manager tests after FinderCache fix. git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@748276 13f79535-47bb-0310-9956-ffa450edef68 --- .../lockmgr/TestJPA2LockManager.java | 24 ++++------ .../lockmgr/TestPessimisticLockManager.java | 46 ++++++++----------- 2 files changed, 30 insertions(+), 40 deletions(-) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java index 7342f6423..0a58b60e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestJPA2LockManager.java @@ -20,8 +20,6 @@ package org.apache.openjpa.persistence.lockmgr; 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 @@ public class TestJPA2LockManager extends LockManagerTestBase { ); } - // 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 @@ public class TestJPA2LockManager extends LockManagerTestBase { ); } - // 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; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java index 9146fb703..e4741feeb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLockManager.java @@ -20,8 +20,6 @@ package org.apache.openjpa.persistence.lockmgr; 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 @@ public class TestPessimisticLockManager extends LockManagerTestBase { ); } - // 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 @@ public class TestPessimisticLockManager extends LockManagerTestBase { ); } - // 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 @@ public class TestPessimisticLockManager extends LockManagerTestBase { ); } - // 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 @@ public class TestPessimisticLockManager extends LockManagerTestBase { ); } - // 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;