[teiid-commits] teiid SVN: r988 - in trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc: mysql and 1 other directories.

Author: shawkins Date: 2009-05-20 19:07:35 -0400 (Wed, 20 May 2009) New Revision: 988 Removed: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/Util.java Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java Log: TEIID-473 moving util directly onto metadata factory Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java 2009-05-20 21:28:07 UTC (rev 987) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java 2009-05-20 23:07:35 UTC (rev 988) @@ -22,10 +22,16 @@ package org.teiid.connector.jdbc; +import static org.junit.Assert.*; + +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; import org.teiid.connector.language.ICommand; import junit.framework.Assert; +import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; @@ -46,4 +52,15 @@ return util.parseCommand(sql); } + public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { + // Convert from sql to objects + ICommand obj = helpTranslate(vdb, input); + + TranslatedCommand tc = new TranslatedCommand(EnvironmentUtility.createSecurityContext("user"), translator); //$NON-NLS-1$ + tc.translateCommand(obj); + + // Check stuff + assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ + } + } Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/Util.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/Util.java 2009-05-20 21:28:07 UTC (rev 987) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/Util.java 2009-05-20 23:07:35 UTC (rev 988) @@ -1,47 +0,0 @@ -/* - * 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.connector.jdbc; - -import static org.junit.Assert.*; - -import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.jdbc.translator.TranslatedCommand; -import org.teiid.connector.jdbc.translator.Translator; -import org.teiid.connector.language.ICommand; - -import com.metamatrix.cdk.api.EnvironmentUtility; - -public class Util { - - public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { - // Convert from sql to objects - ICommand obj = MetadataFactory.helpTranslate(vdb, input); - - TranslatedCommand tc = new TranslatedCommand(EnvironmentUtility.createSecurityContext("user"), translator); //$NON-NLS-1$ - tc.translateCommand(obj); - - // Check stuff - assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ - } - -} Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java 2009-05-20 21:28:07 UTC (rev 987) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java 2009-05-20 23:07:35 UTC (rev 988) @@ -28,7 +28,6 @@ import org.junit.Test; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.MetadataFactory; -import org.teiid.connector.jdbc.Util; import com.metamatrix.cdk.api.EnvironmentUtility; @@ -55,7 +54,7 @@ String input = "SELECT char(convert(PART_WEIGHT, integer) + 100) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT char((convert(PARTS.PART_WEIGHT, SIGNED INTEGER) + 100)) FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -64,7 +63,7 @@ String input = "SELECT convert(PART_WEIGHT, long) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT convert(PARTS.PART_WEIGHT, SIGNED) FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -73,7 +72,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, long), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT convert(convert(PARTS.PART_WEIGHT, SIGNED), CHAR) FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -82,7 +81,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, date), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT date_format(DATE(PARTS.PART_WEIGHT), '%Y-%m-%d') FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -90,7 +89,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, time), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT date_format(TIME(PARTS.PART_WEIGHT), '%H:%i:%S') FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -98,7 +97,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, timestamp), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT date_format(TIMESTAMP(PARTS.PART_WEIGHT), '%Y-%m-%d %H:%i:%S.%f') FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -106,7 +105,7 @@ String input = "SELECT ifnull(PART_WEIGHT, 'otherString') FROM PARTS"; //$NON-NLS-1$ String output = "SELECT ifnull(PARTS.PART_WEIGHT, 'otherString') FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -114,7 +113,7 @@ String input = "SELECT convert(convert(PART_WEIGHT, integer), string) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT convert(convert(PARTS.PART_WEIGHT, SIGNED INTEGER), CHAR) FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -122,7 +121,7 @@ String input = "SELECT insert(PART_WEIGHT, 1, 5, 'chimp') FROM PARTS"; //$NON-NLS-1$ String output = "SELECT insert(PARTS.PART_WEIGHT, 1, 5, 'chimp') FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -130,7 +129,7 @@ String input = "SELECT locate(PART_WEIGHT, 'chimp', 1) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT locate(PARTS.PART_WEIGHT, 'chimp', 1) FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -138,7 +137,7 @@ String input = "SELECT substring(PART_WEIGHT, 1) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT substring(PARTS.PART_WEIGHT, 1) FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -146,7 +145,7 @@ String input = "SELECT substring(PART_WEIGHT, 1, 5) FROM PARTS"; //$NON-NLS-1$ String output = "SELECT substring(PARTS.PART_WEIGHT, 1, 5) FROM PARTS"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -154,7 +153,7 @@ String input = "SELECT PART_ID FROM PARTS UNION SELECT PART_ID FROM PARTS ORDER BY PART_ID"; //$NON-NLS-1$ String output = "(SELECT PARTS.PART_ID FROM PARTS) UNION (SELECT PARTS.PART_ID FROM PARTS) ORDER BY PART_ID"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestVDB(), + MetadataFactory.helpTestVisitor(getTestVDB(), input, output, TRANSLATOR); } @@ -163,7 +162,7 @@ String input = "select intkey from bqt1.smalla limit 100"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA LIMIT 100"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestBQTVDB(), + MetadataFactory.helpTestVisitor(getTestBQTVDB(), input, output, TRANSLATOR); } @@ -172,7 +171,7 @@ String input = "select intkey from bqt1.smalla limit 50, 100"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA LIMIT 50, 100"; //$NON-NLS-1$ - Util.helpTestVisitor(getTestBQTVDB(), + MetadataFactory.helpTestVisitor(getTestBQTVDB(), input, output, TRANSLATOR); } @@ -181,7 +180,7 @@ String input = "select bitand(intkey, intnum) from bqt1.smalla"; //$NON-NLS-1$ String output = "SELECT convert((SmallA.IntKey & SmallA.IntNum), SIGNED INTEGER) FROM SmallA"; //$NON-NLS-1$ - Util.helpTestVisitor(MetadataFactory.BQT_VDB, + MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); } @@ -190,7 +189,7 @@ String input = "select smalla.intkey from bqt1.smalla inner join bqt1.smallb on smalla.stringkey=smallb.stringkey cross join bqt1.mediuma"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM (SmallA INNER JOIN SmallB ON SmallA.StringKey = SmallB.StringKey) CROSS JOIN MediumA"; //$NON-NLS-1$ - Util.helpTestVisitor(MetadataFactory.BQT_VDB, + MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java =================================================================== --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java 2009-05-20 21:28:07 UTC (rev 987) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java 2009-05-20 23:07:35 UTC (rev 988) @@ -28,7 +28,6 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.MetadataFactory; -import org.teiid.connector.jdbc.Util; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; import org.teiid.connector.language.ICommand; @@ -72,7 +71,7 @@ String input = "select smalla.intkey from bqt1.smalla inner join bqt1.smallb on smalla.stringkey=smallb.stringkey cross join bqt1.mediuma"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA INNER JOIN SmallB ON SmallA.StringKey = SmallB.StringKey CROSS JOIN MediumA"; //$NON-NLS-1$ - Util.helpTestVisitor(MetadataFactory.BQT_VDB, + MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); } @@ -81,7 +80,7 @@ String input = "select smalla.intkey from bqt1.smalla cross join (bqt1.smallb cross join bqt1.mediuma)"; //$NON-NLS-1$ String output = "SELECT SmallA.IntKey FROM SmallA CROSS JOIN (SmallB CROSS JOIN MediumA)"; //$NON-NLS-1$ - Util.helpTestVisitor(MetadataFactory.BQT_VDB, + MetadataFactory.helpTestVisitor(MetadataFactory.BQT_VDB, input, output, TRANSLATOR); }