[hibernate-commits] Hibernate SVN: r11654 - in branches/Branch_3_2/Hibernate3/test/org/hibernate/test: hql and 1 other directories.

Author: steve.ebersole(a)jboss.com Date: 2007-06-07 18:48:34 -0400 (Thu, 07 Jun 2007) New Revision: 11654 Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/exception/SQLExceptionConversionTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/BulkManipulationTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/Name.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java Log: HHH-2662: PostgreSQL testsuite Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/exception/SQLExceptionConversionTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/exception/SQLExceptionConversionTest.java 2007-06-07 22:48:18 UTC (rev 11653) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/exception/SQLExceptionConversionTest.java 2007-06-07 22:48:34 UTC (rev 11654) @@ -45,6 +45,7 @@ SQLExceptionConverter converter = getDialect().buildSQLExceptionConverter(); Session session = openSession(); + session.beginTransaction(); Connection connection = session.connection(); // Attempt to insert some bad values into the T_MEMBERSHIP table that should @@ -76,6 +77,7 @@ } } + session.getTransaction().rollback(); session.close(); } @@ -85,10 +87,10 @@ Session session = openSession(); Connection connection = session.connection(); - // prepare a query against a non-existent table + // prepare/execute a query against a non-existent table PreparedStatement ps = null; try { - ps = connection.prepareStatement("SELECT user_id, user_name FROM tbl_user"); + ps = connection.prepareStatement("SELECT user_id, user_name FROM tbl_no_there"); ps.executeQuery(); fail("SQL compilation should have failed"); Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java 2007-06-07 22:48:18 UTC (rev 11653) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java 2007-06-07 22:48:34 UTC (rev 11654) @@ -961,10 +961,7 @@ private Human genSimpleHuman(String fName, String lName) { Human h = new Human(); - h.setName( new Name() ); - h.getName().setFirst( fName ); - h.getName().setLast( lName ); - h.getName().setInitial('X'); + h.setName( new Name( fName, 'X', lName ) ); return h; } @@ -1241,17 +1238,11 @@ Transaction txn = session.beginTransaction(); Human human = new Human(); - human.setName( new Name() ); - human.getName().setFirst( "Steve" ); - human.getName().setInitial( 'L' ); - human.getName().setLast( "Ebersole" ); + human.setName( new Name( "Steve", 'L', "Ebersole" ) ); session.save( human ); Human friend = new Human(); - friend.setName( new Name() ); - friend.getName().setFirst( "John" ); - friend.getName().setInitial( 'Q' ); - friend.getName().setLast( "Doe" ); + friend.setName( new Name( "John", 'Q', "Doe" ) ); friend.setBodyWeight( 11.0f ); session.save( friend ); Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/BulkManipulationTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/BulkManipulationTest.java 2007-06-07 22:48:18 UTC (rev 11653) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/BulkManipulationTest.java 2007-06-07 22:48:34 UTC (rev 11654) @@ -600,10 +600,7 @@ Transaction t = s.beginTransaction(); Human human = new Human(); - human.setName( new Name() ); - human.getName().setFirst("Stevee"); - human.getName().setInitial('X'); - human.getName().setLast("Ebersole"); + human.setName( new Name( "Stevee", 'X', "Ebersole" ) ); s.save( human ); s.flush(); @@ -654,14 +651,10 @@ Transaction t = s.beginTransaction(); Human human = new Human(); - human.setName( new Name() ); - human.getName().setFirst( "Steve" ); - human.getName().setInitial('E'); + human.setName( new Name( "Steve", 'E', null ) ); Human mother = new Human(); - mother.setName( new Name() ); - mother.getName().setFirst( "Jane" ); - mother.getName().setInitial('E'); + mother.setName( new Name( "Jane", 'E', null ) ); human.setMother( mother ); s.save( human ); Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/Name.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/Name.java 2007-06-07 22:48:18 UTC (rev 11653) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/Name.java 2007-06-07 22:48:34 UTC (rev 11654) @@ -6,17 +6,21 @@ */ public class Name { private String first; - private char initial; + private Character initial; private String last; protected Name() {} - public Name(String first, char initial, String last) { + public Name(String first, Character initial, String last) { this.first = first; this.initial = initial; this.last = last; } + public Name(String first, char initial, String last) { + this( first, new Character( initial ), last ); + } + public String getFirst() { return first; } @@ -25,11 +29,11 @@ this.first = first; } - public char getInitial() { + public Character getInitial() { return initial; } - public void setInitial(char initial) { + public void setInitial(Character initial) { this.initial = initial; } Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2007-06-07 22:48:18 UTC (rev 11653) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2007-06-07 22:48:34 UTC (rev 11654) @@ -99,6 +99,7 @@ // throwing a sql exception because the SQL gets passed // "un-processed"... Session s = openSession(); + s.beginTransaction(); try { String sql = "select {org.*} " + "from organization org"; @@ -109,6 +110,7 @@ // expected behavior } finally { + s.getTransaction().rollback(); s.close(); } }