Author: rareddy Date: 2009-07-07 15:18:35 -0400 (Tue, 07 Jul 2009) New Revision: 1098 Added: trunk/client-jdbc/src/test/java/org/ trunk/client-jdbc/src/test/java/org/teiid/ trunk/client-jdbc/src/test/java/org/teiid/jdbc/ trunk/client-jdbc/src/test/java/org/teiid/jdbc/TestTeiidDriver.java Modified: trunk/client-jdbc/src/main/java/org/teiid/jdbc/TeiidDriver.java trunk/client-jdbc/src/main/resources/META-INF/services/java.sql.Driver Log: TEIID-701 Modified: trunk/client-jdbc/src/main/java/org/teiid/jdbc/TeiidDriver.java =================================================================== --- trunk/client-jdbc/src/main/java/org/teiid/jdbc/TeiidDriver.java 2009-07-07 18:28:08 UTC (rev 1097) +++ trunk/client-jdbc/src/main/java/org/teiid/jdbc/TeiidDriver.java 2009-07-07 19:18:35 UTC (rev 1098) @@ -52,13 +52,11 @@ import com.metamatrix.jdbc.util.MMJDBCURL; /** - * <p> The java.sql.DriverManager class uses this class to connect to MetaMatrix. - * The Driver Manager maintains a pool of TeiidDriver objects, which it could use - * to connect to MetaMatrix. The TeiidDriver class has a static initializer, which - * is used to instantiate and register itsef with java.sql.DriverManager. The + * <p> The java.sql.DriverManager class uses this class to connect to Teiid Server or Teiid Embedded. + * The TeiidDriver class has a static initializer, which + * is used to instantiate and register itself with java.sql.DriverManager. The * DriverManager's <code>getConnection</code> method calls <code>connect</code> - * method on available registered drivers. The first driver to recognise the given - * url is used to obtain a connection.</p> + * method on available registered drivers. </p> */ public final class TeiidDriver extends BaseDriver { Modified: trunk/client-jdbc/src/main/resources/META-INF/services/java.sql.Driver =================================================================== --- trunk/client-jdbc/src/main/resources/META-INF/services/java.sql.Driver 2009-07-07 18:28:08 UTC (rev 1097) +++ trunk/client-jdbc/src/main/resources/META-INF/services/java.sql.Driver 2009-07-07 19:18:35 UTC (rev 1098) @@ -1,2 +1 @@ -com.metamatrix.jdbc.MMDriver -com.metamatrix.jdbc.EmbeddedDriver \ No newline at end of file +org.teiid.jdbc.TeiidDriver \ No newline at end of file Added: trunk/client-jdbc/src/test/java/org/teiid/jdbc/TestTeiidDriver.java =================================================================== --- trunk/client-jdbc/src/test/java/org/teiid/jdbc/TestTeiidDriver.java (rev 0) +++ trunk/client-jdbc/src/test/java/org/teiid/jdbc/TestTeiidDriver.java 2009-07-07 19:18:35 UTC (rev 1098) @@ -0,0 +1,142 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.jdbc; + +import java.sql.DriverPropertyInfo; +import java.sql.SQLException; +import java.util.Properties; + +import junit.framework.TestCase; + +import com.metamatrix.common.api.MMURL; +import com.metamatrix.jdbc.BaseDataSource; +import com.metamatrix.jdbc.api.ExecutionProperties; + +public class TestTeiidDriver extends TestCase { + TeiidDriver drv = new TeiidDriver(); + public String localhost = "localhost"; //$NON-NLS-1$ + + public TestTeiidDriver(String name) { + super(name); + + } + + protected void setUp() throws Exception { + } + + /** Valid format of urls*/ + public void testAcceptsURL1() throws Exception { + assertNotNull(drv); + assertTrue(drv.acceptsURL("jdbc:teiid:jvdb@mm://localhost:1234")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:metamatrix:jvdb@mm://localhost:1234")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234;version=x")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234,localhost2:12342,localhost3:12343")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234,localhost2:12342,localhost3:12343;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mms://localhost:1234;logLevel=1;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@mm://localhost:1234;logLevel=2;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234;logLevel=2;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log;txnAutoWrap=OFF;paritalResultsMode=true")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:jvdb@mms://localhost:1234")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234;version=x")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://localhost:1234,localhost2:12342,localhost3:12343")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mms://localhost:1234,localhost2:12342,localhost3:12343;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mms://localhost:1234;logLevel=2;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log;txnAutoWrap=OFF;paritalResultsMode=true")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://127.0.0.1:1234;logLevel=2")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mms://127.0.0.1:1234")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://127.0.0.1:1234,localhost.mydomain.com:63636;logLevel=2")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://my-host.mydomain.com:53535,127.0.0.1:1234")); //$NON-NLS-1$ + assertTrue(drv.acceptsURL("jdbc:teiid:vdb@mm://123.123.123.123:53535,127.0.0.1:1234")); //$NON-NLS-1$ + + assertTrue(!drv.acceptsURL("jdbc:metamatrix:jvdb@localhost:1234")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:jvdb@localhost:1234")); //$NON-NLS-1$ + + //DQP type + assertTrue(!drv.acceptsURL("jdbc:teiid:jvdb@c:/dqp.properties;version=1")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:jvdb@/foo/dqp.properties;version=1")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:jvdb@../foo/dqp.properties;version=1")); //$NON-NLS-1$ + + assertTrue(!drv.acceptsURL("jdbc:teiid:jvdb@mm://localhost:port")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:vdb@localhost:port;version=x")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234,localhost2:12342,localhost3:12343")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234,localhost2:12342,localhost3:12343;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234;logLevel=1;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234;logLevel=2;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234;logLevel=2;logFile=D:\\metamatrix\\work\\DQP\\log\\jdbcLogFile.log;txnAutoWrap=OFF;paritalResultsMode=true")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:@localhost:1234;stickyConnections=false;socketsPerVM=4")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc:teiid:vdb@mm://my_host.mydomain.com:53535,127.0.0.1:1234")); //$NON-NLS-1$ + } + + /** Invalid format of urls*/ + public void testAcceptsURL2() throws Exception { + assertNotNull(drv); + assertTrue(!drv.acceptsURL("jdbc:matamatrix:test")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("metamatrix:test")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc&matamatrix:test")); //$NON-NLS-1$ + assertTrue(!drv.acceptsURL("jdbc;metamatrix:test")); //$NON-NLS-1$ + } + + public void testParseURL() throws SQLException{ + Properties p = new Properties(); + TeiidDriver.getInstance().parseURL("jdbc:teiid:BQT@mm://slwxp157:1234", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); //$NON-NLS-1$ + assertTrue(p.getProperty(MMURL.CONNECTION.SERVER_URL).equals("mm://slwxp157:1234")); //$NON-NLS-1$ + assertEquals(3, p.size()); + } + + public void testParseURL2() throws SQLException { + Properties p = new Properties(); + TeiidDriver.getInstance().parseURL("jdbc:teiid:BQT@mms://slwxp157:1234;version=3", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("3")); //$NON-NLS-1$ + assertTrue(p.getProperty(MMURL.CONNECTION.SERVER_URL).equals("mms://slwxp157:1234")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VERSION).equals("3")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.APP_NAME).equals(BaseDataSource.DEFAULT_APP_NAME)); + assertEquals(5, p.size()); + } + + public void testParseURL3() throws SQLException{ + Properties p = new Properties(); + TeiidDriver.getInstance().parseURL("jdbc:teiid:BQT@mm://slwxp157:1234,slntmm01:43401,sluxmm09:43302;version=4;txnAutoWrap=ON;partialResultsMode=YES;ApplicationName=Client", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("4")); //$NON-NLS-1$ + assertTrue(p.getProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP).equals("ON")); //$NON-NLS-1$ + assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_MODE).equals("YES")); //$NON-NLS-1$ + assertTrue(p.getProperty(MMURL.CONNECTION.SERVER_URL).equals("mm://slwxp157:1234,slntmm01:43401,sluxmm09:43302")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VERSION).equals("4")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.APP_NAME).equals("Client")); //$NON-NLS-1$ + assertEquals(7, p.size()); + } + + public void testGetPropertyInfo1() throws Exception { + DriverPropertyInfo info[] = drv.getPropertyInfo("jdbc:teiid:vdb@mm://localhost:12345", null); //$NON-NLS-1$ + + assertEquals(6, info.length); + assertEquals(true, info[0].required); + assertEquals("VirtualDatabaseName", info[0].name); //$NON-NLS-1$ + assertEquals("vdb", info[0].value); //$NON-NLS-1$ + } + +} Property changes on: trunk/client-jdbc/src/test/java/org/teiid/jdbc/TestTeiidDriver.java ___________________________________________________________________ Name: svn:mime-type + text/plain