[hibernate-commits] Hibernate SVN: r18427 - in core/trunk: entitymanager/src/test/java/org/hibernate/ejb/test/ops and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: smarlow at redhat.com
Date: 2010-01-06 13:49:52 -0500 (Wed, 06 Jan 2010)
New Revision: 18427

Added:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java
Removed:
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/OrderByTest.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Products.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Widgets.java
Log:
HHH-4688 Make sure @OrderBy works for @ElementCollection. move test case

Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java (from rev 18424, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/OrderByTest.java)
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java	                        (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java	2010-01-06 18:49:52 UTC (rev 18427)
@@ -0,0 +1,63 @@
+package org.hibernate.test.annotations.collectionelement;
+
+import junit.framework.Assert;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
+
+import javax.persistence.EntityManager;
+import java.util.HashSet;
+import java.util.Iterator;
+
+public class OrderByTest extends TestCase {
+
+	/**
+	 * Test @OrderBy on the Widgets.name field.
+	 *
+	 */
+	public void testOrderByName() throws Exception {
+		Session s = openSession();
+		Transaction tx = s.beginTransaction();
+
+		Products p = new Products();
+		HashSet<Widgets> set = new HashSet<Widgets>();
+
+		Widgets widget = new Widgets();
+		widget.setName("hammer");
+		set.add(widget);
+		s.persist(widget);
+
+		widget = new Widgets();
+		widget.setName("axel");
+		set.add(widget);
+		s.persist(widget);
+
+		widget = new Widgets();
+		widget.setName("screwdriver");
+		set.add(widget);
+		s.persist(widget);
+
+		p.setWidgets(set);
+		s.persist(p);
+		tx.commit();
+
+		tx = s.beginTransaction();
+		s.clear();
+		p = (Products) s.get(Products.class,p.getId());
+		Assert.assertTrue("has three Widgets", p.getWidgets().size() == 3);
+		Iterator iter = p.getWidgets().iterator();
+		Assert.assertEquals( "axel", ((Widgets)iter.next()).getName() );
+		Assert.assertEquals( "hammer", ((Widgets)iter.next()).getName() );
+		Assert.assertEquals( "screwdriver", ((Widgets)iter.next()).getName() );
+		tx.commit();
+		s.close();
+	}
+
+	protected Class[] getMappings() {
+		return new Class[] {
+			Products.class,
+			Widgets.class
+		};
+	}
+
+}

Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java (from rev 18424, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Products.java)
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java	                        (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java	2010-01-06 18:49:52 UTC (rev 18427)
@@ -0,0 +1,39 @@
+package org.hibernate.test.annotations.collectionelement;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OrderBy;
+
+import java.util.Set;
+
+ at SuppressWarnings({"unchecked", "serial"})
+
+ at Entity
+public class Products {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	@ElementCollection
+	@OrderBy("name ASC")
+	private Set<Widgets> widgets;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Set<Widgets> getWidgets() {
+		return widgets;
+	}
+
+	public void setWidgets(Set<Widgets> widgets) {
+		this.widgets = widgets;
+	}
+
+}
\ No newline at end of file

Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java (from rev 18424, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Widgets.java)
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java	                        (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java	2010-01-06 18:49:52 UTC (rev 18427)
@@ -0,0 +1,34 @@
+package org.hibernate.test.annotations.collectionelement;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+ at Entity
+public class Widgets {
+	private String name;
+	private int id;
+
+	public Widgets() {
+
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@Id
+	@GeneratedValue
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+}

Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/OrderByTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/OrderByTest.java	2010-01-06 18:42:55 UTC (rev 18426)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/OrderByTest.java	2010-01-06 18:49:52 UTC (rev 18427)
@@ -1,61 +0,0 @@
-package org.hibernate.ejb.test.ops;
-
-import org.hibernate.ejb.test.TestCase;
-
-import javax.persistence.EntityManager;
-import java.util.HashSet;
-import java.util.Iterator;
-
-public class OrderByTest extends TestCase {
-
-	public Class[] getAnnotatedClasses() {
-		return new Class[]{
-				Products.class,
-				Widgets.class
-		};
-	}
-
-	/**
-	 * Test @OrderBy on the Widgets.name field.
-	 *
-	 */
-	public void testOrderByName() throws Exception {
-		EntityManager em = getOrCreateEntityManager();
-		em.getTransaction().begin();
-
-		Products p = new Products();
-		HashSet<Widgets> set = new HashSet<Widgets>();
-
-		Widgets widget = new Widgets();
-		widget.setName("hammer");
-		set.add(widget);
-		em.persist(widget);
-
-		widget = new Widgets();
-		widget.setName("axel");
-		set.add(widget);
-		em.persist(widget);
-
-		widget = new Widgets();
-		widget.setName("screwdriver");
-		set.add(widget);
-		em.persist(widget);
-
-		p.setWidgets(set);
-		em.persist(p);
-		em.getTransaction().commit();
-
-		em.getTransaction().begin();
-		em.clear();
-		p = em.find(Products.class,p.getId());
-		assertTrue("has three Widgets", p.getWidgets().size() == 3);
-		Iterator iter = p.getWidgets().iterator();
-		assertEquals( "axel", ((Widgets)iter.next()).getName() );
-		assertEquals( "hammer", ((Widgets)iter.next()).getName() );
-		assertEquals( "screwdriver", ((Widgets)iter.next()).getName() );
-		em.getTransaction().commit();
-		em.close();
-	}
-
-
-}

Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Products.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Products.java	2010-01-06 18:42:55 UTC (rev 18426)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Products.java	2010-01-06 18:49:52 UTC (rev 18427)
@@ -1,39 +0,0 @@
-package org.hibernate.ejb.test.ops;
-
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OrderBy;
-
-import java.util.Set;
-
- at SuppressWarnings({"unchecked", "serial"})
-
- at Entity
-public class Products {
-	@Id
-	@GeneratedValue
-	private Integer id;
-	
-	@ElementCollection
-	@OrderBy("name ASC")
-	private Set<Widgets> widgets;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Set<Widgets> getWidgets() {
-		return widgets;
-	}
-
-	public void setWidgets(Set<Widgets> widgets) {
-		this.widgets = widgets;
-	}
-
-}
\ No newline at end of file

Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Widgets.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Widgets.java	2010-01-06 18:42:55 UTC (rev 18426)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Widgets.java	2010-01-06 18:49:52 UTC (rev 18427)
@@ -1,34 +0,0 @@
-package org.hibernate.ejb.test.ops;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
- at Entity
-public class Widgets {
-	private String name;
-	private int id;
-
-	public Widgets() {
-
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	@Id
-	@GeneratedValue
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-}