fixes issue [310989] No hibernate session exception when loading collection, collection loaded to late in hibernate server side flow

3 files changed, 25 insertions, 31 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
index 5330c8738a..bed3974251 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
@@ -57,18 +57,20 @@ public class AllTestsHibernate extends AllConfigs
   @Override
   protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
   {
-    super.initTestClasses(testClasses);
+    testClasses.add(Hibernate_Bugzilla_308895_Test.class);
+    testClasses.add(HibernateExternalAnnotationTest.class);
+    testClasses.add(HibernateMultiValuedOfAttributeTest.class);
+    testClasses.add(HibernateXATransactionTest.class);
+    testClasses.add(HibernateExternalReferenceTest.class);
+    testClasses.add(HibernateQueryTest.class);
+    testClasses.add(HibernateQueryNoCachingTest.class);
+    testClasses.add(HibernateBugzilla_258933_Test.class);
+    testClasses.add(HibernateUnsetTest.class);
+    testClasses.add(HibernateBugzilla_301104_Test.class);
 
-    // if (true)
-    // {
-    // testClasses.clear();
-    // testClasses.add(HibernateQueryTest.class);
-    // testClasses.add(HibernateQueryNoCachingTest.class);
-    // return;
-    // }
+    super.initTestClasses(testClasses);
 
     testClasses.remove(Bugzilla_308895_Test.class);
-    testClasses.add(Hibernate_Bugzilla_308895_Test.class);
 
     // Branching not supported
     testClasses.remove(BranchingTest.class);
@@ -85,9 +87,6 @@ public class AllTestsHibernate extends AllConfigs
     // runs okay when run standalone
     testClasses.remove(Bugzilla_273565_Test.class);
 
-    // add a testcase which has an annotation file
-    testClasses.add(HibernateExternalAnnotationTest.class);
-
     // audit support to do
     // bug 244141
     testClasses.remove(AuditTest.class);
@@ -100,44 +99,37 @@ public class AllTestsHibernate extends AllConfigs
     // this is not nicely supported by Hibernate
     // therefore this step is removed
     testClasses.remove(MultiValuedOfAttributeTest.class);
-    testClasses.add(HibernateMultiValuedOfAttributeTest.class);
 
     // MemStore is not relevant
     testClasses.remove(MEMStoreQueryTest.class);
 
     // replace test case to do external mapping
     testClasses.remove(XATransactionTest.class);
-    testClasses.add(HibernateXATransactionTest.class);
 
     // replace test case with one, disabling some non working testcases
     // see the HibernateExternalReferenceTest for a description
     testClasses.remove(ExternalReferenceTest.class);
-    testClasses.add(HibernateExternalReferenceTest.class);
 
     // this testcases removes and creates a resource with the
     // same path in one transaction, that's not supported
     // by hibernate.. because of unique key constraints
     testClasses.remove(Bugzilla_272861_Test.class);
 
-    // add the hibernate query test
-    testClasses.add(HibernateQueryTest.class);
-    testClasses.add(HibernateQueryNoCachingTest.class);
-
     // override a testcase because the hibernate store
     // has a different meaning of unset
     testClasses.remove(Bugzilla_258933_Test.class);
-    testClasses.add(HibernateBugzilla_258933_Test.class);
 
     // remove as unsettable has to be re-visited for the hb store
     // see bugzilla 298579
     testClasses.remove(UnsetTest.class);
-    testClasses.add(HibernateUnsetTest.class);
-
-    testClasses.add(HibernateBugzilla_301104_Test.class);
   }
 
-  // overridden because one testcase does not pass as Hibernate currently
-  // does not store the isset boolean values in the database
+  /**
+   * Overridden because one testcase does not pass as Hibernate currently does not store the isset boolean values in the
+   * database.
+   * 
+   * @author Eike Stepper
+   */
   public static class HibernateUnsetTest extends UnsetTest
   {
     @Override
@@ -146,6 +138,9 @@ public class AllTestsHibernate extends AllConfigs
     }
   }
 
+  /**
+   * @author Eike Stepper
+   */
   public static class Hibernate_Bugzilla_308895_Test extends Bugzilla_308895_Test
   {
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
index b4da55aa67..9ec5ebdf3f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
@@ -10,7 +10,7 @@
  */

 package org.eclipse.emf.cdo.tests.hibernate;

 

-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateQueryHandler;

+import org.eclipse.emf.cdo.server.hibernate.IHibernateStore;

 import org.eclipse.emf.cdo.view.CDOQuery;

 

 /**

@@ -23,7 +23,6 @@ public class HibernateQueryNoCachingTest extends HibernateQueryTest
   @Override

   protected void addCacheParameter(CDOQuery query)

   {

-    query.setParameter(HibernateQueryHandler.CACHE_RESULTS, "false");

+    query.setParameter(IHibernateStore.CACHE_RESULTS, false);

   }

-

 }

diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
index 72d6ad70f7..5e38547431 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.tests.hibernate;
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateQueryHandler;
+import org.eclipse.emf.cdo.server.hibernate.IHibernateStore;
 import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
@@ -342,7 +342,7 @@ public class HibernateQueryTest extends AbstractCDOTest
       {
         CDOQuery productQuery = transaction.createQuery("hql", "from Product1");
         productQuery.setMaxResults(pageSize);
-        productQuery.setParameter(HibernateQueryHandler.FIRST_RESULT, page * pageSize);
+        productQuery.setParameter(IHibernateStore.FIRST_RESULT, page * pageSize);
         addCacheParameter(productQuery);
         final List<Product1> queriedProducts = productQuery.getResult(Product1.class);
         assertTrue(queriedProducts.size() <= pageSize);
@@ -493,6 +493,6 @@ public class HibernateQueryTest extends AbstractCDOTest
 
   protected void addCacheParameter(CDOQuery query)
   {
-    query.setParameter(HibernateQueryHandler.CACHE_RESULTS, "true");
+    query.setParameter(IHibernateStore.CACHE_RESULTS, true);
   }
 }