You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jr...@apache.org on 2009/03/27 21:58:11 UTC
svn commit: r759348 [1/4] - in /openjpa/trunk: ./
openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/
openjpa-persistence-jdbc/src/test/java/org/apach...
Author: jrbauer
Date: Fri Mar 27 20:58:10 2009
New Revision: 759348
URL: http://svn.apache.org/viewvc?rev=759348&view=rev
Log:
OPENJPA-773 Updates for 03/13/2009 JSR-317 public draft.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindBasicTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindExceptionTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindPermutationTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockBasicTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockExceptionTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockPermutationTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshBasicTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshExceptionTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshPermutationTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/embed-orm.xml
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/order/order-orm-2.xml
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/order/order-orm.xml
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java Fri Mar 27 20:58:10 2009
@@ -1782,8 +1782,6 @@
col.setFlag(Column.FLAG_UNUPDATABLE, !order.updatable());
if (!StringUtils.isEmpty(order.table()))
col.setTableName(order.table());
- col.setBase(order.base());
- col.setContiguous(order.contiguous());
fm.getMappingInfo().setOrderColumn(col);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java Fri Mar 27 20:58:10 2009
@@ -28,7 +28,7 @@
@Id
private long id;
private String name;
- @OneToOne(cascade=(CascadeType.CLEAR))
+ @OneToOne(cascade=(CascadeType.DETACH))
private Entity5 e5;
public Entity4() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java Fri Mar 27 20:58:10 2009
@@ -28,7 +28,7 @@
@Id
private long id;
private String name;
- @OneToOne(cascade=(CascadeType.CLEAR))
+ @OneToOne(cascade=(CascadeType.DETACH))
private Entity7 e7;
public Entity6() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java Fri Mar 27 20:58:10 2009
@@ -151,7 +151,7 @@
em.persistAll(allEntities);
assertTrue(em.contains(e1));
assertTrue(em.contains(e14));
- em.clear(e1);
+ em.detach(e1);
assertFalse(em.contains(e1));
assertTrue(em.contains(e14));
em.getTransaction().commit();
@@ -168,7 +168,7 @@
compat.setCascadeWithDetach(true);
- em.clear(e1);
+ em.detach(e1);
assertFalse(em.contains(e1));
assertFalse(em.contains(e14));
em.getTransaction().commit();
@@ -185,7 +185,7 @@
em.persistAll(allEntities);
assertTrue(em.contains(e3));
assertTrue(em.contains(e4));
- em.clear(e3);
+ em.detach(e3);
assertTrue(em.contains(e1));
assertFalse(em.contains(e3));
assertFalse(em.contains(e4));
@@ -204,7 +204,7 @@
assertTrue(em.contains(e3));
assertTrue(em.contains(e4));
compat.setCascadeWithDetach(true);
- em.clear(e3);
+ em.detach(e3);
assertTrue(em.contains(e1));
assertFalse(em.contains(e3));
assertFalse(em.contains(e4));
@@ -234,7 +234,7 @@
assertTrue(em.contains(e3));
assertFalse(em.contains(e4));
em.getTransaction().commit();
- em.clear(e3);
+ em.detach(e3);
assertFalse(em.contains(e3));
assertFalse(em.contains(e4));
}
@@ -249,7 +249,7 @@
assertTrue(em.contains(e8));
assertTrue(em.contains(e9));
assertTrue(em.contains(e8a));
- em.clear(e10);
+ em.detach(e10);
assertFalse(em.contains(e10));
assertFalse(em.contains(e8));
assertFalse(em.contains(e9));
@@ -265,7 +265,7 @@
em.persistAll(allEntities);
assertTrue(em.contains(e11));
assertTrue(em.contains(e13));
- em.clear(e13);
+ em.detach(e13);
assertFalse(em.contains(e13));
assertFalse(em.contains(e11));
em.getTransaction().commit();
@@ -274,14 +274,12 @@
// Test old detach behavior - flush, copy, and cascade
public void testOldDetachBehavior() {
id++;
- compat.setCascadeWithDetach(true);
- compat.setCopyOnDetach(true);
compat.setFlushBeforeDetach(true);
em.getTransaction().begin();
create(id);
em.persistAll(allEntities);
- Entity1 e1Det = em.detach(e1);
+ Entity1 e1Det = em.detachCopy(e1);
assertNotEquals(e1, e1Det); // check for copy
Entity14 e14Det = e1.getE14();
assertEquals(e14, e14Det);
@@ -293,8 +291,6 @@
Entity14 e14Saved = e1Saved.getE14();
assertNotNull(e14Saved);
- compat.setCascadeWithDetach(false);
- compat.setCopyOnDetach(false);
compat.setFlushBeforeDetach(false);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java Fri Mar 27 20:58:10 2009
@@ -106,7 +106,7 @@
create(id);
em.persistAll(allEntities);
assertTrue(em.contains(e1));
- em.clear(e1);
+ em.detach(e1);
assertFalse(em.contains(e1));
assertTrue(em.contains(e14));
assertTrue(em.contains(e7));
@@ -120,7 +120,7 @@
em.getTransaction().begin();
create(id);
assertFalse(em.contains(e1));
- em.clear(e1);
+ em.detach(e1);
em.persistAll(allEntities);
assertTrue(em.contains(e1));
em.getTransaction().commit();
@@ -138,7 +138,7 @@
e1 = em.find(Entity1.class, id);
assertEquals("entity1",e1.getName());
e1.setName("new name");
- em.clear(e1);
+ em.detach(e1);
em.getTransaction().commit();
em.getTransaction().begin();
@@ -161,7 +161,7 @@
em.getTransaction().begin();
e1 = em.find(Entity1.class, id);
em.remove(e1);
- em.clear(e1);
+ em.detach(e1);
em.getTransaction().commit();
em.getTransaction().begin();
@@ -178,8 +178,8 @@
em.getTransaction().begin();
create(id);
em.persist(e1);
- em.clear(e1);
- em.clear(e1);
+ em.detach(e1);
+ em.detach(e1);
assertFalse(em.contains(e1));
em.getTransaction().commit();
}
@@ -190,12 +190,20 @@
em.getTransaction().begin();
create(id);
em.persist(e1);
- Entity1 e1Det = em.detach(e1);
- assertEquals(e1, e1Det);
+ Entity14 e14PreDetach = e1.getE14();
+
+ // Flip on cascade to detach e14
+ compat.setCascadeWithDetach(true);
+
+ em.detach(e1);
+ // Assert that e14 was not copied on detachment
+ assertEquals(e14, e14PreDetach);
assertFalse(em.contains(e1));
- assertTrue(em.contains(e14));
+ assertFalse(em.contains(e14));
em.getTransaction().commit();
- }
+
+ compat.setCascadeWithDetach(false);
+}
// Change copy option and validate
public void testCopy() {
@@ -204,9 +212,7 @@
create(id);
em.persist(e1);
- compat.setCopyOnDetach(true);
-
- Entity1 e1Det = em.detach(e1);
+ Entity1 e1Det = em.detachCopy(e1);
assertNotEquals(e1, e1Det);
assertTrue(em.contains(e1));
em.getTransaction().commit();
@@ -228,7 +234,7 @@
e1 = em.find(Entity1.class, id);
assertEquals("entity1",e1.getName());
e1.setName("new name");
- em.clear(e1);
+ em.detach(e1);
em.getTransaction().commit();
em.getTransaction().begin();
@@ -246,7 +252,7 @@
em.getTransaction().begin();
create(id);
em.persistAll(allEntities);
- em.clear(e1);
+ em.detach(e1);
em.merge(e1);
em.getTransaction().commit();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java Fri Mar 27 20:58:10 2009
@@ -104,17 +104,17 @@
assertTrue(em.contains(eD));
EntityE eE = em.find(EntityE.class, id); // Load independently
assertTrue(em.contains(eE));
- EntityA entityADet = em.detach(eA);
- assertEquals(id, entityADet.getId());
- assertEquals("entityA", entityADet.getName());
- assertNull(entityADet.getDescription()); // should not be loaded
- assertNotNull(entityADet.getEntityB());
- assertNotNull(entityADet.getEntityC());
- assertNull(entityADet.getEntityD());
- assertNull(entityADet.getEntityE());
+ em.detach(eA);
+ assertEquals(id, eA.getId());
+ assertEquals("entityA", eA.getName());
+ assertNull(eA.getDescription()); // should not be loaded
+ assertNotNull(eA.getEntityB());
+ assertNotNull(eA.getEntityC());
+ assertNull(eA.getEntityD());
+ assertNull(eA.getEntityE());
assertTrue(em.isDetached(eA));
- assertTrue(em.isDetached(entityADet.getEntityB()));
- assertFalse(em.isDetached(entityADet.getEntityC()));
+ assertTrue(em.isDetached(eA.getEntityB()));
+ assertFalse(em.isDetached(eA.getEntityC()));
assertFalse(em.isDetached(eD));
assertFalse(em.isDetached(eE));
em.getTransaction().commit();
@@ -135,19 +135,19 @@
em.clear();
EntityA eA = em.find(EntityA.class, id);
assertTrue(em.contains(eA));
- EntityA entityADet = em.detach(eA);
- assertEquals(id, entityADet.getId());
- assertEquals("entityA", entityADet.getName());
- assertNotNull(entityADet.getDescription());
- assertNotNull(entityADet.getEntityB());
- assertNotNull(entityADet.getEntityC());
- assertNotNull(entityADet.getEntityD());
- assertNotNull(entityADet.getEntityE());
+ em.detach(eA);
+ assertEquals(id, eA.getId());
+ assertEquals("entityA", eA.getName());
+ assertNotNull(eA.getDescription());
+ assertNotNull(eA.getEntityB());
+ assertNotNull(eA.getEntityC());
+ assertNotNull(eA.getEntityD());
+ assertNotNull(eA.getEntityE());
assertTrue(em.isDetached(eA));
- assertTrue(em.isDetached(entityADet.getEntityB()));
- assertFalse(em.isDetached(entityADet.getEntityC()));
- assertTrue(em.isDetached(entityADet.getEntityD()));
- assertFalse(em.isDetached(entityADet.getEntityE()));
+ assertTrue(em.isDetached(eA.getEntityB()));
+ assertFalse(em.isDetached(eA.getEntityC()));
+ assertTrue(em.isDetached(eA.getEntityD()));
+ assertFalse(em.isDetached(eA.getEntityE()));
em.getTransaction().commit();
}
@@ -170,18 +170,18 @@
assertTrue(em.contains(eA));
EntityE eE = em.find(EntityE.class, id); // Load independently
assertTrue(em.contains(eE));
- EntityA entityADet = em.detach(eA);
- assertEquals(id, entityADet.getId());
- assertEquals("entityA", entityADet.getName());
- assertNull(entityADet.getDescription());
- assertNotNull(entityADet.getEntityB());
- assertNotNull(entityADet.getEntityC());
- assertNotNull(entityADet.getEntityD());
- assertNull(entityADet.getEntityE());
+ em.detach(eA);
+ assertEquals(id, eA.getId());
+ assertEquals("entityA", eA.getName());
+ assertNull(eA.getDescription());
+ assertNotNull(eA.getEntityB());
+ assertNotNull(eA.getEntityC());
+ assertNotNull(eA.getEntityD());
+ assertNull(eA.getEntityE());
assertTrue(em.isDetached(eA));
- assertTrue(em.isDetached(entityADet.getEntityB()));
- assertFalse(em.isDetached(entityADet.getEntityC()));
- assertTrue(em.isDetached(entityADet.getEntityD()));
+ assertTrue(em.isDetached(eA.getEntityB()));
+ assertFalse(em.isDetached(eA.getEntityC()));
+ assertTrue(em.isDetached(eA.getEntityD()));
assertFalse(em.isDetached(eE));
em.getTransaction().commit();
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java Fri Mar 27 20:58:10 2009
@@ -66,7 +66,7 @@
for (DMCustomerInventory i : inventories) assertNotDetached(i);
assertNotDetached(item);
- em.clear(pc);
+ em.detach(pc);
assertDetached(pc);
for (DMCustomerInventory i : inventories) assertDetached(i);
@@ -82,7 +82,7 @@
String original = pc.getLastName();
pc.setLastName("Changed That Should not be Saved");
- em.clear(pc);
+ em.detach(pc);
em.getTransaction().commit();
DMCustomer pc2 = em.find(DMCustomer.class, root.getId());
@@ -100,7 +100,7 @@
for (DMCustomerInventory inventory : inventories)
inventory.setCustomer(newPC);
- em.clear(newPC);
+ em.detach(newPC);
for (DMCustomerInventory inventory : inventories) {
assertNotDetached(inventory);
}
@@ -112,7 +112,7 @@
DMCustomer pc = em.find(DMCustomer.class, root.getId());
List<DMCustomerInventory> inventories = pc.getCustomerInventories();
- em.clear(pc);
+ em.detach(pc);
DMCustomer detached = pc;
assertDetached(detached);
for (DMCustomerInventory inventory : inventories) {
@@ -128,7 +128,7 @@
em.persist(newInventory);
assertNotDetached(newInventory);
- em.clear(detached);
+ em.detach(detached);
assertDetached(detached);
assertEquals(inventories.size()+1, newInventories.size());
for (DMCustomerInventory inventory : newInventories) {
@@ -152,7 +152,7 @@
List<DMCustomerInventory> inventories = pc.getCustomerInventories();
DMItem item = inventories.get(1).getItem();
- em.clear(inventories.get(0));
+ em.detach(inventories.get(0));
DMCustomerInventory attached0 = inventories.get(0);
DMCustomerInventory attached1 = inventories.get(1);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java Fri Mar 27 20:58:10 2009
@@ -521,71 +521,7 @@
}
/*
- * Validates the use of the contiguous attribute on OrderColumn with
- * value true.
- * For now only the order column metadata is validated. Since most tests
- * assume the default of true no additional testing is necessary. If
- * contiguous gets removed from the spec, this test will need to be removed.
- */
- public void testOrderColumnContiguousTrue() {
-
- OpenJPAEntityManagerFactorySPI emf1 =
- (OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.
- createEntityManagerFactory("BaseTest",
- "org/apache/openjpa/persistence/jdbc/order/" +
- "order-persistence.xml");
-
- validateOrderColumnContiguous(emf1, BaseTestEntity.class,
- "one2Melems", true);
-
- validateOrderColumnContiguous(emf1, BaseTestEntity.class,
- "collelems", true);
-
- validateOrderColumnContiguous(emf1, BaseTestEntity.class,
- "m2melems", true);
-
- try {
- if (emf1 != null)
- cleanupEMF(emf1);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-
- /*
- * Validates the use of the contiguous attribute on OrderColumn with
- * value false.
- * For now only the order column metadata is validated. If/when this
- * solidifies in the spec several new tests will need to be added. If
- * contiguous gets removed this test needs to be removed.
- */
- public void testOrderColumnContiguousFalse() {
-
- OpenJPAEntityManagerFactorySPI emf1 =
- (OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.
- createEntityManagerFactory("ColDefTest",
- "org/apache/openjpa/persistence/jdbc/order/" +
- "order-persistence-2.xml");
-
- validateOrderColumnContiguous(emf1, ColDefTestEntity.class,
- "one2Mcoldef", true);
-
- validateOrderColumnContiguous(emf1, ColDefTestEntity.class,
- "collcoldef", true);
-
- validateOrderColumnContiguous(emf1, ColDefTestEntity.class,
- "m2mcoldef", true);
-
- try {
- if (emf1 != null)
- cleanupEMF(emf1);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-
- /*
- * Validates the use of the base attribute on OrderColumn
+ * Validates the default base value on OrderColumn
*/
public void testOrderColumnBase() {
@@ -615,19 +551,19 @@
elems[i] = new BaseTestElement("Element " + elemnum);
}
- // Add to element collection with base value 10
+ // Add to element collection with base value 0
Set<BaseTestElement> elemset = new LinkedHashSet<BaseTestElement>();
for (int i = 0; i < 3; i++)
elemset.add(elems[i]);
bte.setCollelems(elemset);
- // Add to OneToMany with base value 10000
+ // Add to OneToMany with base value 0
List<BaseTestElement> elemList = new ArrayList<BaseTestElement>();
for (int i = 0; i < 3; i++)
elemList.add(elems[i + 3]);
bte.setOne2Melems(elemList);
- // Add to ManyToMany, base value -50
+ // Add to ManyToMany, base value 0
List<BaseTestElement> elemList2 = new ArrayList<BaseTestElement>();
for (int i = 0; i < 3; i++)
elemList2.add(elems[i + 6]);
@@ -639,17 +575,17 @@
// Do a projection query to verify the base values
- validateIndexAndValues(em, "BaseTestEntity", "one2Melems", 10000,
+ validateIndexAndValues(em, "BaseTestEntity", "one2Melems", 0,
new Object[] { elems[3], elems[4], elems[5]}, "id",
bte.getId());
- validateIndexAndValues(em, "BaseTestEntity", "m2melems", -50,
+ validateIndexAndValues(em, "BaseTestEntity", "m2melems", 0,
new Object[] { elems[6], elems[7], elems[8]}, "id",
bte.getId());
// This validator is disabled until INDEX projection supports element
// collections
-// validateIndexAndValues(em, "BaseTestEntity", "collelems", 10,
+// validateIndexAndValues(em, "BaseTestEntity", "collelems", 0,
// new Object[] { elems[0], elems[1], elems[2]} "id",
// bte.getId());
@@ -921,19 +857,19 @@
Column oc = fm.getOrderColumn();
assertNotNull(oc);
assertEquals(oc.getName(),"one2MOrder");
- assertEquals(oc.getBase(), 10000);
+ assertEquals(oc.getBase(), 0);
fm = (FieldMapping)_entityMeta2.getField("m2melems");
oc = fm.getOrderColumn();
assertNotNull(oc);
assertEquals(oc.getName(),"m2morder");
- assertEquals(oc.getBase(), -50);
+ assertEquals(oc.getBase(), 0);
fm = (FieldMapping)_entityMeta2.getField("collelems");
oc = fm.getOrderColumn();
assertNotNull(oc);
assertEquals(oc.getName(),"collelems_ORDER");
- assertEquals(oc.getBase(), 10);
+ assertEquals(oc.getBase(), 0);
try {
if (emf1 != null)
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java Fri Mar 27 20:58:10 2009
@@ -92,7 +92,7 @@
pm = getPM();
c2 = (CalendarFields) pm.find(CalendarFields.class, id2);
assertTimeZonesEquals(c1, c2);
- assertTimeZonesEquals(c1, (CalendarFields) pm.detach(c2));
+ assertTimeZonesEquals(c1, (CalendarFields) pm.detachCopy(c2));
endEm(pm);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java Fri Mar 27 20:58:10 2009
@@ -531,7 +531,7 @@
assertEquals(2, owner.getDependentMappedList().size());
else
assertEquals(2, owner.getDependentInverseKeyList().size());
- DependentFieldsPC detached = (DependentFieldsPC) pm.detach(owner);
+ DependentFieldsPC detached = (DependentFieldsPC) pm.detachCopy(owner);
endEm(pm);
if (mapped) {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java Fri Mar 27 20:58:10 2009
@@ -104,7 +104,7 @@
assertNotNull("b is null in testDetach", b);
- b = (AttachB) pm.detach(b);
+ b = (AttachB) pm.detachCopy(b);
endEm(pm);
assertTrue(pm.isDetached(b));
@@ -147,7 +147,7 @@
assertNotNull("b is null in testDetachWithGroups", b);
- b = (AttachB) pm.detach(b);
+ b = (AttachB) pm.detachCopy(b);
endEm(pm);
assertTrue(pm.isDetached(b));
@@ -186,7 +186,7 @@
public void testDetachNoOverwrite() {
OpenJPAEntityManager pm = getPM();
AttachB b = (AttachB) pm.find(AttachB.class, oid);
- b = (AttachB) pm.detach(b);
+ b = (AttachB) pm.detachCopy(b);
endEm(pm);
b.setBstr("12");
@@ -216,7 +216,7 @@
assertNotNull("b is null in testOptimisticLock", b);
- b = (AttachB) pm.detach(b);
+ b = (AttachB) pm.detachCopy(b);
endEm(pm);
b.setAint(12);
@@ -251,7 +251,7 @@
assertNotNull("d is null in testEmbedded", d);
d.getEmbeddedE().getEstr();
- d = (AttachD) pm.detach(d);
+ d = (AttachD) pm.detachCopy(d);
endEm(pm);
d.getEmbeddedE().setEstr("E12");
@@ -280,7 +280,7 @@
assertNotNull("d is null in testNullEmbedded", d);
d.getEmbeddedE().getEstr();
- d = (AttachD) pm.detach(d);
+ d = (AttachD) pm.detachCopy(d);
endEm(pm);
d.setEmbeddedE(null);
@@ -310,7 +310,7 @@
assertNotNull("d is null in testNullEmbeddedRelated", d);
d.getEmbeddedE().getEstr();
- d = (AttachD) pm.detach(d);
+ d = (AttachD) pm.detachCopy(d);
endEm(pm);
d.getEmbeddedE().setEstr(null);
@@ -337,7 +337,7 @@
OpenJPAEntityManager pm = getPM();
AttachB b = (AttachB) pm.find(AttachB.class, oid);
b.getDs();
- b = (AttachB) pm.detach(b);
+ b = (AttachB) pm.detachCopy(b);
endEm(pm);
assertEquals(1, b.getDs().size());
@@ -370,7 +370,7 @@
assertNotNull("b is null in doCollectionTest", b);
b.getDs();
- b = (AttachB) pm.detach(b);
+ b = (AttachB) pm.detachCopy(b);
endEm(pm);
assertEquals("b is null in doCollectionTest", 1, b.getDs().size());
@@ -465,7 +465,7 @@
pc.getRelSet();
pc.getStringIntMap();
if (!auto) {
- pc = (DetachSMPC) pm.detach(pc);
+ pc = (DetachSMPC) pm.detachCopy(pc);
assertDetachedSM(pc);
}
pc = (DetachSMPC) roundtrip(pc, false);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java Fri Mar 27 20:58:10 2009
@@ -431,7 +431,7 @@
PCCompany company1 =
(PCCompany) pm.find(PCCompany.class, _rootCompanyId);
- PCCompany company = (PCCompany) pm.detach(company1);
+ PCCompany company = (PCCompany) pm.detachCopy(company1);
assertTrue("company is equal company1", company != company1);
Set departments = (Set) PCCompany.reflect(company, "departments");
assertNotNull("department is null", departments);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java Fri Mar 27 20:58:10 2009
@@ -224,7 +224,7 @@
throws Exception {
OpenJPAEntityManager pm1 = getPM(false, false);
LockGroupPC pc1 = (LockGroupPC) pm1.find(LockGroupPC.class, oid);
- Object detached = pm1.detach(pc1);
+ Object detached = pm1.detachCopy(pc1);
startTx(pm1);
pc1.setLockGroup0IntField(1);
pc1.setUnlockedStringField("pm1 changed value");
@@ -259,7 +259,7 @@
throws Exception {
OpenJPAEntityManager pm1 = getPM(false, false);
LockGroupPC pc1 = (LockGroupPC) pm1.find(LockGroupPC.class, oid);
- Object detached = pm1.detach(pc1);
+ Object detached = pm1.detachCopy(pc1);
startTx(pm1);
pc1.setLockGroup0IntField(1);
endTx(pm1);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindBasicTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindBasicTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindBasicTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindBasicTest.java Fri Mar 27 20:58:10 2009
@@ -53,12 +53,12 @@
public void testFindPessimisticRead() {
testCommon("testFindPessimisticRead",
- LockModeType.PESSIMISTIC/* _READ */, 0, 1);
+ LockModeType.PESSIMISTIC_READ, 0, 1);
}
public void testFindPessimisticWrite() {
testCommon("testFindPessimisticWrite",
- LockModeType.PESSIMISTIC/* _WRITE */, 0, 1);
+ LockModeType.PESSIMISTIC_WRITE, 0, 1);
}
public void testFindPessimisticForceInc() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindExceptionTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindExceptionTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindExceptionTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindExceptionTest.java Fri Mar 27 20:58:10 2009
@@ -59,10 +59,10 @@
{Act.FindWithLock, 1, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, TransactionRequiredException.class },
- {Act.FindWithLock, 1, LockModeType.PESSIMISTIC/*_READ*/},
+ {Act.FindWithLock, 1, LockModeType.PESSIMISTIC_READ},
{Act.TestException, 0, TransactionRequiredException.class },
- {Act.FindWithLock, 1, LockModeType.PESSIMISTIC/*_WRITE*/},
+ {Act.FindWithLock, 1, LockModeType.PESSIMISTIC_WRITE},
{Act.TestException, 0, TransactionRequiredException.class },
{Act.FindWithLock, 1, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -140,32 +140,32 @@
{Act.TestException, 0, IllegalArgumentException.class },
{Act.FindObject, null, 0,
- LockModeType.PESSIMISTIC/*_READ*/ },
+ LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.FindObject, Object.class, 0,
- LockModeType.PESSIMISTIC/*_READ*/ },
+ LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.FindObject, LockEmployee.class, null,
- LockModeType.PESSIMISTIC/*_READ*/ },
+ LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, EntityNotFoundException.class },
{Act.FindObject, LockEmployee.class, Boolean.TRUE,
- LockModeType.PESSIMISTIC/*_READ*/ },
+ LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.FindObject, null, 0,
- LockModeType.PESSIMISTIC/*_WRITE*/ },
+ LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0,
IllegalArgumentException.class },
{Act.FindObject, Object.class, 0,
- LockModeType.PESSIMISTIC/*_WRITE*/ },
+ LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0,
IllegalArgumentException.class },
{Act.FindObject, LockEmployee.class, null,
- LockModeType.PESSIMISTIC/*_WRITE*/ },
+ LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0,
EntityNotFoundException.class },
{Act.FindObject, LockEmployee.class, Boolean.TRUE,
- LockModeType.PESSIMISTIC/*_WRITE*/ },
+ LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.FindObject, null, 0,
@@ -206,9 +206,9 @@
commonLockOptimisticLockExceptions(
LockModeType.OPTIMISTIC_FORCE_INCREMENT, true, false);
commonLockOptimisticLockExceptions(
- LockModeType.PESSIMISTIC/* _READ */, false, true);
+ LockModeType.PESSIMISTIC_READ, false, true);
commonLockOptimisticLockExceptions(
- LockModeType.PESSIMISTIC/* _WRITE */, false, true);
+ LockModeType.PESSIMISTIC_WRITE, false, true);
commonLockOptimisticLockExceptions(
LockModeType.PESSIMISTIC_FORCE_INCREMENT, false, true);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindPermutationTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindPermutationTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindPermutationTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerFindPermutationTest.java Fri Mar 27 20:58:10 2009
@@ -61,22 +61,22 @@
commonFindTest(
"testFind(Read,Commit/PessimisticRead,Commit)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 0, null);
commonFindTest(
"testFind(Read,Commit/PessimisticRead,Rollback)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 1, null);
}
public void testFindReadPessimisticWrite() {
commonFindTest(
"testFind(Read,Commit/PessimisticWrite,Commit)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 0, null);
commonFindTest(
"testFind(Read,Commit/PessimisticWrite,Rollback)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 1, null);
}
public void testFindReadPessimisticForceInc() {
@@ -118,22 +118,22 @@
commonFindTest(
"testFind(Write,Commit/PessimisticRead,Commit)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 0, null);
commonFindTest(
"testFind(Write,Commit/PessimisticRead,Rollback)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 1, null);
}
public void testFindWritePessimisticWrite() {
commonFindTest(
"testFind(Write,Commit/PessimisticWrite,Commit)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 0, null);
commonFindTest(
"testFind(Write,Commit/PessimisticWrite,Rollback)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 1, null);
}
public void testFindWritePessimisticForceInc() {
@@ -151,58 +151,58 @@
public void testFindPessimisticReadRead() {
commonFindTest(
"testFind(PessimisticRead,Commit/Read,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.READ, Act.CommitTx, 0, ExpectingOptimisticLockExClass);
commonFindTest(
"testFind(PessimisticRead,Commit/Read,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.READ, Act.RollbackTx, 1, null);
}
public void testFindPessimisticReadWrite() {
commonFindTest(
"testFind(PessimisticRead,Commit/Write,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.CommitTx, 0,
ExpectingOptimisticLockExClass);
commonFindTest(
"testFind(PessimisticRead,Commit/Write,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.RollbackTx, 1, null);
}
public void testFindPessimisticReadPessimisticRead() {
commonFindTest(
"testFind(PessimisticRead,Commit/PessimisticRead,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 0, null);
// ExpectingOptimisticLockExClass);
commonFindTest(
"testFind(PessimisticRead,Commit/PessimisticRead,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 0, null);
// ExpectingOptimisticLockExClass);
}
public void testFindPessimisticReadPessimisticWrite() {
commonFindTest(
"testFind(PessimisticRead,Commit/PessimisticWrite,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 0, null);
commonFindTest(
"testFind(PessimisticRead,Commit/PessimisticWrite,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 0, null);
}
public void testFindPessimisticReadPessimisticForceInc() {
commonFindTest(
"testFind(PessimisticRead,Commit/PessimisticForceInc,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null);
commonFindTest(
"testFind(PessimisticRead,Commit/PessimisticForceInc,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.RollbackTx, 0, null);
}
@@ -210,56 +210,56 @@
public void testFindPessimsiticWriteRead() {
commonFindTest(
"testFind(PessimsiticWrite,Commit/Read,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.READ, Act.CommitTx, 0, ExpectingOptimisticLockExClass);
commonFindTest(
"testFind(PessimsiticWrite,Commit/Read,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.READ, Act.RollbackTx, 1, null);
}
public void testFindPessimsiticWriteWrite() {
commonFindTest(
"testFind(PessimsiticWrite,Commit/Write,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.CommitTx, 0,
ExpectingOptimisticLockExClass);
commonFindTest(
"testFind(PessimsiticWrite,Commit/Write,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.RollbackTx, 1, null);
}
public void testFindPessimsiticWritePessimisticRead() {
commonFindTest(
"testFind(PessimsiticWrite,Commit/PessimisticRead,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 0, null);
commonFindTest(
"testFind(PessimsiticWrite,Commit/PessimisticRead,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 0, null);
}
public void testFindPessimsiticWritePessimisticWrite() {
commonFindTest(
"testFind(PessimsiticWrite,Commit/PessimisticWrite,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 0, null);
commonFindTest(
"testFind(PessimsiticWrite,Commit/PessimisticWrite,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 0, null);
}
public void testFindPessimsiticWritePessimisticForceInc() {
commonFindTest(
"testFind(PessimsiticWrite,Commit/PessimisticForceInc,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null);
commonFindTest(
"testFind(PessimsiticWrite,Commit/PessimisticForceInc,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.RollbackTx, 0, null);
}
@@ -291,22 +291,22 @@
commonFindTest(
"testFind(PessimsiticForceInc,Commit/PessimisticRead,Commit)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 0, null);
commonFindTest(
"testFind(PessimsiticForceInc,Commit/PessimisticRead,Rollback)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 0, null);
}
public void testFindPessimsiticForceIncPessimisticWrite() {
commonFindTest(
"testFind(PessimsiticForceInc,Commit/PessimisticWrite,Commit)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 0, null);
commonFindTest(
"testFind(PessimsiticForceInc,Commit/PessimisticWrite,Rollback)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 0, null);
}
public void testFindPessimsiticForceIncPessimisticForceInc() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java Fri Mar 27 20:58:10 2009
@@ -53,12 +53,12 @@
public void testRefreshPessimisticRead() {
testCommon("testRefreshPessimisticRead",
- LockModeType.PESSIMISTIC/* _READ */, 0, 1);
+ LockModeType.PESSIMISTIC_READ, 0, 1);
}
public void testRefreshPessimisticWrite() {
testCommon("testRefreshPessimisticWrite",
- LockModeType.PESSIMISTIC/* _WRITE */, 0, 1);
+ LockModeType.PESSIMISTIC_WRITE, 0, 1);
}
public void testRefreshPessimisticForceInc() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockBasicTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockBasicTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockBasicTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockBasicTest.java Fri Mar 27 20:58:10 2009
@@ -53,12 +53,12 @@
public void testLockPessimisticRead() {
testCommon("testLockPessimisticRead",
- LockModeType.PESSIMISTIC/*_READ */, 0, 1);
+ LockModeType.PESSIMISTIC_READ, 0, 1);
}
public void testLockPessimisticWrite() {
testCommon("testLockPessimisticWrite",
- LockModeType.PESSIMISTIC/*_WRITE */, 0, 1);
+ LockModeType.PESSIMISTIC_WRITE, 0, 1);
}
public void testLockPessimisticForceInc() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockExceptionTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockExceptionTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockExceptionTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockExceptionTest.java Fri Mar 27 20:58:10 2009
@@ -58,10 +58,10 @@
{Act.Lock, 1, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, TransactionRequiredException.class },
- {Act.Lock, 1, LockModeType.PESSIMISTIC/*_READ*/},
+ {Act.Lock, 1, LockModeType.PESSIMISTIC_READ},
{Act.TestException, 0, TransactionRequiredException.class },
- {Act.Lock, 1, LockModeType.PESSIMISTIC/*_WRITE*/},
+ {Act.Lock, 1, LockModeType.PESSIMISTIC_WRITE},
{Act.TestException, 0, TransactionRequiredException.class },
{Act.Lock, 1, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -110,14 +110,14 @@
{Act.LockObject, "null", LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.LockObject, null, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.LockObject, null, LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.LockObject, "null", LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.LockObject, "null", LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.LockObject, null, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.LockObject, null, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.LockObject, "null", LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.LockObject, "null", LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.LockObject, null, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -155,10 +155,10 @@
{Act.Lock, 2, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Lock, 2, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.Lock, 2, LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Lock, 2, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.Lock, 2, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.Lock, 2, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -192,10 +192,10 @@
{Act.Lock, 2, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Lock, 2, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.Lock, 2, LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Lock, 2, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.Lock, 2, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.Lock, 2, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -228,10 +228,10 @@
{Act.Lock, 1, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException},
- {Act.Lock, 1, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.Lock, 1, LockModeType.PESSIMISTIC_READ },
{Act.TestException},
- {Act.Lock, 1, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.Lock, 1, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException},
{Act.Lock, 1, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -265,9 +265,9 @@
commonLockOptimisticLockExceptions(
LockModeType.OPTIMISTIC_FORCE_INCREMENT, false);
commonLockOptimisticLockExceptions(
- LockModeType.PESSIMISTIC/*_READ*/, true);
+ LockModeType.PESSIMISTIC_READ, true);
commonLockOptimisticLockExceptions(
- LockModeType.PESSIMISTIC/*_WRITE*/, true);
+ LockModeType.PESSIMISTIC_WRITE, true);
commonLockOptimisticLockExceptions(
LockModeType.PESSIMISTIC_FORCE_INCREMENT, true);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockPermutationTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockPermutationTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockPermutationTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerLockPermutationTest.java Fri Mar 27 20:58:10 2009
@@ -61,22 +61,22 @@
commonLockTest(
"testLock(Read,Commit/PessimisticRead,Commit)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 0, null);
commonLockTest(
"testLock(Read,Commit/PessimisticRead,Rollback)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 1, null);
}
public void testLockReadPessimisticWrite() {
commonLockTest(
"testLock(Read,Commit/PessimisticWrite,Commit)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 0, null);
commonLockTest(
"testLock(Read,Commit/PessimisticWrite,Rollback)",
LockModeType.READ, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 1, null);
}
public void testLockReadPessimisticForceInc() {
@@ -118,22 +118,22 @@
commonLockTest(
"testLock(Write,Commit/PessimisticRead,Commit)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 0, null);
commonLockTest(
"testLock(Write,Commit/PessimisticRead,Rollback)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 1, null);
}
public void testLockWritePessimisticWrite() {
commonLockTest(
"testLock(Write,Commit/PessimisticWrite,Commit)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 0, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 0, null);
commonLockTest(
"testLock(Write,Commit/PessimisticWrite,Rollback)",
LockModeType.WRITE, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 1, null);
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 1, null);
}
public void testLockWritePessimisticForceInc() {
@@ -151,61 +151,61 @@
public void testLockPessimisticReadRead() {
commonLockTest(
"testLock(PessimisticRead,Commit/Read,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.READ, Act.CommitTx, 0, ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimisticRead,Commit/Read,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.READ, Act.RollbackTx, 1, null);
}
public void testLockPessimisticReadWrite() {
commonLockTest(
"testLock(PessimisticRead,Commit/Write,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.CommitTx, 0,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimisticRead,Commit/Write,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.RollbackTx, 1, null);
}
public void testLockPessimisticReadPessimisticRead() {
commonLockTest(
"testLock(PessimisticRead,Commit/PessimisticRead,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimisticRead,Commit/PessimisticRead,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 1,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
public void testLockPessimisticReadPessimisticWrite() {
commonLockTest(
"testLock(PessimisticRead,Commit/PessimisticWrite,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimisticRead,Commit/PessimisticWrite,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 1,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
public void testLockPessimisticReadPessimisticForceInc() {
commonLockTest(
"testLock(PessimisticRead,Commit/PessimisticForceInc,Commit)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 2,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimisticRead,Commit/PessimisticForceInc,Rollback)",
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
@@ -214,61 +214,61 @@
public void testLockPessimsiticWriteRead() {
commonLockTest(
"testLock(PessimsiticWrite,Commit/Read,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.READ, Act.CommitTx, 0, ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimsiticWrite,Commit/Read,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.READ, Act.RollbackTx, 1, null);
}
public void testLockPessimsiticWriteWrite() {
commonLockTest(
"testLock(PessimsiticWrite,Commit/Write,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.CommitTx, 0,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimsiticWrite,Commit/Write,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.WRITE, Act.RollbackTx, 1, null);
}
public void testLockPessimsiticWritePessimisticRead() {
commonLockTest(
"testLock(PessimsiticWrite,Commit/PessimisticRead,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimsiticWrite,Commit/PessimisticRead,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 1,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
public void testLockPessimsiticWritePessimisticWrite() {
commonLockTest(
"testLock(PessimsiticWrite,Commit/PessimisticWrite,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimsiticWrite,Commit/PessimisticWrite,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 1,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
public void testLockPessimsiticWritePessimisticForceInc() {
commonLockTest(
"testLock(PessimsiticWrite,Commit/PessimisticForceInc,Commit)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 2,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimsiticWrite,Commit/PessimisticForceInc,Rollback)",
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1, null,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1, null,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
@@ -301,12 +301,12 @@
commonLockTest(
"testLock(PessimsiticForceInc,Commit/PessimisticRead,Commit)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.CommitTx, 1,
+ LockModeType.PESSIMISTIC_READ, Act.CommitTx, 1,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimsiticForceInc,Commit/PessimisticRead,Rollback)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_READ*/, Act.RollbackTx, 1,
+ LockModeType.PESSIMISTIC_READ, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
@@ -314,12 +314,12 @@
commonLockTest(
"testLock(PessimsiticForceInc,Commit/PessimisticWrite,Commit)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.CommitTx, 1,
+ LockModeType.PESSIMISTIC_WRITE, Act.CommitTx, 1,
ExpectingOptimisticLockExClass);
commonLockTest(
"testLock(PessimsiticForceInc,Commit/PessimisticWrite,Rollback)",
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null,
- LockModeType.PESSIMISTIC/*_WRITE*/, Act.RollbackTx, 1,
+ LockModeType.PESSIMISTIC_WRITE, Act.RollbackTx, 1,
ExpectingOptimisticLockExClass);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshBasicTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshBasicTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshBasicTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshBasicTest.java Fri Mar 27 20:58:10 2009
@@ -53,12 +53,12 @@
public void testRefreshPessimisticRead() {
testCommon("testRefreshPessimisticRead",
- LockModeType.PESSIMISTIC/* _READ */, 0, 1);
+ LockModeType.PESSIMISTIC_READ, 0, 1);
}
public void testRefreshPessimisticWrite() {
testCommon("testRefreshPessimisticWrite",
- LockModeType.PESSIMISTIC/* _WRITE */, 0, 1);
+ LockModeType.PESSIMISTIC_WRITE, 0, 1);
}
public void testRefreshPessimisticForceInc() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshExceptionTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshExceptionTest.java?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshExceptionTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerRefreshExceptionTest.java Fri Mar 27 20:58:10 2009
@@ -58,10 +58,10 @@
{Act.Refresh, 1, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, TransactionRequiredException.class },
- {Act.Refresh, 1, LockModeType.PESSIMISTIC/*_READ*/},
+ {Act.Refresh, 1, LockModeType.PESSIMISTIC_READ},
{Act.TestException, 0, TransactionRequiredException.class },
- {Act.Refresh, 1, LockModeType.PESSIMISTIC/*_WRITE*/},
+ {Act.Refresh, 1, LockModeType.PESSIMISTIC_WRITE},
{Act.TestException, 0, TransactionRequiredException.class },
{Act.Refresh, 1, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -111,14 +111,14 @@
LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.RefreshObject, null, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.RefreshObject, null, LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.RefreshObject, "null", LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.RefreshObject, "null", LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.RefreshObject, null, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.RefreshObject, null, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.RefreshObject, "null", LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.RefreshObject, "null", LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.RefreshObject, null,
@@ -158,10 +158,10 @@
{Act.Refresh, 2, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Refresh, 2, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.Refresh, 2, LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Refresh, 2, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.Refresh, 2, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.Refresh, 2, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -195,10 +195,10 @@
{Act.Refresh, 2, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Refresh, 2, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.Refresh, 2, LockModeType.PESSIMISTIC_READ },
{Act.TestException, 0, IllegalArgumentException.class },
- {Act.Refresh, 2, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.Refresh, 2, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException, 0, IllegalArgumentException.class },
{Act.Refresh, 2, LockModeType.PESSIMISTIC_FORCE_INCREMENT },
@@ -231,10 +231,10 @@
{Act.Refresh, 1, LockModeType.OPTIMISTIC_FORCE_INCREMENT },
{Act.TestException},
- {Act.Refresh, 1, LockModeType.PESSIMISTIC/*_READ*/ },
+ {Act.Refresh, 1, LockModeType.PESSIMISTIC_READ },
{Act.TestException},
- {Act.Refresh, 1, LockModeType.PESSIMISTIC/*_WRITE*/ },
+ {Act.Refresh, 1, LockModeType.PESSIMISTIC_WRITE },
{Act.TestException},
{Act.Refresh, 1, LockModeType.PESSIMISTIC_FORCE_INCREMENT },