[hibernate-commits] Hibernate SVN: r17050 - in jpamodelgen/trunk/test: src/main/java/model and 6 other directories.

Author: hardy.ferentschik Date: 2009-07-08 10:38:54 -0400 (Wed, 08 Jul 2009) New Revision: 17050 Added: jpamodelgen/trunk/test/src/main/java/model/xmlmapped/ jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java jpamodelgen/trunk/test/src/main/resources/META-INF/address.xml jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml jpamodelgen/trunk/test/src/test/java/tests/ jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java jpamodelgen/trunk/test/src/test/java/tests/QueryTest.java jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java jpamodelgen/trunk/test/src/test/suite/ jpamodelgen/trunk/test/src/test/suite/unit-tests.xml Removed: jpamodelgen/trunk/test/src/main/resources/META-INF/orm.xml jpamodelgen/trunk/test/src/test/java/AccessTypeTest.java jpamodelgen/trunk/test/src/test/java/InheritanceTest.java jpamodelgen/trunk/test/src/test/java/QueryTest.java Modified: jpamodelgen/trunk/test/pom.xml jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml Log: added a test suite file and started with xml mapping tests Modified: jpamodelgen/trunk/test/pom.xml =================================================================== --- jpamodelgen/trunk/test/pom.xml 2009-07-08 14:16:31 UTC (rev 17049) +++ jpamodelgen/trunk/test/pom.xml 2009-07-08 14:38:54 UTC (rev 17050) @@ -119,6 +119,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${basedir}/src/test/suite/unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> Copied: jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java (from rev 17048, jpamodelgen/trunk/test/src/main/java/model/Address.java) =================================================================== --- jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java (rev 0) +++ jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,34 @@ +package model.xmlmapped; + +/** + * @author Emmanuel Bernard + */ +public class Address { + private String street1; + private String city; + private String country; + + public String getStreet1() { + return street1; + } + + public void setStreet1(String street1) { + this.street1 = street1; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } +} \ No newline at end of file Copied: jpamodelgen/trunk/test/src/main/resources/META-INF/address.xml (from rev 17048, jpamodelgen/trunk/test/src/main/resources/META-INF/orm.xml) =================================================================== --- jpamodelgen/trunk/test/src/main/resources/META-INF/address.xml (rev 0) +++ jpamodelgen/trunk/test/src/main/resources/META-INF/address.xml 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" + version="2.0" + > + <!-- careful old JPA1 schema --> + <package>model.xmlmapped</package> <!-- default package --> + <embeddable class="Address" access="FIELD" metadata-complete="true"> <!--means ignore annotations--> + <attributes> + <basic name="street1"/> + <basic name="city"/> + <basic name="country"/> + </attributes> + </embeddable> +</entity-mappings> + + + <!-- +public class Order { + long id; + Set<Item> items; + boolean filled; + Date date; + List<String> notes; + Shop shop; +} --> \ No newline at end of file Copied: jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml (from rev 17048, jpamodelgen/trunk/test/src/main/resources/META-INF/orm.xml) =================================================================== --- jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml (rev 0) +++ jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" + version="2.0" + > + <!-- careful old JPA1 schema --> + <package>model</package> <!-- default package --> + <entity class="Order" access="FIELD" metadata-complete="true"> <!--means ignore annotations--> + <attributes> + <id name="id"> + <column name="fld_id"/> + </id> + <basic name="filled"></basic> + <basic name="date"></basic> + <one-to-many name="items" target-entity="Item" fetch="EAGER"> <!-- target-entity optional guess the type from the geenric--> + <cascade> + <cascade-persist/> + </cascade> + </one-to-many> + <many-to-one name="shop"/> + <element-collection name="notes"/> <!-- new in JPA 2 --> + </attributes> + </entity> +</entity-mappings> + + + <!-- +public class Order { + long id; + Set<Item> items; + boolean filled; + Date date; + List<String> notes; + Shop shop; +} --> \ No newline at end of file Deleted: jpamodelgen/trunk/test/src/main/resources/META-INF/orm.xml =================================================================== --- jpamodelgen/trunk/test/src/main/resources/META-INF/orm.xml 2009-07-08 14:16:31 UTC (rev 17049) +++ jpamodelgen/trunk/test/src/main/resources/META-INF/orm.xml 2009-07-08 14:38:54 UTC (rev 17050) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" - version="2.0" - > - <!-- careful old JPA1 schema --> - <package>model</package> <!-- default package --> - <entity class="Order" access="FIELD" metadata-complete="true"> <!--means ignore annotations--> - <attributes> - <id name="id"> - <column name="fld_id"/> - </id> - <basic name="filled"></basic> - <basic name="date"></basic> - <one-to-many name="items" target-entity="Item" fetch="EAGER"> <!-- target-entity optional guess the type from the geenric--> - <cascade> - <cascade-persist/> - </cascade> - </one-to-many> - <many-to-one name="shop"/> - <element-collection name="notes"/> <!-- new in JPA 2 --> - </attributes> - </entity> -</entity-mappings> - - - <!-- -public class Order { - long id; - Set<Item> items; - boolean filled; - Date date; - List<String> notes; - Shop shop; -} --> \ No newline at end of file Modified: jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml =================================================================== --- jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml 2009-07-08 14:16:31 UTC (rev 17049) +++ jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml 2009-07-08 14:38:54 UTC (rev 17050) @@ -4,6 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence.xsd" version="2.0"> <persistence-unit name="annotation-processor" transaction-type="JTA"> <description>Test persistence unit</description> - <mapping-file>/META-INF/orm.xml</mapping-file> + <mapping-file>/META-INF/order.xml</mapping-file> + <mapping-file>/META-INF/address.xml</mapping-file> </persistence-unit> </persistence> Deleted: jpamodelgen/trunk/test/src/test/java/AccessTypeTest.java =================================================================== --- jpamodelgen/trunk/test/src/test/java/AccessTypeTest.java 2009-07-08 14:16:31 UTC (rev 17049) +++ jpamodelgen/trunk/test/src/test/java/AccessTypeTest.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -1,23 +0,0 @@ -import java.lang.reflect.Field; - -import org.testng.annotations.Test; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; -import org.testng.Assert; - -/** - * @author Emmanuel Bernard - */ -@Test -public class AccessTypeTest { - @Test - public void testDefaultAccessType() throws Exception{ - Class<?> user_ = Class.forName( "model.User_" ); - try { - final Field nonPersistentField = user_.getField( "nonPersistent" ); - Assert.fail( "field should not be persistent" ); - } - catch (NoSuchFieldException e) {} - - } -} Deleted: jpamodelgen/trunk/test/src/test/java/InheritanceTest.java =================================================================== --- jpamodelgen/trunk/test/src/test/java/InheritanceTest.java 2009-07-08 14:16:31 UTC (rev 17049) +++ jpamodelgen/trunk/test/src/test/java/InheritanceTest.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -1,27 +0,0 @@ -import org.testng.annotations.Test; -import org.testng.Assert; -import model.Customer_; -import model.User_; -import model.House_; -import model.Building_; -import model.Area_; - -/** - * @author Emmanuel Bernard - */ -@Test -public class InheritanceTest { - @Test - public void testSuperEntity() throws Exception { - Assert.assertEquals( Customer_.class.getSuperclass(), User_.class, - "Entity with super entity should inherit at the metamodel level"); - } - - @Test - public void testMappedSuperclass() throws Exception { - Assert.assertEquals( House_.class.getSuperclass(), Building_.class, - "Entity with mapped superclass should inherit at the metamodel level"); - Assert.assertEquals( Building_.class.getSuperclass(), Area_.class, - "mapped superclass with mapped superclass should inherit at the metamodel level"); - } -} Deleted: jpamodelgen/trunk/test/src/test/java/QueryTest.java =================================================================== --- jpamodelgen/trunk/test/src/test/java/QueryTest.java 2009-07-08 14:16:31 UTC (rev 17049) +++ jpamodelgen/trunk/test/src/test/java/QueryTest.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -1,144 +0,0 @@ -import java.math.BigDecimal; -import java.util.Date; -import java.util.Set; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import static javax.persistence.criteria.JoinType.INNER; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.QueryBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.Tuple; - -import model.Item; -import model.Order; -import model.Product; -import model.Item_; -import model.Order_; -import model.Product_; -import model.Shop_; - -/** - * Writing queries involves passing typesafe, statically cached, metamodel - * objects to the query builder in order to create the various parts of - * the query. The typesafe metamodel objects were validated at init time, - * so it is impossible to build invalid queries in the application code. - */ -public class QueryTest { - - QueryBuilder qb; - - public void test() { - CriteriaQuery<Tuple> q = qb.createTupleQuery(); - - Root<Order> order = q.from(Order.class); - Join<Item, Product> product = order.join(Order_.items) - .join(Item_.product); - - Path<BigDecimal> price = product.get(Product_.price); - Path<Boolean> filled = order.get(Order_.filled); - Path<Date> date = order.get(Order_.date); - - q.select( qb.tuple( order, product ) ) - .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) - .orderBy( qb.asc(price), qb.desc(date) ); - } - - public void testUntypesafe() { - CriteriaQuery<Tuple> q = qb.createTupleQuery(); - - Root<Order> order = q.from(Order.class); - Join<Item, Product> product = order.join("items") - .join("product"); - - Path<BigDecimal> price = product.get("price"); - Path<Boolean> filled = order.get("filled"); - Path<Date> date = order.get("date"); - - q.select( qb.tuple( order, product ) ) - .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) - .orderBy( qb.asc(price), qb.desc(date) ); - } - - /** - * Navigation by joining - */ - public void test2() { - CriteriaQuery<Product> q = qb.createQuery(Product.class); - - Root<Product> product = q.from(Product.class); - Join<Item, Order> order = product.join(Product_.items) - .join(Item_.order); - - q.select(product) - .where( qb.equal(order.get(Order_.id), 12345l) ); - } - - public void testMap() { - CriteriaQuery<Item> q = qb.createQuery(Item.class); - - Root<Item> item = q.from(Item.class); - Join<Item, Order> io = item.join(Item_.namedOrders); - - } - - /** - * Navigation by compound Path - */ - public void test3() { - CriteriaQuery<Item> q = qb.createQuery(Item.class); - - Root<Item> item = q.from(Item.class); - Path<String> shopName = item.get(Item_.order) - .get(Order_.shop) - .get(Shop_.name); - q.select(item) - .where( qb.equal(shopName, "amazon.com") ); - } - -// public void test4() { -// CriteriaQuery q = qb.create(); -// -// Root<Order> order = q.from(Order.class); -// ListJoin<Order, String> note = order.join(Order_.notes); -// Expression<Set<Item>> items = order.get(Order_.items); -// order.fetch(Order_.items, JoinType.INNER); -// -// q.select(note) -// .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); -// } - - public void test4Untypesafe() { - CriteriaQuery<String> q = qb.createQuery(String.class); - - Root<Order> order = q.from(Order.class); - ListJoin<Order, String> note = order.joinList("notes"); - Expression<Set<Item>> items = order.get("items"); - order.fetch("items", INNER); - - q.select(note) - .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); - } - - /*public void test5() { - Expression<Long> l= null; - Expression<Integer> i= null; - Expression<Float> x= null; - Expression<Float> y= null; - - Expression<Number> n; - Expression<Float> f; - Expression<String> s = null; - - n = qb.quot(l, i); - - f = qb.sum(x, y); - - n = qb.quot(x, y); - - javax.jpa.criteria.Order o = qb.asc(n); - javax.jpa.criteria.Order p = qb.ascending(s); - }*/ - -} Copied: jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java (from rev 17048, jpamodelgen/trunk/test/src/test/java/AccessTypeTest.java) =================================================================== --- jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java (rev 0) +++ jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,25 @@ +package tests; + +import java.lang.reflect.Field; + +import org.testng.annotations.Test; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import org.testng.Assert; + +/** + * @author Emmanuel Bernard + */ +@Test +public class AccessTypeTest { + @Test + public void testDefaultAccessType() throws Exception{ + Class<?> user_ = Class.forName( "model.User_" ); + try { + final Field nonPersistentField = user_.getField( "nonPersistent" ); + Assert.fail( "field should not be persistent" ); + } + catch (NoSuchFieldException e) {} + + } +} Copied: jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java (from rev 17048, jpamodelgen/trunk/test/src/test/java/InheritanceTest.java) =================================================================== --- jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java (rev 0) +++ jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,29 @@ +package tests; + +import org.testng.annotations.Test; +import org.testng.Assert; +import model.Customer_; +import model.User_; +import model.House_; +import model.Building_; +import model.Area_; + +/** + * @author Emmanuel Bernard + */ +@Test +public class InheritanceTest { + @Test + public void testSuperEntity() throws Exception { + Assert.assertEquals( Customer_.class.getSuperclass(), User_.class, + "Entity with super entity should inherit at the metamodel level"); + } + + @Test + public void testMappedSuperclass() throws Exception { + Assert.assertEquals( House_.class.getSuperclass(), Building_.class, + "Entity with mapped superclass should inherit at the metamodel level"); + Assert.assertEquals( Building_.class.getSuperclass(), Area_.class, + "mapped superclass with mapped superclass should inherit at the metamodel level"); + } +} Copied: jpamodelgen/trunk/test/src/test/java/tests/QueryTest.java (from rev 17048, jpamodelgen/trunk/test/src/test/java/QueryTest.java) =================================================================== --- jpamodelgen/trunk/test/src/test/java/tests/QueryTest.java (rev 0) +++ jpamodelgen/trunk/test/src/test/java/tests/QueryTest.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,146 @@ +package tests; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.Set; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Expression; +import javax.persistence.criteria.Join; +import static javax.persistence.criteria.JoinType.INNER; +import javax.persistence.criteria.ListJoin; +import javax.persistence.criteria.Path; +import javax.persistence.criteria.QueryBuilder; +import javax.persistence.criteria.Root; +import javax.persistence.Tuple; + +import model.Item; +import model.Order; +import model.Product; +import model.Item_; +import model.Order_; +import model.Product_; +import model.Shop_; + +/** + * Writing queries involves passing typesafe, statically cached, metamodel + * objects to the query builder in order to create the various parts of + * the query. The typesafe metamodel objects were validated at init time, + * so it is impossible to build invalid queries in the application code. + */ +public class QueryTest { + + QueryBuilder qb; + + public void test() { + CriteriaQuery<Tuple> q = qb.createTupleQuery(); + + Root<Order> order = q.from(Order.class); + Join<Item, Product> product = order.join(Order_.items) + .join(Item_.product); + + Path<BigDecimal> price = product.get(Product_.price); + Path<Boolean> filled = order.get(Order_.filled); + Path<Date> date = order.get(Order_.date); + + q.select( qb.tuple( order, product ) ) + .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) + .orderBy( qb.asc(price), qb.desc(date) ); + } + + public void testUntypesafe() { + CriteriaQuery<Tuple> q = qb.createTupleQuery(); + + Root<Order> order = q.from(Order.class); + Join<Item, Product> product = order.join("items") + .join("product"); + + Path<BigDecimal> price = product.get("price"); + Path<Boolean> filled = order.get("filled"); + Path<Date> date = order.get("date"); + + q.select( qb.tuple( order, product ) ) + .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) + .orderBy( qb.asc(price), qb.desc(date) ); + } + + /** + * Navigation by joining + */ + public void test2() { + CriteriaQuery<Product> q = qb.createQuery(Product.class); + + Root<Product> product = q.from(Product.class); + Join<Item, Order> order = product.join(Product_.items) + .join(Item_.order); + + q.select(product) + .where( qb.equal(order.get(Order_.id), 12345l) ); + } + + public void testMap() { + CriteriaQuery<Item> q = qb.createQuery(Item.class); + + Root<Item> item = q.from(Item.class); + Join<Item, Order> io = item.join(Item_.namedOrders); + + } + + /** + * Navigation by compound Path + */ + public void test3() { + CriteriaQuery<Item> q = qb.createQuery(Item.class); + + Root<Item> item = q.from(Item.class); + Path<String> shopName = item.get(Item_.order) + .get(Order_.shop) + .get(Shop_.name); + q.select(item) + .where( qb.equal(shopName, "amazon.com") ); + } + +// public void test4() { +// CriteriaQuery q = qb.create(); +// +// Root<Order> order = q.from(Order.class); +// ListJoin<Order, String> note = order.join(Order_.notes); +// Expression<Set<Item>> items = order.get(Order_.items); +// order.fetch(Order_.items, JoinType.INNER); +// +// q.select(note) +// .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); +// } + + public void test4Untypesafe() { + CriteriaQuery<String> q = qb.createQuery(String.class); + + Root<Order> order = q.from(Order.class); + ListJoin<Order, String> note = order.joinList("notes"); + Expression<Set<Item>> items = order.get("items"); + order.fetch("items", INNER); + + q.select(note) + .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); + } + + /*public void test5() { + Expression<Long> l= null; + Expression<Integer> i= null; + Expression<Float> x= null; + Expression<Float> y= null; + + Expression<Number> n; + Expression<Float> f; + Expression<String> s = null; + + n = qb.quot(l, i); + + f = qb.sum(x, y); + + n = qb.quot(x, y); + + javax.jpa.criteria.Order o = qb.asc(n); + javax.jpa.criteria.Order p = qb.ascending(s); + }*/ + +} Copied: jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java (from rev 17048, jpamodelgen/trunk/test/src/test/java/AccessTypeTest.java) =================================================================== --- jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java (rev 0) +++ jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,15 @@ +package tests; + +import static org.testng.Assert.assertNotNull; +import org.testng.annotations.Test; + +/** + * @author Hardy Ferentschik + */ +@Test +public class XmlMappingTest { + @Test + public void testDefaultAccessType() throws Exception { + assertNotNull( Class.forName( "model.xmlmapped.Address_" ) ); + } +} \ No newline at end of file Added: jpamodelgen/trunk/test/src/test/suite/unit-tests.xml =================================================================== --- jpamodelgen/trunk/test/src/test/suite/unit-tests.xml (rev 0) +++ jpamodelgen/trunk/test/src/test/suite/unit-tests.xml 2009-07-08 14:38:54 UTC (rev 17050) @@ -0,0 +1,9 @@ +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > + +<suite name="Hibernate Model Generator Tests" verbose="1"> + <test name="Unit tests"> + <packages> + <package name="tests"/> + </packages> + </test> +</suite> \ No newline at end of file