[hibernate-commits] Hibernate SVN: r11192 - branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Sat Feb 10 12:05:29 EST 2007


Author: epbernard
Date: 2007-02-10 12:05:28 -0500 (Sat, 10 Feb 2007)
New Revision: 11192

Added:
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java
Modified:
   branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
Log:
More tests regarding hbm/ann mix when interfaces are used ANN-541

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
+<hibernate-mapping>
+    <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A"
+           proxy="org.hibernate.test.annotations.xml.hbm.A">
+        <id name="AId" column="aID" type="java.lang.Integer">
+            <generator class="identity"/>
+        </id>
+    </class>
+</hibernate-mapping>
\ No newline at end of file

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,11 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface A extends java.io.Serializable {
+	public Integer getAId();
+
+	public void setAId(Integer aId);
+}

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,34 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+
+ at Entity
+ at Inheritance( strategy = InheritanceType.JOINED )
+ at org.hibernate.annotations.Proxy( proxyClass = A.class )
+ at Table( name = "A" )
+public class AImpl implements A {
+	private static final long serialVersionUID = 1L;
+
+	private Integer aId = 0;
+
+	public AImpl() {
+	}
+
+	@Id
+	@GeneratedValue
+	@Column( name = "aID" )
+	public Integer getAId() {
+		return this.aId;
+	}
+
+	public void setAId(Integer aId) {
+		this.aId = aId;
+	}
+}

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
+<hibernate-mapping>
+    <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B"
+                     proxy="org.hibernate.test.annotations.xml.hbm.B"
+                     extends="org.hibernate.test.annotations.xml.hbm.AImpl">
+        <key column="aID"/>
+        <property name="BId" column="bID" type="java.lang.Integer"
+                  not-null="true"/>
+    </joined-subclass>
+</hibernate-mapping>
\ No newline at end of file

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,11 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface B extends A {
+	public Integer getBId();
+
+	public void setBId(Integer bId);
+}

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,26 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+ at Entity
+ at org.hibernate.annotations.Proxy( proxyClass = B.class )
+ at Table( name = "B" )
+public class BImpl extends AImpl implements B {
+	private static final long serialVersionUID = 1L;
+
+	private Integer bId = 0;
+
+	public BImpl() {
+		super();
+	}
+
+	public Integer getBId() {
+		return bId;
+	}
+
+	public void setBId(Integer bId) {
+		this.bId = bId;
+	}
+}
\ No newline at end of file

Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java	2007-02-10 09:23:53 UTC (rev 11191)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java	2007-02-10 17:05:28 UTC (rev 11192)
@@ -63,6 +63,20 @@
 		s.close();
 	}
 
+	public void testManyToOneAndInterface() throws Exception {
+		Session s = openSession();
+		s.getTransaction().begin();
+		B b = new BImpl();
+		b.setBId( 1 );
+		s.persist( b );
+		Z z = new ZImpl();
+		z.setB( b );
+		s.persist( z );
+		s.flush();
+		s.getTransaction().rollback();
+		s.close();
+	}
+
 	@Override
 	protected void configure(Configuration cfg) {
 		super.configure( cfg );
@@ -72,7 +86,11 @@
 	protected Class[] getMappings() {
 		return new Class[]{
 				PrimeMinister.class,
-				Sky.class
+				Sky.class,
+				//AImpl.class,
+				//BImpl.class,
+				ZImpl.class
+
 		};
 	}
 
@@ -80,7 +98,9 @@
 	protected String[] getXmlFiles() {
 		return new String[]{
 				"org/hibernate/test/annotations/xml/hbm/Government.hbm.xml",
-				"org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml"
+				"org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml",
+				"org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
+				"org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
 		};
 	}
 }

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,15 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface Z extends java.io.Serializable {
+  public Integer getZId();
+
+  public void setZId(Integer zId);
+
+  public B getB();
+
+  public void setB(B b);
+}

Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java	                        (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java	2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,45 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+
+ at Entity
+ at Inheritance( strategy = InheritanceType.JOINED )
+ at org.hibernate.annotations.Proxy( proxyClass = Z.class )
+ at Table( name = "Z" )
+public class ZImpl implements Z {
+	private static final long serialVersionUID = 1L;
+
+	private Integer zId = null;
+	private B b = null;
+
+	@Id
+	@GeneratedValue
+	@Column( name = "zID" )
+	public Integer getZId() {
+		return zId;
+	}
+
+	public void setZId(Integer zId) {
+		this.zId = zId;
+	}
+
+	@ManyToOne( optional = false, targetEntity = BImpl.class, fetch = FetchType.LAZY )
+	@JoinColumn( name = "bID", referencedColumnName = "bID")
+	public B getB() {
+		return b;
+	}
+
+	public void setB(B b) {
+		this.b = b;
+	}
+}




More information about the hibernate-commits mailing list