diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java index 788f7a9889..e7626a1fa5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java @@ -25,11 +25,14 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; +import javax.persistence.Table; /** * @author Brett Meyer */ @Entity +// "Transaction" reserved in some Dialects +@Table( name = "BankTransaction" ) public class Transaction { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/list/LineItem.java b/hibernate-core/src/test/java/org/hibernate/test/collection/list/LineItem.java index e44fb5523b..768dd19cfc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/list/LineItem.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/list/LineItem.java @@ -23,7 +23,6 @@ */ package org.hibernate.test.collection.list; -import java.math.BigDecimal; /** * @author Steve Ebersole @@ -32,17 +31,15 @@ public class LineItem { private Integer id; private Order order; private String productCode; - private BigDecimal costPer; private int quantity; public LineItem() { } - public LineItem(Order order, String productCode, int quantity, BigDecimal costPer) { + public LineItem(Order order, String productCode, int quantity) { this.order = order; this.productCode = productCode; this.quantity = quantity; - this.costPer = costPer; } public Integer getId() { @@ -69,14 +66,6 @@ public void setProductCode(String productCode) { this.productCode = productCode; } - public BigDecimal getCostPer() { - return costPer; - } - - public void setCostPer(BigDecimal costPer) { - this.costPer = costPer; - } - public int getQuantity() { return quantity; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml index af85b5ab54..eafdc007ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml @@ -1,13 +1,13 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + @@ -16,7 +16,7 @@ - + @@ -37,7 +37,6 @@ - \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/list/Order.java b/hibernate-core/src/test/java/org/hibernate/test/collection/list/Order.java index 4fcd8eab93..7b88f173bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/list/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/list/Order.java @@ -23,7 +23,6 @@ */ package org.hibernate.test.collection.list; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -66,8 +65,8 @@ public void setLineItems(List lineItems) { this.lineItems = lineItems; } - public LineItem addLineItem(String productCode, int quantity, BigDecimal costPer) { - LineItem lineItem = new LineItem( this, productCode, quantity, costPer ); + public LineItem addLineItem(String productCode, int quantity) { + LineItem lineItem = new LineItem( this, productCode, quantity ); lineItems.add( lineItem ); return lineItem; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java index d811d44fcd..2650769820 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.math.BigDecimal; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -132,9 +131,9 @@ public void testInverseListIndex2() { session.beginTransaction(); Order order = new Order( "acme-1" ); - order.addLineItem( "abc", 2, new BigDecimal( 16.1 ) ); - order.addLineItem( "def", 200, new BigDecimal( .01 ) ); - order.addLineItem( "ghi", 13, new BigDecimal( 12.9 ) ); + order.addLineItem( "abc", 2 ); + order.addLineItem( "def", 200 ); + order.addLineItem( "ghi", 13 ); session.save( order ); session.getTransaction().commit(); session.close();