[jbpm-commits] JBoss JBPM SVN: r4769 - jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri May 8 17:49:21 EDT 2009


Author: alex.guizar at jboss.com
Date: 2009-05-08 17:49:21 -0400 (Fri, 08 May 2009)
New Revision: 4769

Modified:
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java
Log:
[JBPM-2047] avoid setting mock session factory on a shared jbpm configuration instance

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java	2009-05-08 20:47:42 UTC (rev 4768)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/MockSessionFactory.java	2009-05-08 21:49:21 UTC (rev 4769)
@@ -22,6 +22,7 @@
 
   private boolean failOnFlush;
   private boolean failOnClose;
+  private boolean isClosed;
 
   private static final long serialVersionUID = 1L;
 
@@ -50,16 +51,17 @@
   public Session getCurrentSession() throws HibernateException {
     return null;
   }
-  
+
   ////////////////////////////
 
   public void close() throws HibernateException {
-    throw new UnsupportedOperationException();
+    isClosed = true;
   }
 
   public Session openSession(Interceptor interceptor) throws HibernateException {
     throw new UnsupportedOperationException();
   }
+
   public Session openSession(Connection connection, Interceptor interceptor) {
     throw new UnsupportedOperationException();
   }
@@ -89,7 +91,7 @@
   }
 
   public boolean isClosed() {
-    throw new UnsupportedOperationException();
+    return isClosed;
   }
 
   public void evict(Class persistentClass) throws HibernateException {

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java	2009-05-08 20:47:42 UTC (rev 4768)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java	2009-05-08 21:49:21 UTC (rev 4769)
@@ -10,41 +10,35 @@
 
 public class PersistenceDbServiceNoTxTest extends AbstractJbpmTestCase {
 
-  JbpmConfiguration jbpmConfiguration = null;
-  JbpmContext jbpmContext = null;
-  MockSessionFactory mockSessionFactory = null;
-  
-  protected void setUp() throws Exception
-  {
+  JbpmConfiguration jbpmConfiguration;
+  JbpmContext jbpmContext;
+  MockSessionFactory mockSessionFactory;
+
+  protected void setUp() throws Exception {
     super.setUp();
-    jbpmConfiguration = JbpmConfiguration.parseXmlString(
-      "<jbpm-configuration>" +
-      "  <jbpm-context>" +
-      "    <service name='tx' factory='org.jbpm.tx.TxServiceFactory' />" +
-      "    <service name='persistence'>" +
-      "      <factory>" +
-      "        <bean class='org.jbpm.persistence.db.DbPersistenceServiceFactory'>" +
-      "          <field name='isTransactionEnabled'><false /></field>" +
-      "        </bean>" +
-      "      </factory>" +
-      "    </service>" +
-      "    <service name='message' factory='org.jbpm.msg.db.DbMessageServiceFactory' />" +
-      "    <service name='scheduler' factory='org.jbpm.scheduler.db.DbSchedulerServiceFactory' />" +
-      "    <service name='logging' factory='org.jbpm.logging.db.DbLoggingServiceFactory' />" +
-      "    <service name='authentication' factory='org.jbpm.security.authentication.DefaultAuthenticationServiceFactory' />" +
-      "  </jbpm-context>" +
-      "</jbpm-configuration>"
-    );
+    jbpmConfiguration = JbpmConfiguration.parseXmlString("<jbpm-configuration>"
+        + "  <jbpm-context>"
+        + "    <service name='tx' factory='org.jbpm.tx.TxServiceFactory' />"
+        + "    <service name='persistence'>"
+        + "      <factory>"
+        + "        <bean class='org.jbpm.persistence.db.DbPersistenceServiceFactory'>"
+        + "          <field name='isTransactionEnabled'><false /></field>"
+        + "        </bean>"
+        + "      </factory>"
+        + "    </service>"
+        + "    <service name='message' factory='org.jbpm.msg.db.DbMessageServiceFactory' />"
+        + "    <service name='scheduler' factory='org.jbpm.scheduler.db.DbSchedulerServiceFactory' />"
+        + "    <service name='logging' factory='org.jbpm.logging.db.DbLoggingServiceFactory' />"
+        + "    <service name='authentication' factory='org.jbpm.security.authentication.DefaultAuthenticationServiceFactory' />"
+        + "  </jbpm-context>"
+        + "</jbpm-configuration>");
     jbpmContext = jbpmConfiguration.createJbpmContext();
     mockSessionFactory = new MockSessionFactory();
     jbpmContext.setSessionFactory(mockSessionFactory);
   }
 
-  protected void tearDown() throws Exception
-  {
-    jbpmConfiguration = null;
-    jbpmContext = null;
-    mockSessionFactory = null;
+  protected void tearDown() throws Exception {
+    jbpmConfiguration.close();
     super.tearDown();
   }
 
@@ -64,17 +58,18 @@
 
   public void testDefaultRollback() {
     jbpmContext.getSession();
-    
+
     // no transaction config cannot be combined with calling setRollbackOnly
     jbpmContext.setRollbackOnly();
     try {
       jbpmContext.close();
       fail("expected exception");
-    } catch (JbpmException e) {
+    }
+    catch (JbpmException e) {
       // OK
     }
   }
-  
+
   public void testDefaultCommitAfterGetConnection() {
     MockSession mockSession = (MockSession) jbpmContext.getSession();
     jbpmContext.getConnection();
@@ -93,7 +88,8 @@
     try {
       jbpmContext.close();
       fail("expected exception");
-    } catch (JbpmException e) {
+    }
+    catch (JbpmException e) {
       // OK
     }
   }
@@ -103,7 +99,7 @@
 
   public void testGivenConnectionCommit() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
     Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 
@@ -119,11 +115,11 @@
     assertFalse(connectionHelper.wasCommitted);
     assertFalse(connectionHelper.wasRolledBack);
   }
-  
+
   public void testGivenConnectionRollback() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
-	Connection mockConnection = connectionHelper.createMockConnection();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 
     jbpmContext.getSession();
@@ -131,15 +127,16 @@
     try {
       jbpmContext.close();
       fail("expected exception");
-    } catch (JbpmException e) {
+    }
+    catch (JbpmException e) {
       // OK
     }
   }
 
   public void testGivenConnectionCommitAfterGetConnection() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
-	Connection mockConnection = connectionHelper.createMockConnection();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 
     MockSession mockSession = (MockSession) jbpmContext.getSession();
@@ -158,18 +155,19 @@
 
   public void testGivenConnectionRollbackAfterGetConnection() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
-	Connection mockConnection = connectionHelper.createMockConnection();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 
     jbpmContext.getSession();
     jbpmContext.getConnection();
     jbpmContext.setRollbackOnly();
-    
+
     try {
       jbpmContext.close();
       fail("expected exception");
-    } catch (JbpmException e) {
+    }
+    catch (JbpmException e) {
       // OK
     }
   }
@@ -178,9 +176,10 @@
     mockSessionFactory.setFailOnFlush(true);
     MockSession mockSession = (MockSession) jbpmContext.getSession();
     try {
-      jbpmContext.close();      
+      jbpmContext.close();
       fail("expected exception");
-    } catch (JbpmPersistenceException e) {
+    }
+    catch (JbpmPersistenceException e) {
       assertFalse(mockSession.isFlushed);
       assertTrue(mockSession.isClosed);
     }
@@ -190,9 +189,10 @@
     mockSessionFactory.setFailOnClose(true);
     MockSession mockSession = (MockSession) jbpmContext.getSession();
     try {
-      jbpmContext.close();      
+      jbpmContext.close();
       fail("expected exception");
-    } catch (JbpmPersistenceException e) {
+    }
+    catch (JbpmPersistenceException e) {
       assertTrue(mockSession.isFlushed);
       assertFalse(mockSession.isClosed);
     }

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java	2009-05-08 20:47:42 UTC (rev 4768)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java	2009-05-08 21:49:21 UTC (rev 4769)
@@ -8,24 +8,20 @@
 
 public class PersistenceDbServiceTest extends AbstractJbpmTestCase {
 
-  JbpmConfiguration jbpmConfiguration = null;
-  JbpmContext jbpmContext = null;
-  MockSessionFactory mockSessionFactory = null;
-  
-  protected void setUp() throws Exception
-  {
+  JbpmConfiguration jbpmConfiguration;
+  JbpmContext jbpmContext;
+  MockSessionFactory mockSessionFactory;
+
+  protected void setUp() throws Exception {
     super.setUp();
-    jbpmConfiguration = JbpmConfiguration.getInstance();
+    jbpmConfiguration = JbpmConfiguration.parseXmlString("<jbpm-configuration/>");
     jbpmContext = jbpmConfiguration.createJbpmContext();
     mockSessionFactory = new MockSessionFactory();
     jbpmContext.setSessionFactory(mockSessionFactory);
   }
 
-  protected void tearDown() throws Exception
-  {
-    jbpmConfiguration = null;
-    jbpmContext = null;
-    mockSessionFactory = null;
+  protected void tearDown() throws Exception {
+    jbpmConfiguration.close();
     super.tearDown();
   }
 
@@ -54,7 +50,7 @@
     assertTrue(mockSession.isClosed);
     assertFalse(mockSession.isFlushed);
   }
-  
+
   public void testDefaultCommitAfterGetConnection() {
     MockSession mockSession = (MockSession) jbpmContext.getSession();
     assertNotNull(mockSession.transaction);
@@ -85,7 +81,7 @@
 
   public void testGivenConnectionCommit() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
     Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 
@@ -102,10 +98,10 @@
     assertFalse(connectionHelper.wasCommitted);
     assertFalse(connectionHelper.wasRolledBack);
   }
-  
+
   public void testGivenConnectionRollback() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
     Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 
@@ -126,7 +122,7 @@
 
   public void testGivenConnectionCommitAfterGetConnection() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
     Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 
@@ -147,7 +143,7 @@
 
   public void testGivenConnectionRollbackAfterGetConnection() {
     // inject given session
-	MockConnectionHelper connectionHelper = new MockConnectionHelper();
+    MockConnectionHelper connectionHelper = new MockConnectionHelper();
     Connection mockConnection = connectionHelper.createMockConnection();
     jbpmContext.setConnection(mockConnection);
 




More information about the jbpm-commits mailing list