You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by di...@apache.org on 2010/03/31 19:01:28 UTC
svn commit: r929620 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
Author: dianner
Date: Wed Mar 31 17:01:27 2010
New Revision: 929620
URL: http://svn.apache.org/viewvc?rev=929620&view=rev
Log:
OPENJPA-1606 Add JPQL tests for element collection
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java?rev=929620&r1=929619&r2=929620&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java Wed Mar 31 17:01:27 2010
@@ -41,8 +41,8 @@ public class TestSpec10_1_27 extends SQL
public int compId = 1;
public int divId = 1;
public int vpId = 1;
- public List rsAllCompny1 = null;
- public List rsAllCompny2 = null;
+ public List<Compny1> rsAllCompny1 = null;
+ public List<Compny2> rsAllCompny2 = null;
public void setUp() {
super.setUp(CLEAR_TABLES,
@@ -63,10 +63,10 @@ public class TestSpec10_1_27 extends SQL
queryQualifiedId(false);
}
- public void setCandidate(Query q, Class clz)
+ public void setCandidate(Query q, Class<?> clz)
throws Exception {
- org.apache.openjpa.persistence.QueryImpl q1 =
- (org.apache.openjpa.persistence.QueryImpl) q;
+ org.apache.openjpa.persistence.QueryImpl<?> q1 =
+ (org.apache.openjpa.persistence.QueryImpl<?>) q;
org.apache.openjpa.kernel.Query q2 = q1.getDelegate();
org.apache.openjpa.kernel.QueryImpl qi = (QueryImpl) q2;
if (clz == Compny1.class)
@@ -83,7 +83,7 @@ public class TestSpec10_1_27 extends SQL
Query q = em.createQuery(query);
if (inMemory)
setCandidate(q, Compny1.class);
- List rs = q.getResultList();
+ List<?> rs = q.getResultList();
Division d = (Division) rs.get(0);
em.clear();
@@ -115,6 +115,35 @@ public class TestSpec10_1_27 extends SQL
me = (Map.Entry) rs.get(0);
assertTrue(d.equals(me.getKey()));
+
+ // new tests for element collection
+ em.clear();
+ query = "select im from Item1 i, in (i.images) im " +
+ " order by VALUE(im)";
+ q = em.createQuery(query);
+ if (inMemory)
+ setCandidate(q, Item1.class);
+ rs = q.getResultList();
+ assertEquals(numItems * numImagesPerItem, rs.size());
+
+ em.clear();
+ query = "select im from Item1 i, in (i.images) im " +
+ " where VALUE(im) = 'file11'";
+ q = em.createQuery(query);
+ if (inMemory)
+ setCandidate(q, Item1.class);
+ rs = q.getResultList();
+ assertEquals(1, rs.size());
+
+ em.clear();
+ query = "select im from Item1 i, in (i.images) im " +
+ " group by im " +
+ " having VALUE(im) like 'file1%'";
+ q = em.createQuery(query);
+ if (inMemory)
+ setCandidate(q, Item1.class);
+ rs = q.getResultList();
+ assertEquals(numImagesPerItem, rs.size());
em.close();
}
@@ -222,25 +251,25 @@ public class TestSpec10_1_27 extends SQL
public void assertItem1(Item1 item) {
int id = item.getId();
- Map images = item.getImages();
+ Map<String, String> images = item.getImages();
Assert.assertEquals(numImagesPerItem, images.size());
}
public void assertItem2(Item2 item) {
int id = item.getId();
- Map images = item.getImages();
+ Map<String, String> images = item.getImages();
Assert.assertEquals(numImagesPerItem, images.size());
}
public void assertCompany1(Compny1 c) {
int id = c.getId();
- Map organization = c.getOrganization();
+ Map<Division, VicePresident> organization = c.getOrganization();
Assert.assertEquals(2,organization.size());
}
public void assertCompany2(Compny2 c) {
int id = c.getId();
- Map organization = c.getOrganization();
+ Map<Division, VicePresident> organization = c.getOrganization();
Assert.assertEquals(2,organization.size());
}