[teiid-commits] teiid SVN: r580 - in trunk: embedded/src/test/java/com/metamatrix/jdbc and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-03-18 15:52:31 -0400 (Wed, 18 Mar 2009)
New Revision: 580

Modified:
   trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties
   trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
   trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java
Log:
TEIID-426: Changed the names of the Driver to "Teiid" and also hooked the driver versions to be derived from the ApplicationInfo object

Modified: trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties
===================================================================
--- trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties	2009-03-18 19:39:32 UTC (rev 579)
+++ trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties	2009-03-18 19:52:31 UTC (rev 580)
@@ -113,7 +113,7 @@
 MMDatabaseMetadata.getModels_error=Error trying to get metadata information for models that match {0} - {1}.
 MMDriver.Err_registering=JDBC driver could not be registered with the DriverManager: {0}.
 MMDriver.urlFormat=The required url format is jdbc:metamatrix:VDBName at mm[s]://server1:port1[,server2:port2][;optional properties]
-MMDriver.Connection_sucess=The JDBC Driver successfully obtained a connection.
+JDBCDriver.Connection_sucess=The JDBC Driver successfully obtained a connection.
 MMDriver.Err_init_appinfo=Could not initialize ApplicationInfo (Version number): {0}.
 MMStatement.Close_stmt_success=Statement closed successfully.
 MMStatement.Stmt_closed=Unable to perform operations on an already closed statement.

Modified: trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
===================================================================
--- trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java	2009-03-18 19:39:32 UTC (rev 579)
+++ trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java	2009-03-18 19:52:31 UTC (rev 580)
@@ -38,12 +38,6 @@
 
     EmbeddedDriver driver = new EmbeddedDriver();
     
-    public void testGetVersion() {
-        assertEquals(EmbeddedDriver.MAJOR_VERSION, driver.getMajorVersion());
-        assertEquals(EmbeddedDriver.MINOR_VERSION, driver.getMinorVersion());
-        assertEquals(EmbeddedDriver.DRIVER_NAME, driver.getDriverName());
-    }
-    
     /*
      * Test method for 'com.metamatrix.jdbc.EmbeddedDriver.acceptsURL(String)'
      * // (\\w:[\\\\,\\/]|file:\\/\\/|\\/|\\\\|(\\.){1,2}){1}

Modified: trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java	2009-03-18 19:39:32 UTC (rev 579)
+++ trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java	2009-03-18 19:52:31 UTC (rev 580)
@@ -51,6 +51,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.metamatrix.common.util.ApplicationInfo;
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.jdbc.util.ResultSetUtil;
 
@@ -116,6 +117,8 @@
                 Object expectedValue = null;
                 Object expectedReturn = expectedMap.get(methods[i].getName());
                 Object[] params = null;
+                
+                if (methods[i].getName().equalsIgnoreCase(DQP_CONFIG_FILE))
 
                 if (expectedReturn instanceof List) {
                     // has input parameters
@@ -1473,13 +1476,13 @@
         expected.put("usesLocalFilePerTable", Boolean.FALSE); //$NON-NLS-1$
 
         // return type -- int
-        expected.put("getDatabaseMinorVersion", new Integer(EmbeddedDriver.MINOR_VERSION)); //$NON-NLS-1$
-        expected.put("getDatabaseMajorVersion", new Integer(EmbeddedDriver.MAJOR_VERSION)); //$NON-NLS-1$
+        expected.put("getDatabaseMinorVersion", new Integer(ApplicationInfo.getInstance().getMinorReleaseVersion())); //$NON-NLS-1$
+        expected.put("getDatabaseMajorVersion", new Integer(ApplicationInfo.getInstance().getMajorReleaseVersion())); //$NON-NLS-1$
         expected.put("getJDBCMajorVersion", new Integer(3)); //$NON-NLS-1$
         expected.put("getJDBCMinorVersion", new Integer(0)); //$NON-NLS-1$
         expected.put("getDefaultTransactionIsolation", new Integer(Connection.TRANSACTION_NONE)); //$NON-NLS-1$
-        expected.put("getDriverMajorVersion", new Integer(EmbeddedDriver.MAJOR_VERSION)); //$NON-NLS-1$
-        expected.put("getDriverMinorVersion", new Integer(EmbeddedDriver.MINOR_VERSION)); //$NON-NLS-1$
+        expected.put("getDriverMajorVersion", new Integer(ApplicationInfo.getInstance().getMajorReleaseVersion())); //$NON-NLS-1$
+        expected.put("getDriverMinorVersion", new Integer(ApplicationInfo.getInstance().getMinorReleaseVersion())); //$NON-NLS-1$
         expected.put("getMaxBinaryLiteralLength", new Integer(NO_LIMIT)); //$NON-NLS-1$
         expected.put("getMaxCatalogNameLength", new Integer(NO_LIMIT)); //$NON-NLS-1$
         expected.put("getMaxCharLiteralLength", new Integer(NO_LIMIT)); //$NON-NLS-1$
@@ -1509,7 +1512,7 @@
         expected.put("getDatabaseProductName", "MetaMatrix Query"); //$NON-NLS-1$ //$NON-NLS-2$
         expected.put("getDatabaseProductVersion", "5.5"); //$NON-NLS-1$ //$NON-NLS-2$
         expected.put("getDriverName", "MetaMatrix Query JDBC Driver"); //$NON-NLS-1$ //$NON-NLS-2$
-        expected.put("getDriverVersion", "5.5"); //$NON-NLS-1$ //$NON-NLS-2$
+        expected.put("getDriverVersion", ApplicationInfo.getInstance().getMajorReleaseVersion()+"."+ApplicationInfo.getInstance().getMinorReleaseVersion()); //$NON-NLS-1$ //$NON-NLS-2$
         expected.put("getExtraNameCharacters", ".@"); //$NON-NLS-1$ //$NON-NLS-2$
         expected.put("getIdentifierQuoteString", "\""); //$NON-NLS-1$ //$NON-NLS-2$
         expected.put("getNumericFunctions", MMDatabaseMetaData.NUMERIC_FUNCTIONS); //$NON-NLS-1$