[Hibernate-commits] Hibernate Code SVN: r9633 - in branches/Branch_3_1/Hibernate3/test/org/hibernate/test: . sql

[<hib...@li...>]

Author: max...@jb...
Date: 2006-03-16 04:13:28 -0500 (Thu, 16 Mar 2006)
New Revision: 9633

Modified:
   branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java
   branches/Branch_3_1/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java
Log:
add GeneralTest to alltest

Modified: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java
===================================================================
--- branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java	2006-03-16 04:33:50 UTC (rev 9632)
+++ branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java	2006-03-16 09:13:28 UTC (rev 9633)
@@ -102,6 +102,7 @@
 import org.hibernate.test.sorted.SortTest;
 import org.hibernate.test.sql.DataDirectOracleSQLTest;
 import org.hibernate.test.sql.Db2SQLTest;
+import org.hibernate.test.sql.GeneralTest;
 import org.hibernate.test.sql.MSSQLTest;
 import org.hibernate.test.sql.MySQLTest;
 import org.hibernate.test.sql.OracleSQLTest;
@@ -268,6 +269,7 @@
 			suite.addTest( OracleSQLTest.suite() );
 			suite.addTest( MSSQLTest.suite() );
 			suite.addTest( MySQLTest.suite() );
+			suite.addTest( GeneralTest.suite() );
 			suite.addTest( CriteriaQueryTest.suite() );
 			suite.addTest( SubselectTest.suite() );
 			suite.addTest( SubselectFetchTest.suite() );

Modified: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java
===================================================================
--- branches/Branch_3_1/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java	2006-03-16 04:33:50 UTC (rev 9632)
+++ branches/Branch_3_1/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java	2006-03-16 09:13:28 UTC (rev 9633)
@@ -4,6 +4,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.hibernate.test.TestCase;
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
@@ -16,7 +19,6 @@
  */
 public class GeneralTest extends TestCase {
 
-	// TODO : add this to AllTests once Max verifies; or delete it :)
 
 	public GeneralTest(String x) {
 		super( x );
@@ -100,11 +102,6 @@
 				.addJoin("emp", "org.employments")
 				.addScalar("regionCode", Hibernate.STRING)
 				.list();
-//		List l = s.createSQLQuery("select {org.*}, {emp.*}, emp.regionCode from organization org left outer join employment emp on org.orgid = emp.employer")
-//			.addEntity("org", Organization.class)
-//			.addJoin("emp", "org.employments")
-//			.addScalar("regionCode", Hibernate.STRING)
-//			.list();
 		assertEquals( l.size(), 2 );
 
 		l = s.createSQLQuery( getOrgEmpPersonSQL() )
@@ -112,11 +109,6 @@
 				.addJoin("emp", "org.employments")
 				.addJoin("pers", "emp.employee")
 				.list();
-//		l = s.createSQLQuery("select {org.*}, {emp.*}, {pers.*} from organization org join employment emp on org.orgid = emp.employer join person pers on pers.perid = emp.employee")
-//			.addEntity("org", Organization.class)
-//			.addJoin("emp", "org.employments")
-//			.addJoin("pers", "emp.employee")
-//			.list();
 		assertEquals( l.size(), 1 );
 
 		s.delete(emp);
@@ -144,17 +136,11 @@
 		List l = s.createSQLQuery( getOrgEmpRegionSQL() )
 				.setResultSetMapping( "org-emp-regionCode" )
 				.list();
-//		List l = s.createSQLQuery("select {org.*}, {emp.*}, emp.regionCode from organization org left outer join employment emp on org.orgid = emp.employer")
-//			.setResultSetMapping( "org-emp-regionCode")
-//			.list();
 		assertEquals( l.size(), 2 );
 
 		l = s.createSQLQuery( getOrgEmpPersonSQL() )
 				.setResultSetMapping( "org-emp-person" )
 				.list();
-//		l = s.createSQLQuery("select {org.*}, {emp.*}, {pers.*} from organization org join employment emp on org.orgid = emp.employer join person pers on pers.perid = emp.employee")
-//			.setResultSetMapping( "org-emp-person" )
-//			.list();
 		assertEquals( l.size(), 1 );
 
 		s.delete(emp);
@@ -292,8 +278,6 @@
 		List list = s.createSQLQuery( getEmploymentSQL() )
 				.addEntity( Employment.class.getName() )
 				.list();
-//		Query namedQuery = s.createSQLQuery("SELECT * FROM EMPLOYMENT").addEntity( Employment.class.getName() );
-//		List list = namedQuery.list();
 		assertEquals( 1,list.size() );
 
 		Employment emp2 = (Employment) list.get(0);
@@ -314,12 +298,6 @@
 				.addEntity( "org", Organization.class )
 				.addJoin( "emp", "org.employments" )
 				.list();
-//		Query queryWithJoin = s.createSQLQuery(
-//		"SELECT org.orgid as {org.id}, org.name as {org.name}, {emp.*}  FROM ORGANIZATION org LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER ")
-//		.addEntity("org", Organization.class).addJoin("emp", "org.employments");
-//
-//		queryWithJoin.list();
-//		list = queryWithJoin.list();
 		assertEquals( 2,list.size() );
 
 		s.clear();
@@ -328,20 +306,6 @@
 				.addEntity( "org", Organization.class )
 				.addJoin( "emp", "org.employments" )
 				.list();
-//		queryWithJoin = s.createSQLQuery(
-//				"SELECT org.orgid as {org.id}, org.name as {org.name}, emp.employer as {emp.key}, emp.empid as {emp.element}, {emp.element.*}  FROM ORGANIZATION org LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER ")
-//				.addEntity("org", Organization.class).addJoin("emp", "org.employments");
-//
-//		list = queryWithJoin.list();
-//		assertEquals( 2,list.size() );
-//
-//		s.clear();
-//
-//		queryWithJoin = s.createSQLQuery(
-//				"SELECT org.orgid as {org.id}, org.name as {org.name}, emp.employer as {emp.key}, emp.empid as {emp.element}, {emp.element.*}  FROM ORGANIZATION org LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER ")
-//				.addEntity("org", Organization.class).addJoin("emp", "org.employments");
-//
-//		list = queryWithJoin.list();
 		assertEquals( 2,list.size() );
 
 		s.clear();
@@ -349,19 +313,11 @@
 		// TODO : why twice?
 		s.getNamedQuery( "organizationreturnproperty" ).list();
 		list = s.getNamedQuery( "organizationreturnproperty" ).list();
-//		queryWithJoin = s.getNamedQuery("organizationreturnproperty");
-//		queryWithJoin.list();
-//
-//		list = queryWithJoin.list();
 		assertEquals( 2,list.size() );
 
 		s.clear();
 
 		list = s.getNamedQuery( "organizationautodetect" ).list();
-//		queryWithJoin = s.getNamedQuery("organizationautodetect");
-//		queryWithJoin.list();
-//
-//		list = queryWithJoin.list();
 		assertEquals( 2,list.size() );
 
 		t.commit();
@@ -379,6 +335,9 @@
 
 	}
 
+	public static Test suite() {
+		return new TestSuite(GeneralTest.class);
+	}
 
 
 }