svn commit: r1024034 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache: CachedEntityStatistics.java TestStatistics.java

[al...@apache.org]

Author: allee8285
Date: Mon Oct 18 22:00:53 2010
New Revision: 1024034

URL: http://svn.apache.org/viewvc?rev=1024034&view=rev
Log:
OPENJPA-1842 - replace @GeneratedValue by simulate entity id auto generation so that test can run for all databases.

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java?rev=1024034&r1=1024033&r2=1024034&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java Mon Oct 18 22:00:53 2010
@@ -25,8 +25,6 @@ import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
@@ -34,8 +32,8 @@ import javax.persistence.Version;
 @Entity
 public class CachedEntityStatistics {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     protected int id;
+    private static int simulateAutoIdGen = 0;
 
     @Version
     protected int version;
@@ -47,7 +45,7 @@ public class CachedEntityStatistics {
     Set<CachedEntityStatistics> lazyList = new HashSet<CachedEntityStatistics>();
 
     public CachedEntityStatistics() {
-
+        id = ++simulateAutoIdGen;
     }
 
     private String firstName, lastName;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java?rev=1024034&r1=1024033&r2=1024034&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java Mon Oct 18 22:00:53 2010
@@ -18,15 +18,12 @@
  */
 package org.apache.openjpa.persistence.datacache;
 
-import java.util.List;
-
 import javax.persistence.EntityManager;
 
 import junit.framework.AssertionFailedError;
 
 import org.apache.openjpa.datacache.CacheStatistics;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.StoreCache;
 import org.apache.openjpa.persistence.StoreCacheImpl;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@@ -76,7 +73,7 @@ public class TestStatistics extends Sing
      * Finding an entity from a clean should hit the L2 cache.
      */
     public void testSimpleFind() {
-        int hit = 0, eviction = 0, read = 0, write = 0;
+        int hit = 0, read = 0, write = 0;
         CachedEntityStatistics person = createData(false, false);
         em.clear();
         cache.getStatistics().reset();
@@ -179,7 +176,7 @@ public class TestStatistics extends Sing
     }
 
     public void testPersist() {
-        int hit = 0, evict = 0, read = 0, write = 0;
+        int hit = 0, read = 0, write = 0;
 
         em = emf.createEntityManager();
         // test single
@@ -205,7 +202,7 @@ public class TestStatistics extends Sing
     }
 
     public void testRefresh() {
-        int hit = 0, evict = 0, read = 0, write = 0;
+        int hit = 0, read = 0, write = 0;
         CachedEntityStatistics e = new CachedEntityStatistics();
         em = emf.createEntityManager();
         // test single
@@ -223,7 +220,7 @@ public class TestStatistics extends Sing
     }
 
     public void testMerge() {
-        int hit = 0, evict = 0, read = 0, write = 0;
+        int hit = 0, read = 0, write = 0;
         CachedEntityStatistics e = new CachedEntityStatistics();
         em = emf.createEntityManager();
         // test single
@@ -247,9 +244,6 @@ public class TestStatistics extends Sing
     }
 
     CachedEntityStatistics createData(boolean lazy, boolean eager) {
-        List<CachedEntityStatistics> eagerList = null;
-        List<CachedEntityStatistics> lazyList = null;
-
         em.getTransaction().begin();
         CachedEntityStatistics p = new CachedEntityStatistics();
         if (lazy) {