[federate-commits] Federate SVN: r32 - trunk/federate-embedded/src/test/java/com/metamatrix/jdbc.

[federate-commits at lists.jboss.org]

Author: rareddy
Date: 2008-11-24 15:35:20 -0500 (Mon, 24 Nov 2008)
New Revision: 32

Modified:
   trunk/federate-embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
Log:
Fixing the driver code to correctly find the VDB based on the classpath deployment profile.

Modified: trunk/federate-embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
===================================================================
--- trunk/federate-embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java	2008-11-24 20:17:34 UTC (rev 31)
+++ trunk/federate-embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java	2008-11-24 20:35:20 UTC (rev 32)
@@ -133,24 +133,25 @@
         Properties p = new Properties();
         driver.parseURL("jdbc:metamatrix:BQT", p);
         assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT"));
-        assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("classpath:BQT/mm.properties"));        
+        assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("classpath:/mm.properties"));        
     }
     
     public void testParseURL55() throws SQLException{
         Properties p = new Properties();
         driver.parseURL("jdbc:metamatrix:BQT;", p);
         assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT"));
-        assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("classpath:BQT/mm.properties"));        
+        assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("classpath:/mm.properties"));        
     }    
        
     public void testParseURL6() throws SQLException{
         Properties p = new Properties();
         driver.parseURL("jdbc:metamatrix:BQT;partialResultsMode=true;version=1", p);
         assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT"));
-        assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("classpath:BQT/mm.properties"));
+        assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("classpath:/mm.properties"));
         assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_MODE).equals("true"));
         assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("1"));
-        assertEquals(5, p.size());                
+        assertTrue(p.getProperty("vdb.definition").equals("BQT.vdb"));
+        assertEquals(6, p.size());                
         
     }