openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ppod...@apache.org
Subject svn commit: r798994 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria: CriteriaTest.java TestEmbeddableCriteria.java
Date Wed, 29 Jul 2009 18:02:34 GMT
Author: ppoddar
Date: Wed Jul 29 18:02:34 2009
New Revision: 798994

URL: http://svn.apache.org/viewvc?rev=798994&view=rev
Log:
Move embed related test entities to its specific test

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java?rev=798994&r1=798993&r2=798994&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
Wed Jul 29 18:02:34 2009
@@ -59,7 +59,7 @@
     protected static OpenJPAEntityManagerFactorySPI emf;
     protected static SQLAuditor auditor;
     
-    QueryBuilder cb;
+    CriteriaBuilder cb;
     EntityManager em;
     
     protected static Class[] CLASSES = {
@@ -100,40 +100,6 @@
             TransactionHistory.class,
             Transaction.class,
             VideoStore.class,
-            org.apache.openjpa.persistence.embed.Company1.class,
-            org.apache.openjpa.persistence.embed.Company2.class,
-            org.apache.openjpa.persistence.embed.Department1.class,
-            org.apache.openjpa.persistence.embed.Department2.class,
-            org.apache.openjpa.persistence.embed.Department3.class,
-            org.apache.openjpa.persistence.embed.Division.class,
-            org.apache.openjpa.persistence.embed.Embed.class,
-            org.apache.openjpa.persistence.embed.Embed_Coll_Embed.class,
-            org.apache.openjpa.persistence.embed.Embed_Coll_Integer.class,
-            org.apache.openjpa.persistence.embed.Embed_Embed.class,
-            org.apache.openjpa.persistence.embed.Embed_Embed_ToMany.class,
-            org.apache.openjpa.persistence.embed.Embed_MappedToOne.class,
-            org.apache.openjpa.persistence.embed.Embed_ToMany.class,
-            org.apache.openjpa.persistence.embed.Embed_ToOne.class,
-            org.apache.openjpa.persistence.embed.Employee1.class,
-            org.apache.openjpa.persistence.embed.Employee2.class,
-            org.apache.openjpa.persistence.embed.Employee3.class,
-            org.apache.openjpa.persistence.embed.EmployeeName3.class,
-            org.apache.openjpa.persistence.embed.EmployeePK2.class,
-            org.apache.openjpa.persistence.embed.EntityA_Coll_Embed_Embed.class,
-            org.apache.openjpa.persistence.embed.EntityA_Coll_Embed_ToOne.class,
-            org.apache.openjpa.persistence.embed.EntityA_Coll_String.class,
-            org.apache.openjpa.persistence.embed.EntityA_Embed_Coll_Embed.class,
-            org.apache.openjpa.persistence.embed.EntityA_Embed_Coll_Integer.class,
-            org.apache.openjpa.persistence.embed.EntityA_Embed_Embed.class,
-            org.apache.openjpa.persistence.embed.EntityA_Embed_Embed_ToMany.class,
-            org.apache.openjpa.persistence.embed.EntityA_Embed_MappedToOne.class,
-            org.apache.openjpa.persistence.embed.EntityA_Embed_ToMany.class,
-            org.apache.openjpa.persistence.embed.EntityA_Embed_ToOne.class,
-            org.apache.openjpa.persistence.embed.EntityB1.class,
-            org.apache.openjpa.persistence.embed.Item1.class,
-            org.apache.openjpa.persistence.embed.Item2.class,
-            org.apache.openjpa.persistence.embed.Item3.class,
-            org.apache.openjpa.persistence.embed.VicePresident.class        
     };
     
     protected Class[] getDomainClasses() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java?rev=798994&r1=798993&r2=798994&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
Wed Jul 29 18:02:34 2009
@@ -96,6 +96,47 @@
 
 
 public class TestEmbeddableCriteria extends CriteriaTest {
+    protected static Class[] CLASSES = {
+    org.apache.openjpa.persistence.embed.Company1.class,
+    org.apache.openjpa.persistence.embed.Company2.class,
+    org.apache.openjpa.persistence.embed.Department1.class,
+    org.apache.openjpa.persistence.embed.Department2.class,
+    org.apache.openjpa.persistence.embed.Department3.class,
+    org.apache.openjpa.persistence.embed.Division.class,
+    org.apache.openjpa.persistence.embed.Embed.class,
+    org.apache.openjpa.persistence.embed.Embed_Coll_Embed.class,
+    org.apache.openjpa.persistence.embed.Embed_Coll_Integer.class,
+    org.apache.openjpa.persistence.embed.Embed_Embed.class,
+    org.apache.openjpa.persistence.embed.Embed_Embed_ToMany.class,
+    org.apache.openjpa.persistence.embed.Embed_MappedToOne.class,
+    org.apache.openjpa.persistence.embed.Embed_ToMany.class,
+    org.apache.openjpa.persistence.embed.Embed_ToOne.class,
+    org.apache.openjpa.persistence.embed.Employee1.class,
+    org.apache.openjpa.persistence.embed.Employee2.class,
+    org.apache.openjpa.persistence.embed.Employee3.class,
+    org.apache.openjpa.persistence.embed.EmployeeName3.class,
+    org.apache.openjpa.persistence.embed.EmployeePK2.class,
+    org.apache.openjpa.persistence.embed.EntityA_Coll_Embed_Embed.class,
+    org.apache.openjpa.persistence.embed.EntityA_Coll_Embed_ToOne.class,
+    org.apache.openjpa.persistence.embed.EntityA_Coll_String.class,
+    org.apache.openjpa.persistence.embed.EntityA_Embed_Coll_Embed.class,
+    org.apache.openjpa.persistence.embed.EntityA_Embed_Coll_Integer.class,
+    org.apache.openjpa.persistence.embed.EntityA_Embed_Embed.class,
+    org.apache.openjpa.persistence.embed.EntityA_Embed_Embed_ToMany.class,
+    org.apache.openjpa.persistence.embed.EntityA_Embed_MappedToOne.class,
+    org.apache.openjpa.persistence.embed.EntityA_Embed_ToMany.class,
+    org.apache.openjpa.persistence.embed.EntityA_Embed_ToOne.class,
+    org.apache.openjpa.persistence.embed.EntityB1.class,
+    org.apache.openjpa.persistence.embed.Item1.class,
+    org.apache.openjpa.persistence.embed.Item2.class,
+    org.apache.openjpa.persistence.embed.Item3.class,
+    org.apache.openjpa.persistence.embed.VicePresident.class
+    };       
+
+    @Override
+    protected Class[] getDomainClasses() {
+        return CLASSES;
+    }
 
     // can not translate to criteria
     @AllowFailure



Mime
View raw message