[jboss-svn-commits] JBL Code SVN: r27499 - labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore.

[jboss-svn-commits at lists.jboss.org]

Author: mark.little at jboss.com
Date: 2009-07-03 08:39:46 -0400 (Fri, 03 Jul 2009)
New Revision: 27499

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java
Log:
https://jira.jboss.org/jira/browse/JBTM-576

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java	2009-07-03 12:23:28 UTC (rev 27498)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java	2009-07-03 12:39:46 UTC (rev 27499)
@@ -34,6 +34,7 @@
 import com.arjuna.ats.arjuna.ArjunaNames;
 import com.arjuna.ats.arjuna.common.Environment;
 import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.exceptions.ObjectStoreError;
 import com.arjuna.ats.arjuna.objectstore.ObjectStoreImple;
 import com.arjuna.ats.arjuna.gandiva.inventory.Inventory;
 
@@ -48,8 +49,22 @@
         arjPropertyManager.getPropertyManager().setProperty(Environment.STATIC_INVENTORY_IMPLE + "1", "com.arjuna.ats.internal.arjuna.objectstore.JDBCStoreSetup");
         arjPropertyManager.getPropertyManager().setProperty(Environment.JDBC_USER_DB_ACCESS, "com.hp.mwtests.ts.arjuna.objectstore.MyAccess");
 
-        ObjectStoreImple os = (ObjectStoreImple) Inventory.inventory().createVoid(ArjunaNames.Implementation_ObjectStore_JDBCStore());
-
-        assertNotNull(os);
+        boolean passed = false;
+        
+        try
+        {
+            ObjectStoreImple os = (ObjectStoreImple) Inventory.inventory().createVoid(ArjunaNames.Implementation_ObjectStore_JDBCStore());
+    
+            /*
+             * Creation should fail these days due to null Connection being returned from
+             * an invalid JDBC store, rather than in the past checking lazily upon use.
+             */
+        }
+        catch (final ObjectStoreError ex)
+        {
+            passed = true;
+        }
+        
+        assertTrue(passed);
     }
 }