[Hibernate-commits] Hibernate Code SVN: r9602 - trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various

[<hib...@li...>]

Author: epbernard
Date: 2006-03-11 13:52:32 -0500 (Sat, 11 Mar 2006)
New Revision: 9602

Added:
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/ProfessionalAgreement.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Truck.java
Modified:
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/IndexTest.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java
Log:
More test for ANN-207

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/IndexTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/IndexTest.java	2006-03-11 18:17:43 UTC (rev 9601)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/IndexTest.java	2006-03-11 18:52:32 UTC (rev 9602)
@@ -1,6 +1,8 @@
 //$Id$
 package org.hibernate.test.annotations.various;
 
+import java.util.Date;
+
 import org.hibernate.test.annotations.TestCase;
 import org.hibernate.Session;
 
@@ -26,10 +28,36 @@
 		s.close();
 	}
 
+	public void testIndexAndJoined() throws Exception {
+		Session s = openSession();
+		s.getTransaction().begin();
+		Conductor cond = new Conductor();
+		cond.setName( "Bob" );
+		s.persist( cond );
+		ProfessionalAgreement agreement = new ProfessionalAgreement();
+		agreement.setExpirationDate( new Date() );
+		s.persist( agreement );
+		Truck truck = new Truck();
+		truck.setAgreement( agreement );
+		truck.setWeight( 20 );
+		truck.setRegistrationNumber( "2003424" );
+		truck.setYear( 2005 );
+		truck.setCurrentConductor( cond );
+		s.persist( truck );
+		s.flush();
+		s.delete( truck );
+		s.delete( agreement );
+		s.delete( cond );
+		s.getTransaction().rollback();
+		s.close();
+	}
+
 	protected Class[] getMappings() {
 		return new Class[] {
 				Conductor.class,
-				Vehicule.class
+				Vehicule.class,
+				ProfessionalAgreement.class,
+				Truck.class
 		};
 	}
 }

Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/ProfessionalAgreement.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/ProfessionalAgreement.java	2006-03-11 18:17:43 UTC (rev 9601)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/ProfessionalAgreement.java	2006-03-11 18:52:32 UTC (rev 9602)
@@ -0,0 +1,32 @@
+//$Id: $
+package org.hibernate.test.annotations.various;
+
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+public class ProfessionalAgreement {
+	@Id @GeneratedValue private Integer id;
+	private Date expirationDate;
+
+	public Date getExpirationDate() {
+		return expirationDate;
+	}
+
+	public void setExpirationDate(Date expirationDate) {
+		this.expirationDate = expirationDate;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+}

Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Truck.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Truck.java	2006-03-11 18:17:43 UTC (rev 9601)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Truck.java	2006-03-11 18:52:32 UTC (rev 9602)
@@ -0,0 +1,39 @@
+//$Id: $
+package org.hibernate.test.annotations.various;
+
+import javax.persistence.ManyToOne;
+import javax.persistence.JoinColumn;
+import javax.persistence.Entity;
+
+import org.hibernate.annotations.Index;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+public class Truck extends Vehicule {
+	@Index(name="weigth_idx")
+	private int weight;
+
+	@ManyToOne
+	@JoinColumn(name="agreement_id")
+	@Index(name="agreement_idx")
+	private ProfessionalAgreement agreement;
+
+	public int getWeight() {
+		return weight;
+	}
+
+	public void setWeight(int weight) {
+		this.weight = weight;
+	}
+
+	public ProfessionalAgreement getAgreement() {
+		return agreement;
+	}
+
+	public void setAgreement(ProfessionalAgreement agreement) {
+		this.agreement = agreement;
+	}
+
+}

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java	2006-03-11 18:17:43 UTC (rev 9601)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java	2006-03-11 18:52:32 UTC (rev 9602)
@@ -7,6 +7,8 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Index;
@@ -15,6 +17,7 @@
  * @author Emmanuel Bernard
  */
 @Entity
+@Inheritance(strategy = InheritanceType.JOINED)
 @org.hibernate.annotations.Table(name="Vehicule",
 		indexes = {
 				@Index(name="improbableindex", columnNames={"registration", "Conductor_fk"} ),