Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r10149 - in trunk: Hibernate3/test/org/hibernate/test/bytecode/javassist HibernateExt/metadata/src/test/org/hibernate/test/annotations HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone HibernateExt/metadata/src/test/org/hibernate/test/annotations/override HibernateExt/metadata/src/test/org/hibernate/test/annotations/query HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml
Author: epbernard
Date: 2006-07-25 13:08:43 -0400 (Tue, 25 Jul 2006)
New Revision: 10149
Added:
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Hammer.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Tool.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/hammer.hbm.xml
trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Organization.java
Removed:
trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Hammer.java
trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/ProxyBreakingTest.java
trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Tool.java
trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/hammer.hbm.xml
Modified:
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/override/Trip.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/Dimensions.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Administration.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/metadata-complete.xml
Log:
Move JDK 5 dependent tests to annotations
more tests for Annotations
Deleted: trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Hammer.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Hammer.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Hammer.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -1,21 +0,0 @@
-//$Id: $
-package org.hibernate.test.bytecode.javassist;
-
-/**
- * @author Emmanuel Bernard
- */
-public class Hammer implements Tool {
- private Long id;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Integer usage() {
- return 0;
- }
-}
Deleted: trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/ProxyBreakingTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/ProxyBreakingTest.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/ProxyBreakingTest.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -1,48 +0,0 @@
-//$Id: $
-package org.hibernate.test.bytecode.javassist;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.test.TestCase;
-
-/**
- * @author Emmanuel Bernard
- */
-public class ProxyBreakingTest extends TestCase {
-
- static {
- System.setProperty( "hibernate.bytecode.provider", "javassist" );
- }
-
- public void testProxiedBridgeMethod() throws Exception {
- //bridge methods should not be proxied
- Session s = openSession( );
- Transaction tx = s.beginTransaction();
- Hammer h = new Hammer();
- s.save(h);
- s.flush();
- s.clear();
- assertNotNull( "The proxy creation failure is breaking things", h.getId() );
- h = (Hammer) s.load( Hammer.class, h.getId() );
- assertFalse( Hibernate.isInitialized( h ) );
- tx.rollback();
- s.close();
- }
-
- public ProxyBreakingTest(String name) {
- super( name );
- }
-
- protected String[] getMappings() {
- return new String[] {
- "bytecode/javassist/Hammer.hbm.xml"
- };
- }
-
- @Override
- protected void configure(Configuration cfg) {
- super.configure( cfg.setProperty( "hibernate.bytecode.provider", "javassist" ) );
- }
-}
Deleted: trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Tool.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Tool.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/Tool.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -1,13 +0,0 @@
-//$Id: $
-package org.hibernate.test.bytecode.javassist;
-
-/**
- * @author Emmanuel Bernard
- */
-public interface Tool {
- public Long getId();
-
- public void setId(Long id);
-
- public Number usage();
-}
Deleted: trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/hammer.hbm.xml
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/hammer.hbm.xml 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/Hibernate3/test/org/hibernate/test/bytecode/javassist/hammer.hbm.xml 2006-07-25 17:08:43 UTC (rev 10149)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.test.bytecode.javassist">
- <class name="Hammer">
- <id name="id" type="java.lang.Long">
- <generator class="increment"/>
- </id>
- </class>
-</hibernate-mapping>
\ No newline at end of file
Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Hammer.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Hammer.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Hammer.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -0,0 +1,21 @@
+//$Id: $
+package org.hibernate.test.annotations.bytecode;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class Hammer implements Tool {
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Integer usage() {
+ return 0;
+ }
+}
Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -0,0 +1,48 @@
+//$Id: $
+package org.hibernate.test.annotations.bytecode;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.Hibernate;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.test.TestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class ProxyBreakingTest extends TestCase {
+
+ static {
+ System.setProperty( "hibernate.bytecode.provider", "javassist" );
+ }
+
+ public void testProxiedBridgeMethod() throws Exception {
+ //bridge methods should not be proxied
+ Session s = openSession( );
+ Transaction tx = s.beginTransaction();
+ Hammer h = new Hammer();
+ s.save(h);
+ s.flush();
+ s.clear();
+ assertNotNull( "The proxy creation failure is breaking things", h.getId() );
+ h = (Hammer) s.load( Hammer.class, h.getId() );
+ assertFalse( Hibernate.isInitialized( h ) );
+ tx.rollback();
+ s.close();
+ }
+
+ public ProxyBreakingTest(String name) {
+ super( name );
+ }
+
+ protected String[] getMappings() {
+ return new String[] {
+ "annotations/bytecode/Hammer.hbm.xml"
+ };
+ }
+
+ @Override
+ protected void configure(Configuration cfg) {
+ super.configure( cfg.setProperty( "hibernate.bytecode.provider", "javassist" ) );
+ }
+}
Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Tool.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Tool.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Tool.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -0,0 +1,13 @@
+//$Id: $
+package org.hibernate.test.annotations.bytecode;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface Tool {
+ public Long getId();
+
+ public void setId(Long id);
+
+ public Number usage();
+}
Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/hammer.hbm.xml
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/hammer.hbm.xml 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/hammer.hbm.xml 2006-07-25 17:08:43 UTC (rev 10149)
@@ -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">
+
+<hibernate-mapping package="org.hibernate.test.annotations.bytecode">
+ <class name="Hammer">
+ <id name="id" type="java.lang.Long">
+ <generator class="increment"/>
+ </id>
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -173,6 +173,18 @@
assertNotNull( discount );
assertFalse( Hibernate.isInitialized( discount.getOwner() ) );
tx.commit();
+
+ s = openSession();
+ tx = s.beginTransaction();
+ discount = (Discount) s.load( Discount.class, discount.getId() );
+ assertNotNull( discount );
+ assertFalse( Hibernate.isInitialized( discount.getOwner() ) );
+ tx.commit();
+
+ s = openSession();
+ tx = s.beginTransaction();
+ s.delete( s.get( Discount.class, discount.getId() ) );
+ tx.commit();
s.close();
}
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/override/Trip.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/override/Trip.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/override/Trip.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -11,8 +11,8 @@
*/
@Entity
@AssociationOverrides({
-@AssociationOverride(name = "from", joinColumns = @JoinColumn(name = "from", nullable = false)),
-@AssociationOverride(name = "to", joinColumns = @JoinColumn(name = "to", nullable = false))
+@AssociationOverride(name = "from", joinColumns = @JoinColumn(name = "from2", nullable = false)),
+@AssociationOverride(name = "to", joinColumns = @JoinColumn(name = "to2", nullable = false))
})
public class Trip extends Move {
}
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/Dimensions.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/Dimensions.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/Dimensions.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -8,6 +8,8 @@
*/
@Embeddable
public class Dimensions {
+
+
private int length;
private int width;
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Administration.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Administration.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Administration.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -17,7 +17,7 @@
@Entity(name = "JavaAdministration")
@Table(name = "JavaAdministration")
@SecondaryTable(name = "Extend")
-public class Administration {
+public class Administration extends Organization {
@Id
private Integer id;
private String firstname;
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -73,6 +73,12 @@
* @author Emmanuel Bernard
*/
public class EJB3OverridenAnnotationReaderTest extends TestCase {
+ public void testMappedSuperclassAnnotations() throws Exception {
+ XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/metadata-complete.xml" );
+ EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Organization.class, context );
+ assertTrue( reader.isAnnotationPresent( MappedSuperclass.class ) );
+ }
+
public void testEntityRelatedAnnotations() throws Exception {
XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/orm.xml" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Administration.class, context );
Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Organization.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Organization.java 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Organization.java 2006-07-25 17:08:43 UTC (rev 10149)
@@ -0,0 +1,17 @@
+//$Id: $
+package org.hibernate.test.reflection.java.xml;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class Organization {
+ private String organizationId;
+
+ public String getOrganizationId() {
+ return organizationId;
+ }
+
+ public void setOrganizationId(String organizationId) {
+ this.organizationId = organizationId;
+ }
+}
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/metadata-complete.xml
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/metadata-complete.xml 2006-07-25 14:17:16 UTC (rev 10148)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/metadata-complete.xml 2006-07-25 17:08:43 UTC (rev 10149)
@@ -14,6 +14,11 @@
</persistence-unit-defaults>
</persistence-unit-metadata>
<package>org.hibernate.test.reflection.java.xml</package>
+ <mapped-superclass class="Organization">
+ <attributes>
+ <basic name="organizationId"/>
+ </attributes>
+ </mapped-superclass>
<entity class="Administration">
<attributes>
<id name="id"/>
|
