Author: jrbauer
Date: Wed Feb 22 22:46:51 2012
New Revision: 1292564
URL: http://svn.apache.org/viewvc?rev=1292564&view=rev
Log:
OPENJPA-2140 Update locking tests to use a unique pu name
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
openjpa/trunk/openjpa-persistence-locking/src/test/resources/META-INF/persistence.xml
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java
Wed Feb 22 22:46:51 2012
@@ -86,6 +86,11 @@ public abstract class LockScopeTestCase
protected Map<String, Object> normalProps;
protected Map<String, Object> extendedProps;
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
protected void commonSetUp(Class<?>... eClasses ) {
normalProps = new HashMap<String, Object>();
extendedProps = new HashMap<String, Object>();
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
Wed Feb 22 22:46:51 2012
@@ -81,6 +81,11 @@ public abstract class SequencedActionsTe
private String empTableName;
private List<TestThread> threads = null;
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
@SuppressWarnings("deprecation")
protected void commonSetUp() {
empTableName = getMapping(LockEmployee.class).getTable().getFullName();
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java
Wed Feb 22 22:46:51 2012
@@ -32,6 +32,11 @@ import org.apache.openjpa.persistence.te
public class TestLocking extends SQLListenerTestCase {
String _phone = "5075555555";
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
public void setUp() {
super.setUp(CLEAR_TABLES, Person.class, PhoneNumber.class
// ,"openjpa.Log", "SQL=trace"
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java
Wed Feb 22 22:46:51 2012
@@ -24,6 +24,12 @@ import javax.persistence.LockModeType;
* Test JPA 2.0 em.lock(LockMode) basic behaviors with "mixed" lock manager.
*/
public class TestMixedLockManagerLockBasic extends SequencedActionsTest {
+
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
public void setUp() {
setUp(LockEmployee.class
, "openjpa.LockManager", "mixed"
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
Wed Feb 22 22:46:51 2012
@@ -26,6 +26,12 @@ import javax.persistence.LockModeType;
* Test JPA 2.0 LockMode type permutation behaviors with "mixed" lock manager.
*/
public class TestMixedLockManagerLockPermutation extends SequencedActionsTest {
+
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
public void setUp() {
setUp(LockEmployee.class
, "openjpa.LockManager", "mixed"
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java
Wed Feb 22 22:46:51 2012
@@ -34,6 +34,11 @@ public class TestMixedLockManagerNonVers
private String empTableName;
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
public void setUp() {
setUp(LockEmployeeNonVersion.class
, "openjpa.LockManager", "mixed"
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java
Wed Feb 22 22:46:51 2012
@@ -40,6 +40,11 @@ import org.apache.openjpa.persistence.te
public class TestNamedQueryLockMode extends SQLListenerTestCase {
String lockClause = "FOR UPDATE";
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
public void setUp() {
super.setUp(CLEAR_TABLES, LockEmployee.class,
"openjpa.LockManager", "pessimistic",
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java
Wed Feb 22 22:46:51 2012
@@ -35,6 +35,11 @@ import org.apache.openjpa.persistence.te
public class TestOptimisticNamedQueryLockMode extends SQLListenerTestCase {
String lockClause = "FOR UPDATE";
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
public void setUp() {
super.setUp(CLEAR_TABLES, LockEmployee.class,
"openjpa.LockManager", "pessimistic"
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
Wed Feb 22 22:46:51 2012
@@ -56,6 +56,11 @@ public class TestPessimisticLocks extend
private DBDictionary dict = null;
private int lockWaitTime = 2000;
+ @Override
+ protected String getPersistenceUnitName() {
+ return "locking-test";
+ }
+
public void setUp() {
// Disable tests for any DB that has supportsQueryTimeout==false, like
Postgres
OpenJPAEntityManagerFactorySPI tempEMF = emf;
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/resources/META-INF/persistence.xml?rev=1292564&r1=1292563&r2=1292564&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-locking/src/test/resources/META-INF/persistence.xml
(original)
+++
openjpa/trunk/openjpa-persistence-locking/src/test/resources/META-INF/persistence.xml
Wed Feb 22 22:46:51 2012
@@ -20,7 +20,7 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
version="1.0">
- <persistence-unit name="test">
+ <persistence-unit name="locking-test">
<properties>
<!--
These properties are instead passed via System properties
