Changeset 1034

Timestamp:

10/11/06 11:44:15 (2 years ago)

Author:

jmoore

Message:

#326 fixes periodic NPE in SessionHandler unit test

Files:

• trunk/components/server/test/ome/server/utests/handlers/SessionHandlerMockHibernateTest.java (modified) (3 diffs)

trunk/components/server/test/ome/server/utests/handlers/SessionHandlerMockHibernateTest.java

@@ -32 +32 @@
 import java.lang.reflect.Method;
 import java.sql.Connection;
+import java.util.Iterator;
 
 import javax.sql.DataSource;
@@ -115 +116 @@
     {
         session = null;
-        mockStateful.reset();
-        mockStateless.reset();
-        mockSession.reset();
-        mockFactory.reset();
-        mockTransaction.reset();
-        mockDataSource.reset();
-        mockConnection.reset();
-        mockInvocation.reset();
+        reset(mockStateful,mockStateless,mockSession,mockFactory,mockTransaction,
+                        mockDataSource,mockConnection,mockInvocation);
         super.tearDown();
         if (TransactionSynchronizationManager.isSynchronizationActive())
@@ -431 +426 @@
     }
 
+    
+    private void reset(Mock...mocks)
+    {
+        for (Mock mock : mocks) {
+                        if (mock!=null) mock.reset();
+                }
+    }
+    
     protected Stub printStackTrace()
     {