Author: shawkins Date: 2009-05-08 09:50:19 -0400 (Fri, 08 May 2009) New Revision: 893 Modified: trunk/soap/src/test/java/com/metamatrix/soap/service/TestBasicConnectionPoolFactory.java Log: TEIID-497 migrated the fix for case 5042 as an initial solution. The user can now override the driver class using either a teiidpool.properties file in the classpath or with a system property. Modified: trunk/soap/src/test/java/com/metamatrix/soap/service/TestBasicConnectionPoolFactory.java =================================================================== --- trunk/soap/src/test/java/com/metamatrix/soap/service/TestBasicConnectionPoolFactory.java 2009-05-08 03:23:10 UTC (rev 892) +++ trunk/soap/src/test/java/com/metamatrix/soap/service/TestBasicConnectionPoolFactory.java 2009-05-08 13:50:19 UTC (rev 893) @@ -22,6 +22,8 @@ package com.metamatrix.soap.service; +import java.util.Properties; + import junit.framework.TestCase; @@ -30,7 +32,6 @@ */ public class TestBasicConnectionPoolFactory extends TestCase { - private static final BasicConnectionPoolFactory factory = new BasicConnectionPoolFactory(); private static final String TEST_PROPERTY_VALUE = "test"; //$NON-NLS-1$ @@ -39,11 +40,11 @@ */ public void testGetPropertyWSystemPropertySet() { System.setProperty(ConnectionPoolFactory.INITIAL_POOL_SIZE_PROPERTY_KEY, TEST_PROPERTY_VALUE); - assertEquals(TEST_PROPERTY_VALUE, factory.getProperty(ConnectionPoolFactory.INITIAL_POOL_SIZE_PROPERTY_KEY)); + assertEquals(TEST_PROPERTY_VALUE, BasicConnectionPoolFactory.createMergedProperties(new Properties()).getProperty(ConnectionPoolFactory.INITIAL_POOL_SIZE_PROPERTY_KEY)); } public void testGetPropertyRetreiveDefault() { - assertEquals(String.valueOf(BasicConnectionPoolFactory.MAX_ACTIVE_CONNECTIONS_DEFAULT), factory.getProperty(ConnectionPoolFactory.MAX_ACTIVE_CONNECTIONS_PROPERTY_KEY)); + assertEquals(String.valueOf(BasicConnectionPoolFactory.MAX_ACTIVE_CONNECTIONS_DEFAULT), BasicConnectionPoolFactory.createMergedProperties(new Properties()).getProperty(ConnectionPoolFactory.MAX_ACTIVE_CONNECTIONS_PROPERTY_KEY)); } }