[hibernate-commits] Hibernate SVN: r17064 - in jpamodelgen/trunk: generator/src/test and 15 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Jul 10 07:58:29 EDT 2009
Author: hardy.ferentschik
Date: 2009-07-10 07:58:29 -0400 (Fri, 10 Jul 2009)
New Revision: 17064
Added:
jpamodelgen/trunk/generator/src/test/java/model/
jpamodelgen/trunk/generator/src/test/java/model/Address.java
jpamodelgen/trunk/generator/src/test/java/model/Area.java
jpamodelgen/trunk/generator/src/test/java/model/Building.java
jpamodelgen/trunk/generator/src/test/java/model/Customer.java
jpamodelgen/trunk/generator/src/test/java/model/Detail.java
jpamodelgen/trunk/generator/src/test/java/model/Hominidae.java
jpamodelgen/trunk/generator/src/test/java/model/House.java
jpamodelgen/trunk/generator/src/test/java/model/Human.java
jpamodelgen/trunk/generator/src/test/java/model/Item.java
jpamodelgen/trunk/generator/src/test/java/model/LivingBeing.java
jpamodelgen/trunk/generator/src/test/java/model/Mammals.java
jpamodelgen/trunk/generator/src/test/java/model/Order.java
jpamodelgen/trunk/generator/src/test/java/model/Product.java
jpamodelgen/trunk/generator/src/test/java/model/Shop.java
jpamodelgen/trunk/generator/src/test/java/model/User.java
jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/
jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Address.java
jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Building.java
jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/LivingBeing.java
jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Mammal.java
jpamodelgen/trunk/generator/src/test/java/test/
jpamodelgen/trunk/generator/src/test/java/test/AccessTypeTest.java
jpamodelgen/trunk/generator/src/test/java/test/InheritanceTest.java
jpamodelgen/trunk/generator/src/test/java/test/QueryTest.java
jpamodelgen/trunk/generator/src/test/java/test/XmlMappingTest.java
jpamodelgen/trunk/generator/src/test/resources/META-INF/
jpamodelgen/trunk/generator/src/test/resources/META-INF/dummy.xml
jpamodelgen/trunk/generator/src/test/resources/META-INF/order.xml
jpamodelgen/trunk/generator/src/test/resources/META-INF/persistence.xml
jpamodelgen/trunk/generator/src/test/resources/model/
jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/
jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/address.xml
jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/building.xml
jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/mammal.xml
jpamodelgen/trunk/generator/src/test/suite/
jpamodelgen/trunk/generator/src/test/suite/unit-tests.xml
Removed:
jpamodelgen/trunk/test/src/main/java/model/Address.java
jpamodelgen/trunk/test/src/main/java/model/Area.java
jpamodelgen/trunk/test/src/main/java/model/Building.java
jpamodelgen/trunk/test/src/main/java/model/Customer.java
jpamodelgen/trunk/test/src/main/java/model/Detail.java
jpamodelgen/trunk/test/src/main/java/model/Hominidae.java
jpamodelgen/trunk/test/src/main/java/model/House.java
jpamodelgen/trunk/test/src/main/java/model/Human.java
jpamodelgen/trunk/test/src/main/java/model/Item.java
jpamodelgen/trunk/test/src/main/java/model/LivingBeing.java
jpamodelgen/trunk/test/src/main/java/model/Mammals.java
jpamodelgen/trunk/test/src/main/java/model/Order.java
jpamodelgen/trunk/test/src/main/java/model/Product.java
jpamodelgen/trunk/test/src/main/java/model/Shop.java
jpamodelgen/trunk/test/src/main/java/model/User.java
jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java
jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Building.java
jpamodelgen/trunk/test/src/main/java/model/xmlmapped/LivingBeing.java
jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Mammal.java
jpamodelgen/trunk/test/src/main/resources/META-INF/dummy.xml
jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml
jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml
jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/address.xml
jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/building.xml
jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/mammal.xml
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/unit-tests.xml
Modified:
jpamodelgen/trunk/generator/pom.xml
Log:
no need for a separate test project - can be done in a single project
Modified: jpamodelgen/trunk/generator/pom.xml
===================================================================
--- jpamodelgen/trunk/generator/pom.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/generator/pom.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodel-generator-parent</artifactId>
@@ -14,6 +16,12 @@
<groupId>org.hibernate.java-persistence</groupId>
<artifactId>jpa-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <classifier>jdk15</classifier>
+ </dependency>
</dependencies>
<build>
<defaultGoal>test</defaultGoal>
@@ -35,7 +43,59 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process_annotations</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <property name="target.dir" value="target/generated-query-classes"/>
+ <mkdir dir="${target.dir}"/>
+ <javac srcdir="src/test/java" destdir="${target.dir}" failonerror="false" excludes="test/**">
+ <compilerarg value="-proc:only"/>
+ <classpath>
+ <path refid="maven.test.classpath"/>
+ </classpath>
+ </javac>
+ </tasks>
+ <sourceRoot>generate</sourceRoot>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-query-classes</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<executions>
<execution>
@@ -66,6 +126,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>
Added: jpamodelgen/trunk/generator/src/test/java/model/Address.java
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Address.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Address.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,37 @@
+package model;
+
+import javax.persistence.Embeddable;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Embeddable
+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;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Area.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Area.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Area.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Area.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,42 @@
+package model;
+
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at MappedSuperclass
+public class Area {
+ private int length;
+ private int width;
+ private int height;
+
+ //should not be persistent
+ public int getVolume() {
+ return length*width*height;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ public void setLength(int length) {
+ this.length = length;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Building.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Building.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Building.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Building.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,19 @@
+package model;
+
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at MappedSuperclass
+public class Building extends Area {
+ private Address address;
+
+ public Address getAddress() {
+ return address;
+ }
+
+ public void setAddress(Address address) {
+ this.address = address;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Customer.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Customer.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Customer.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Customer.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,28 @@
+package model;
+
+import java.util.Set;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class Customer extends User {
+ private Set<Order> orders;
+ private String nonPersistent;
+
+ @Access(AccessType.FIELD)
+ boolean goodPayer;
+
+ public Set<Order> getOrders() {
+ return orders;
+ }
+
+ @OneToMany
+ public void setOrders(Set<Order> orders) {
+ this.orders = orders;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Detail.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Detail.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Detail.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Detail.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,38 @@
+package model;
+
+import javax.persistence.Embeddable;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Embeddable
+public class Detail {
+ Integer length;
+ Integer width;
+ Integer height;
+ Integer nonPersistent;
+
+ public Integer getLength() {
+ return length;
+ }
+
+ public void setLength(Integer length) {
+ this.length = length;
+ }
+
+ public Integer getWidth() {
+ return width;
+ }
+
+ public void setWidth(Integer width) {
+ this.width = width;
+ }
+
+ public Integer getHeight() {
+ return height;
+ }
+
+ public void setHeight(Integer height) {
+ this.height = height;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Hominidae.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Hominidae.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Hominidae.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Hominidae.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,26 @@
+package model;
+
+import javax.persistence.Entity;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+ at Access(javax.persistence.AccessType.FIELD)
+public class Hominidae extends Mammals {
+ private int intelligence;
+
+ public int getIntelligence() {
+ return intelligence;
+ }
+
+ public void setIntelligence(int intelligence) {
+ this.intelligence = intelligence;
+ }
+
+ public int getNonPersistent() {
+ return 0;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/House.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/House.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/House.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/House.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,21 @@
+package model;
+
+import javax.persistence.Id;
+import javax.persistence.Entity;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class House extends Building {
+ @Id
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Human.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Human.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Human.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Human.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,20 @@
+package model;
+
+import javax.persistence.Entity;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class Human extends Hominidae {
+ private int nonPersistent;
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Item.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Item.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Item.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Item.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,71 @@
+package model;
+
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+ at Entity
+public class Item {
+
+ long _id;
+
+ int _quantity;
+
+ Product _product;
+
+ Order _order;
+
+ Detail detail;
+
+ @Id
+ public long getId() {
+ return _id;
+ }
+
+ public void setId(long id) {
+ this._id = id;
+ }
+
+ public int getQuantity() {
+ return _quantity;
+ }
+
+ public void setQuantity(int quantity) {
+ this._quantity = quantity;
+ }
+
+ @ManyToOne
+ public Product getProduct() {
+ return _product;
+ }
+
+ public void setProduct(Product product) {
+ this._product = product;
+ }
+
+ @ManyToOne
+ public Order getOrder() {
+ return _order;
+ }
+
+ public void setOrder(Order order) {
+ this._order = order;
+ }
+
+ @OneToMany
+ public Map<String, Order> getNamedOrders() {
+ return null;
+ }
+
+ public Detail getDetail() {
+ return detail;
+ }
+
+ public void setDetail(Detail detail) {
+ this.detail = detail;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/LivingBeing.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/LivingBeing.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/LivingBeing.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/LivingBeing.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,26 @@
+package model;
+
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at MappedSuperclass
+ at Access(javax.persistence.AccessType.FIELD)
+public class LivingBeing {
+ boolean isReallyAlive;
+
+ public boolean isReallyAlive() {
+ return isReallyAlive;
+ }
+
+ public void setReallyAlive(boolean reallyAlive) {
+ isReallyAlive = reallyAlive;
+ }
+
+ public int nonPersistent() {
+ return 0;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Mammals.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Mammals.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Mammals.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Mammals.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,30 @@
+package model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class Mammals extends LivingBeing {
+ private String id;
+ private String nbrOfMammals;
+
+ @Id
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getNbrOfMammals() {
+ return nbrOfMammals;
+ }
+
+ public void setNbrOfMammals(String nbrOfMammals) {
+ this.nbrOfMammals = nbrOfMammals;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Order.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Order.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Order.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Order.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,28 @@
+package model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+//@Entity
+public class Order {
+
+ //@Id
+ long id;
+
+ //@OneToMany
+ Set<Item> items;
+
+ boolean filled;
+ Date date;
+
+ //@OneToMany
+ List<String> notes;
+
+ //@ManyToOne
+ Shop shop;
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Product.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Product.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Product.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Product.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,30 @@
+package model;
+
+import java.math.BigDecimal;
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+ at Entity
+public class Product {
+
+ transient String nonPersistent;
+ static String nonPersistent2;
+
+ @Id
+ long id;
+
+ int test;
+
+ String description;
+ BigDecimal price;
+
+ @ManyToOne
+ Shop shop;
+
+ @OneToMany
+ Set<Item> items;
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/Shop.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/Shop.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/Shop.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/Shop.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,12 @@
+package model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+ at Entity
+public class Shop {
+ @Id
+ long id;
+ String name;
+}
+
\ No newline at end of file
Copied: jpamodelgen/trunk/generator/src/test/java/model/User.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/User.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/User.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/User.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,41 @@
+package model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class User {
+ private Long id;
+ private String nonPersistent;
+ private String name;
+
+ @Id
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Transient
+ public String getNonPersistent() {
+ return nonPersistent;
+ }
+
+ public void setNonPersistent(String nonPersistent) {
+ this.nonPersistent = nonPersistent;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Address.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Address.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Address.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -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/generator/src/test/java/model/xmlmapped/Building.java (from rev 17061, jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Building.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Building.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Building.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,19 @@
+package model.xmlmapped;
+
+import model.Address;
+import model.Area;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class Building extends Area {
+ private Address address;
+
+ public Address getAddress() {
+ return address;
+ }
+
+ public void setAddress(Address address) {
+ this.address = address;
+ }
+}
\ No newline at end of file
Copied: jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/LivingBeing.java (from rev 17062, jpamodelgen/trunk/test/src/main/java/model/xmlmapped/LivingBeing.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/LivingBeing.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/LivingBeing.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,17 @@
+package model.xmlmapped;
+
+public class LivingBeing {
+ boolean isReallyAlive;
+
+ public boolean isReallyAlive() {
+ return isReallyAlive;
+ }
+
+ public void setReallyAlive(boolean reallyAlive) {
+ isReallyAlive = reallyAlive;
+ }
+
+ public int nonPersistent() {
+ return 0;
+ }
+}
\ No newline at end of file
Copied: jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Mammal.java (from rev 17062, jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Mammal.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Mammal.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/model/xmlmapped/Mammal.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,23 @@
+package model.xmlmapped;
+
+
+public class Mammal extends LivingBeing {
+ private String id;
+ private String subclass;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getSubclass() {
+ return subclass;
+ }
+
+ public void setSubclass(String subclass) {
+ this.subclass = subclass;
+ }
+}
\ No newline at end of file
Copied: jpamodelgen/trunk/generator/src/test/java/test/AccessTypeTest.java (from rev 17061, jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/test/AccessTypeTest.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/test/AccessTypeTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,75 @@
+package test;
+
+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
+ */
+ at Test
+public class AccessTypeTest {
+
+ @Test
+ public void testExcludeTransientFieldAndStatic() throws Exception{
+ absenceOfField( "model.Product_", "nonPersistent" );
+ absenceOfField( "model.Product_", "nonPersistent2" );
+ }
+
+ @Test
+ public void testDefaultAccessTypeOnEntity() throws Exception{
+ absenceOfField( "model.User_", "nonPersistent" );
+ }
+
+ @Test
+ public void testDefaultAccessTypeForSubclassOfEntity() throws Exception{
+ absenceOfField( "model.Customer_", "nonPersistent" );
+ }
+
+ @Test
+ public void testDefaultAccessTypeForEmbeddable() throws Exception{
+ absenceOfField( "model.Detail_", "nonPersistent " );
+ }
+
+ @Test
+ public void testDefaultAccessTypeForMappedSuperclass() throws Exception{
+ absenceOfField( "model.Detail_", "volume" );
+ }
+
+ @Test
+ public void testExplicitAccessTypeAndDefaultFromRootEntity() throws Exception{
+ absenceOfField( "model.LivingBeing_", "nonPersistent", "eplicit access type on mapped superclass" );
+ absenceOfField( "model.Hominidae_", "nonPersistent", "eplicit access type on entity" );
+ absenceOfField( "model.Human_", "nonPersistent", "proper inheritance from root entity access type" );
+ }
+
+ @Test
+ public void testMemberAccessType() throws Exception{
+ presenceOfField( "model.Customer_", "goodPayer", "access type overriding" );
+ }
+
+ private void absenceOfField(String className, String fieldName) throws ClassNotFoundException {
+ absenceOfField( className, fieldName, "field should not be persistent" );
+ }
+ private void absenceOfField(String className, String fieldName, String errorString) throws ClassNotFoundException {
+ Assert.assertFalse( isFieldHere(className, fieldName), errorString );
+ }
+
+ private void presenceOfField(String className, String fieldName, String errorString) throws ClassNotFoundException {
+ Assert.assertTrue( isFieldHere(className, fieldName), errorString );
+ }
+
+ private boolean isFieldHere(String className, String fieldName) throws ClassNotFoundException {
+ Class<?> user_ = Class.forName( className );
+ try {
+ final Field field = user_.getField( fieldName );
+ return true;
+ }
+ catch (NoSuchFieldException e) {
+ return false;
+ }
+ }
+}
Copied: jpamodelgen/trunk/generator/src/test/java/test/InheritanceTest.java (from rev 17061, jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/test/InheritanceTest.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/test/InheritanceTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,29 @@
+package test;
+
+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
+ */
+ at 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/generator/src/test/java/test/QueryTest.java (from rev 17061, jpamodelgen/trunk/test/src/test/java/tests/QueryTest.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/test/QueryTest.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/test/QueryTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,146 @@
+package test;
+
+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/generator/src/test/java/test/XmlMappingTest.java (from rev 17063, jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java)
===================================================================
--- jpamodelgen/trunk/generator/src/test/java/test/XmlMappingTest.java (rev 0)
+++ jpamodelgen/trunk/generator/src/test/java/test/XmlMappingTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,38 @@
+package test;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class XmlMappingTest {
+ @Test
+ public void testXmlConfiguredEmbeddedClassGenerated() throws Exception {
+ assertNotNull( Class.forName( "model.xmlmapped.Address_" ) );
+ }
+
+ @Test
+ public void testXmlConfiguredMappedSuperclassGenerated() throws Exception {
+ Class<?> building = Class.forName( "model.xmlmapped.Building_" );
+ assertNotNull( building );
+ assertNotNull( building.getField( "address" ) );
+ }
+
+ @Test
+ public void testClassHierarchy() throws Exception {
+ Class<?> mammal = Class.forName( "model.xmlmapped.Mammal_" );
+ assertNotNull( mammal );
+
+ Class<?> being = Class.forName( "model.xmlmapped.LivingBeing_" );
+ assertNotNull( being );
+
+ assertTrue( mammal.getSuperclass().equals( being ) );
+ }
+
+ @Test(expectedExceptions = ClassNotFoundException.class)
+ public void testNonExistentMappedClassesGetIgnored() throws Exception {
+ Class.forName( "model.Dummy_" );
+ }
+}
\ No newline at end of file
Copied: jpamodelgen/trunk/generator/src/test/resources/META-INF/dummy.xml (from rev 17063, jpamodelgen/trunk/test/src/main/resources/META-INF/dummy.xml)
===================================================================
--- jpamodelgen/trunk/generator/src/test/resources/META-INF/dummy.xml (rev 0)
+++ jpamodelgen/trunk/generator/src/test/resources/META-INF/dummy.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,14 @@
+<?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"
+ >
+ <package>model</package>
+ <entity class="Dummy" access="FIELD" metadata-complete="true"> <!-- Class does not exist -->
+ <attributes>
+ <id name="id"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: jpamodelgen/trunk/generator/src/test/resources/META-INF/order.xml (from rev 17062, jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml)
===================================================================
--- jpamodelgen/trunk/generator/src/test/resources/META-INF/order.xml (rev 0)
+++ jpamodelgen/trunk/generator/src/test/resources/META-INF/order.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,36 @@
+<?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"
+ >
+ <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 name="date"/>
+ <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
Copied: jpamodelgen/trunk/generator/src/test/resources/META-INF/persistence.xml (from rev 17063, jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml)
===================================================================
--- jpamodelgen/trunk/generator/src/test/resources/META-INF/persistence.xml (rev 0)
+++ jpamodelgen/trunk/generator/src/test/resources/META-INF/persistence.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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/order.xml</mapping-file>
+ <mapping-file>/META-INF/dummy.xml</mapping-file>
+ <mapping-file>/model/xmlmapped/address.xml</mapping-file>
+ <mapping-file>/model/xmlmapped/building.xml</mapping-file>
+ <mapping-file>/model/xmlmapped/mammal.xml</mapping-file>
+ </persistence-unit>
+</persistence>
Copied: jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/address.xml (from rev 17062, jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/address.xml)
===================================================================
--- jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/address.xml (rev 0)
+++ jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/address.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,17 @@
+<?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"
+ >
+ <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>
+
Copied: jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/building.xml (from rev 17062, jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/building.xml)
===================================================================
--- jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/building.xml (rev 0)
+++ jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/building.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,15 @@
+<?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"
+ >
+ <package>model.xmlmapped</package>
+ <mapped-superclass class="Building" access="FIELD" metadata-complete="true"> <!--means ignore annotations-->
+ <attributes>
+ <one-to-one name="address" fetch="LAZY"/>
+ </attributes>
+ </mapped-superclass>
+</entity-mappings>
+
Copied: jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/mammal.xml (from rev 17062, jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/mammal.xml)
===================================================================
--- jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/mammal.xml (rev 0)
+++ jpamodelgen/trunk/generator/src/test/resources/model/xmlmapped/mammal.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -0,0 +1,20 @@
+<?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"
+ >
+ <package>model.xmlmapped</package>
+ <entity class="LivingBeing" access="FIELD" metadata-complete="true">
+ <attributes>
+ <basic name="isReallyAlive"/>
+ </attributes>
+ </entity>
+ <entity class="Mammal" access="FIELD" metadata-complete="true">
+ <attributes>
+ <id name="id"/>
+ <basic name="subclass"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: jpamodelgen/trunk/generator/src/test/suite/unit-tests.xml (from rev 17061, jpamodelgen/trunk/test/src/test/suite/unit-tests.xml)
===================================================================
--- jpamodelgen/trunk/generator/src/test/suite/unit-tests.xml (rev 0)
+++ jpamodelgen/trunk/generator/src/test/suite/unit-tests.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -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="test"/>
+ </packages>
+ </test>
+</suite>
\ No newline at end of file
Deleted: jpamodelgen/trunk/test/src/main/java/model/Address.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Address.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Address.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,37 +0,0 @@
-package model;
-
-import javax.persistence.Embeddable;
-
-/**
- * @author Emmanuel Bernard
- */
- at Embeddable
-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;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Area.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Area.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Area.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,42 +0,0 @@
-package model;
-
-import javax.persistence.MappedSuperclass;
-
-/**
- * @author Emmanuel Bernard
- */
- at MappedSuperclass
-public class Area {
- private int length;
- private int width;
- private int height;
-
- //should not be persistent
- public int getVolume() {
- return length*width*height;
- }
-
- public int getLength() {
- return length;
- }
-
- public void setLength(int length) {
- this.length = length;
- }
-
- public int getWidth() {
- return width;
- }
-
- public void setWidth(int width) {
- this.width = width;
- }
-
- public int getHeight() {
- return height;
- }
-
- public void setHeight(int height) {
- this.height = height;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Building.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Building.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Building.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,19 +0,0 @@
-package model;
-
-import javax.persistence.MappedSuperclass;
-
-/**
- * @author Emmanuel Bernard
- */
- at MappedSuperclass
-public class Building extends Area {
- private Address address;
-
- public Address getAddress() {
- return address;
- }
-
- public void setAddress(Address address) {
- this.address = address;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Customer.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Customer.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Customer.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,28 +0,0 @@
-package model;
-
-import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-
-/**
- * @author Emmanuel Bernard
- */
- at Entity
-public class Customer extends User {
- private Set<Order> orders;
- private String nonPersistent;
-
- @Access(AccessType.FIELD)
- boolean goodPayer;
-
- public Set<Order> getOrders() {
- return orders;
- }
-
- @OneToMany
- public void setOrders(Set<Order> orders) {
- this.orders = orders;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Detail.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Detail.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Detail.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,38 +0,0 @@
-package model;
-
-import javax.persistence.Embeddable;
-
-/**
- * @author Emmanuel Bernard
- */
- at Embeddable
-public class Detail {
- Integer length;
- Integer width;
- Integer height;
- Integer nonPersistent;
-
- public Integer getLength() {
- return length;
- }
-
- public void setLength(Integer length) {
- this.length = length;
- }
-
- public Integer getWidth() {
- return width;
- }
-
- public void setWidth(Integer width) {
- this.width = width;
- }
-
- public Integer getHeight() {
- return height;
- }
-
- public void setHeight(Integer height) {
- this.height = height;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Hominidae.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Hominidae.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Hominidae.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,26 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-
-/**
- * @author Emmanuel Bernard
- */
- at Entity
- at Access(javax.persistence.AccessType.FIELD)
-public class Hominidae extends Mammals {
- private int intelligence;
-
- public int getIntelligence() {
- return intelligence;
- }
-
- public void setIntelligence(int intelligence) {
- this.intelligence = intelligence;
- }
-
- public int getNonPersistent() {
- return 0;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/House.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/House.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/House.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,21 +0,0 @@
-package model;
-
-import javax.persistence.Id;
-import javax.persistence.Entity;
-
-/**
- * @author Emmanuel Bernard
- */
- at Entity
-public class House extends Building {
- @Id
- private Long id;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Human.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Human.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Human.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,20 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-
-/**
- * @author Emmanuel Bernard
- */
- at Entity
-public class Human extends Hominidae {
- private int nonPersistent;
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Item.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Item.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Item.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,71 +0,0 @@
-package model;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
- at Entity
-public class Item {
-
- long _id;
-
- int _quantity;
-
- Product _product;
-
- Order _order;
-
- Detail detail;
-
- @Id
- public long getId() {
- return _id;
- }
-
- public void setId(long id) {
- this._id = id;
- }
-
- public int getQuantity() {
- return _quantity;
- }
-
- public void setQuantity(int quantity) {
- this._quantity = quantity;
- }
-
- @ManyToOne
- public Product getProduct() {
- return _product;
- }
-
- public void setProduct(Product product) {
- this._product = product;
- }
-
- @ManyToOne
- public Order getOrder() {
- return _order;
- }
-
- public void setOrder(Order order) {
- this._order = order;
- }
-
- @OneToMany
- public Map<String, Order> getNamedOrders() {
- return null;
- }
-
- public Detail getDetail() {
- return detail;
- }
-
- public void setDetail(Detail detail) {
- this.detail = detail;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/LivingBeing.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/LivingBeing.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/LivingBeing.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,26 +0,0 @@
-package model;
-
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-
-/**
- * @author Emmanuel Bernard
- */
- at MappedSuperclass
- at Access(javax.persistence.AccessType.FIELD)
-public class LivingBeing {
- boolean isReallyAlive;
-
- public boolean isReallyAlive() {
- return isReallyAlive;
- }
-
- public void setReallyAlive(boolean reallyAlive) {
- isReallyAlive = reallyAlive;
- }
-
- public int nonPersistent() {
- return 0;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Mammals.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Mammals.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Mammals.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,30 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * @author Emmanuel Bernard
- */
- at Entity
-public class Mammals extends LivingBeing {
- private String id;
- private String nbrOfMammals;
-
- @Id
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getNbrOfMammals() {
- return nbrOfMammals;
- }
-
- public void setNbrOfMammals(String nbrOfMammals) {
- this.nbrOfMammals = nbrOfMammals;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Order.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Order.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Order.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,28 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-//@Entity
-public class Order {
-
- //@Id
- long id;
-
- //@OneToMany
- Set<Item> items;
-
- boolean filled;
- Date date;
-
- //@OneToMany
- List<String> notes;
-
- //@ManyToOne
- Shop shop;
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Product.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Product.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Product.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,30 +0,0 @@
-package model;
-
-import java.math.BigDecimal;
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
- at Entity
-public class Product {
-
- transient String nonPersistent;
- static String nonPersistent2;
-
- @Id
- long id;
-
- int test;
-
- String description;
- BigDecimal price;
-
- @ManyToOne
- Shop shop;
-
- @OneToMany
- Set<Item> items;
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/Shop.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/Shop.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/Shop.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,12 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
- at Entity
-public class Shop {
- @Id
- long id;
- String name;
-}
-
\ No newline at end of file
Deleted: jpamodelgen/trunk/test/src/main/java/model/User.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/User.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/User.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,41 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Transient;
-
-/**
- * @author Emmanuel Bernard
- */
- at Entity
-public class User {
- private Long id;
- private String nonPersistent;
- private String name;
-
- @Id
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Transient
- public String getNonPersistent() {
- return nonPersistent;
- }
-
- public void setNonPersistent(String nonPersistent) {
- this.nonPersistent = nonPersistent;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
Deleted: jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Address.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,34 +0,0 @@
-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
Deleted: jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Building.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Building.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Building.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,19 +0,0 @@
-package model.xmlmapped;
-
-import model.Address;
-import model.Area;
-
-/**
- * @author Emmanuel Bernard
- */
-public class Building extends Area {
- private Address address;
-
- public Address getAddress() {
- return address;
- }
-
- public void setAddress(Address address) {
- this.address = address;
- }
-}
\ No newline at end of file
Deleted: jpamodelgen/trunk/test/src/main/java/model/xmlmapped/LivingBeing.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/xmlmapped/LivingBeing.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/xmlmapped/LivingBeing.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,17 +0,0 @@
-package model.xmlmapped;
-
-public class LivingBeing {
- boolean isReallyAlive;
-
- public boolean isReallyAlive() {
- return isReallyAlive;
- }
-
- public void setReallyAlive(boolean reallyAlive) {
- isReallyAlive = reallyAlive;
- }
-
- public int nonPersistent() {
- return 0;
- }
-}
\ No newline at end of file
Deleted: jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Mammal.java
===================================================================
--- jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Mammal.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/java/model/xmlmapped/Mammal.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,23 +0,0 @@
-package model.xmlmapped;
-
-
-public class Mammal extends LivingBeing {
- private String id;
- private String subclass;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getSubclass() {
- return subclass;
- }
-
- public void setSubclass(String subclass) {
- this.subclass = subclass;
- }
-}
\ No newline at end of file
Deleted: jpamodelgen/trunk/test/src/main/resources/META-INF/dummy.xml
===================================================================
--- jpamodelgen/trunk/test/src/main/resources/META-INF/dummy.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/resources/META-INF/dummy.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,14 +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"
- >
- <package>model</package>
- <entity class="Dummy" access="FIELD" metadata-complete="true"> <!-- Class does not exist -->
- <attributes>
- <id name="id"/>
- </attributes>
- </entity>
-</entity-mappings>
Deleted: jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml
===================================================================
--- jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/resources/META-INF/order.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,36 +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"
- >
- <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 name="date"/>
- <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/persistence.xml
===================================================================
--- jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/resources/META-INF/persistence.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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/order.xml</mapping-file>
- <mapping-file>/META-INF/dummy.xml</mapping-file>
- <mapping-file>/model/xmlmapped/address.xml</mapping-file>
- <mapping-file>/model/xmlmapped/building.xml</mapping-file>
- <mapping-file>/model/xmlmapped/mammal.xml</mapping-file>
- </persistence-unit>
-</persistence>
Deleted: jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/address.xml
===================================================================
--- jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/address.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/address.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,17 +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"
- >
- <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>
-
Deleted: jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/building.xml
===================================================================
--- jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/building.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/building.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,15 +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"
- >
- <package>model.xmlmapped</package>
- <mapped-superclass class="Building" access="FIELD" metadata-complete="true"> <!--means ignore annotations-->
- <attributes>
- <one-to-one name="address" fetch="LAZY"/>
- </attributes>
- </mapped-superclass>
-</entity-mappings>
-
Deleted: jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/mammal.xml
===================================================================
--- jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/mammal.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/main/resources/model/xmlmapped/mammal.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,20 +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"
- >
- <package>model.xmlmapped</package>
- <entity class="LivingBeing" access="FIELD" metadata-complete="true">
- <attributes>
- <basic name="isReallyAlive"/>
- </attributes>
- </entity>
- <entity class="Mammal" access="FIELD" metadata-complete="true">
- <attributes>
- <id name="id"/>
- <basic name="subclass"/>
- </attributes>
- </entity>
-</entity-mappings>
Deleted: jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java
===================================================================
--- jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/test/java/tests/AccessTypeTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,75 +0,0 @@
-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
- */
- at Test
-public class AccessTypeTest {
-
- @Test
- public void testExcludeTransientFieldAndStatic() throws Exception{
- absenceOfField( "model.Product_", "nonPersistent" );
- absenceOfField( "model.Product_", "nonPersistent2" );
- }
-
- @Test
- public void testDefaultAccessTypeOnEntity() throws Exception{
- absenceOfField( "model.User_", "nonPersistent" );
- }
-
- @Test
- public void testDefaultAccessTypeForSubclassOfEntity() throws Exception{
- absenceOfField( "model.Customer_", "nonPersistent" );
- }
-
- @Test
- public void testDefaultAccessTypeForEmbeddable() throws Exception{
- absenceOfField( "model.Detail_", "nonPersistent " );
- }
-
- @Test
- public void testDefaultAccessTypeForMappedSuperclass() throws Exception{
- absenceOfField( "model.Detail_", "volume" );
- }
-
- @Test
- public void testExplicitAccessTypeAndDefaultFromRootEntity() throws Exception{
- absenceOfField( "model.LivingBeing_", "nonPersistent", "eplicit access type on mapped superclass" );
- absenceOfField( "model.Hominidae_", "nonPersistent", "eplicit access type on entity" );
- absenceOfField( "model.Human_", "nonPersistent", "proper inheritance from root entity access type" );
- }
-
- @Test
- public void testMemberAccessType() throws Exception{
- presenceOfField( "model.Customer_", "goodPayer", "access type overriding" );
- }
-
- private void absenceOfField(String className, String fieldName) throws ClassNotFoundException {
- absenceOfField( className, fieldName, "field should not be persistent" );
- }
- private void absenceOfField(String className, String fieldName, String errorString) throws ClassNotFoundException {
- Assert.assertFalse( isFieldHere(className, fieldName), errorString );
- }
-
- private void presenceOfField(String className, String fieldName, String errorString) throws ClassNotFoundException {
- Assert.assertTrue( isFieldHere(className, fieldName), errorString );
- }
-
- private boolean isFieldHere(String className, String fieldName) throws ClassNotFoundException {
- Class<?> user_ = Class.forName( className );
- try {
- final Field field = user_.getField( fieldName );
- return true;
- }
- catch (NoSuchFieldException e) {
- return false;
- }
- }
-}
Deleted: jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java
===================================================================
--- jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/test/java/tests/InheritanceTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,29 +0,0 @@
-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
- */
- at 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/tests/QueryTest.java
===================================================================
--- jpamodelgen/trunk/test/src/test/java/tests/QueryTest.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/test/java/tests/QueryTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,146 +0,0 @@
-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);
- }*/
-
-}
Deleted: jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java
===================================================================
--- jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/test/java/tests/XmlMappingTest.java 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,38 +0,0 @@
-package tests;
-
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-
-/**
- * @author Hardy Ferentschik
- */
-public class XmlMappingTest {
- @Test
- public void testXmlConfiguredEmbeddedClassGenerated() throws Exception {
- assertNotNull( Class.forName( "model.xmlmapped.Address_" ) );
- }
-
- @Test
- public void testXmlConfiguredMappedSuperclassGenerated() throws Exception {
- Class<?> building = Class.forName( "model.xmlmapped.Building_" );
- assertNotNull( building );
- assertNotNull( building.getField( "address" ) );
- }
-
- @Test
- public void testClassHierarchy() throws Exception {
- Class<?> mammal = Class.forName( "model.xmlmapped.Mammal_" );
- assertNotNull( mammal );
-
- Class<?> being = Class.forName( "model.xmlmapped.LivingBeing_" );
- assertNotNull( being );
-
- assertTrue( mammal.getSuperclass().equals( being ) );
- }
-
- @Test(expectedExceptions = ClassNotFoundException.class)
- public void testNonExistentMappedClassesGetIgnored() throws Exception {
- Class.forName( "model.Dummy_" );
- }
-}
\ No newline at end of file
Deleted: jpamodelgen/trunk/test/src/test/suite/unit-tests.xml
===================================================================
--- jpamodelgen/trunk/test/src/test/suite/unit-tests.xml 2009-07-10 10:08:50 UTC (rev 17063)
+++ jpamodelgen/trunk/test/src/test/suite/unit-tests.xml 2009-07-10 11:58:29 UTC (rev 17064)
@@ -1,9 +0,0 @@
-<!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
More information about the hibernate-commits
mailing list