[teiid-commits] teiid SVN: r2104 - in trunk/connectors: connector-ldap/src/test/java/com/metamatrix and 36 other directories.

Author: rareddy Date: 2010-05-07 16:11:50 -0400 (Fri, 07 May 2010) New Revision: 2104 Added: trunk/connectors/connector-text/src/test/java/org/ trunk/connectors/connector-text/src/test/java/org/teiid/ trunk/connectors/connector-text/src/test/java/org/teiid/resource/ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeConnection.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCExecutionFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/ Removed: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/execution/visitors/ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/test/util/ trunk/connectors/connector-salesforce/src/test/resources/documents/ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/ trunk/connectors/sandbox/translator-yahoo/src/main/java/com/metamatrix/connector/ trunk/connectors/sandbox/translator-yahoo/src/test/java/com/metamatrix/connector/ trunk/connectors/translator-jdbc/src/main/java/org/teiid/connector/jdbc/ trunk/connectors/translator-jdbc/src/main/rar/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeConnection.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeMetadataFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCExecutionFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.class trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/access/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/db2/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/derby/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/extension/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/h2/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/translator/ trunk/connectors/translator-loopback/src/main/java/com/metamatrix/connector/ trunk/connectors/translator-loopback/src/test/java/com/metamatrix/connector/ trunk/connectors/translator-text/src/test/java/org/teiid/resource/adapter/text/ trunk/connectors/translator-text/src/test/resources/EmpData.txt trunk/connectors/translator-text/src/test/resources/EmployeeTestDataSalary.txt trunk/connectors/translator-text/src/test/resources/libraryDelimited.txt trunk/connectors/translator-text/src/test/resources/testDescriptorDelimited.txt Modified: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestMultiFileTextSynchExecution.java trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestRowHeaderTextSynchExecution.java trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextConnection.java trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextConnector.java trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextSynchExecution.java trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/Util.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestExtractFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestLocateFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestModFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2ConvertModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbyCapabilities.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/TestH2Translator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQL5Translator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQLTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLeftOrRightFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLog10FunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleConvertModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestSubstringFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java Log: TEIID-1075, TEIID-1077, TEIID-1078, TEIID-1079, TEIID-1080, TEIID-1081: Translation layer changes. Copied: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text (from rev 2103, trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text) Modified: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestMultiFileTextSynchExecution.java =================================================================== --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestMultiFileTextSynchExecution.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestMultiFileTextSynchExecution.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.connector.text; +package org.teiid.resource.cci.text; import java.util.ArrayList; import java.util.HashSet; Modified: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestRowHeaderTextSynchExecution.java =================================================================== --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestRowHeaderTextSynchExecution.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestRowHeaderTextSynchExecution.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.connector.text; +package org.teiid.resource.cci.text; import junit.framework.TestCase; Modified: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextConnection.java =================================================================== --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnection.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextConnection.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.connector.text; +package org.teiid.resource.cci.text; import java.util.Map; Modified: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextConnector.java =================================================================== --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextConnector.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.connector.text; +package org.teiid.resource.cci.text; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; Modified: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextSynchExecution.java =================================================================== --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextSynchExecution.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/TestTextSynchExecution.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.connector.text; +package org.teiid.resource.cci.text; import java.util.ArrayList; import java.util.List; Modified: trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/Util.java =================================================================== --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/Util.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/connector-text/src/test/java/org/teiid/resource/cci/text/Util.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.connector.text; +package org.teiid.resource.cci.text; import java.io.File; import java.util.List; Deleted: trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeConnection.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeConnection.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeConnection.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,55 +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 java.sql.SQLException; -import java.sql.Statement; - -import com.metamatrix.core.util.SimpleMock; - -/** - * FakeConnection for unit testing - */ -public class FakeConnection { - - boolean closed; - boolean fail; - - /* (non-Javadoc) - * @see java.sql.Connection#createStatement() - */ - public Statement createStatement() throws SQLException { - if (fail) { - throw new SQLException(); - } - return SimpleMock.createSimpleMock(Statement.class); - } - - /* (non-Javadoc) - * @see java.sql.Connection#isClosed() - */ - public boolean isClosed() { - return closed; - } - -} Deleted: trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeMetadataFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeMetadataFactory.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeMetadataFactory.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,66 +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.assertEquals; -import junit.framework.Assert; - -import org.mockito.Mockito; -import org.teiid.connector.language.Command; -import org.teiid.resource.ConnectorException; -import org.teiid.resource.cci.ExecutionContext; -import org.teiid.translator.jdbc.TranslatedCommand; -import org.teiid.translator.jdbc.Translator; - -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; - -public class FakeMetadataFactory { - - public static final String PARTS_VDB = "/PartsSupplier.vdb"; //$NON-NLS-1$ - public static final String BQT_VDB = "/bqt.vdb"; //$NON-NLS-1$ - - public static Command helpTranslate(String vdbFileName, String sql) { - TranslationUtility util = null; - if (PARTS_VDB.equals(vdbFileName)) { - util = new TranslationUtility(FakeMetadataFactory.class.getResource(vdbFileName)); - } else if (BQT_VDB.equals(vdbFileName)){ - util = FakeTranslationFactory.getInstance().getBQTTranslationUtility(); - } else { - Assert.fail("unknown vdb"); //$NON-NLS-1$ - } - return util.parseCommand(sql); - } - - public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { - // Convert from sql to objects - Command obj = helpTranslate(vdb, input); - - TranslatedCommand tc = new TranslatedCommand(Mockito.mock(ExecutionContext.class), translator); - tc.translateCommand(obj); - - // Check stuff - assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ - } - -} Deleted: trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCExecutionFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCExecutionFactory.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCExecutionFactory.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,44 +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.junit.Test; -import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; -import org.teiid.translator.jdbc.Translator; -import org.teiid.translator.jdbc.sqlserver.SQLServerSQLTranslator; -public class TestJDBCExecutionFactory { - - @Test public void testGetExtensionTranslationClassDefault() throws Exception { - JDBCExecutionFactory mcf = new JDBCExecutionFactory(); - assertSame(Translator.class, mcf.getTranslator().getClass()); - } - - @Test public void testGetExtensionTranslationClass() throws Exception { - JDBCExecutionFactory mcf = new JDBCExecutionFactory(); - mcf.setExtensionTranslationClassName(SQLServerSQLTranslator.class.getName()); - assertSame(SQLServerSQLTranslator.class, mcf.getTranslator().getClass()); - } - -} Deleted: trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,77 +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.assertEquals; - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.Types; -import java.util.Arrays; - -import org.junit.Test; -import org.mockito.Mockito; -import org.teiid.connector.language.Command; -import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; -import org.teiid.resource.adapter.jdbc.JDBCProcedureExecution; -import org.teiid.resource.cci.ExecutionContext; -import org.teiid.translator.jdbc.Translator; - -public class TestJDBCProcedureExecution { - - @Test public void testProcedureExecution() throws Exception { - Command command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "exec pm2.spTest8a()"); //$NON-NLS-1$ - Connection connection = Mockito.mock(Connection.class); - CallableStatement cs = Mockito.mock(CallableStatement.class); - Mockito.stub(cs.getUpdateCount()).toReturn(-1); - Mockito.stub(cs.getInt(1)).toReturn(5); - Mockito.stub(connection.prepareCall("{ call spTest8a(?)}")).toReturn(cs); //$NON-NLS-1$ - Translator sqlTranslator = new Translator(); - - JDBCExecutionFactory config = Mockito.mock(JDBCExecutionFactory.class); - Mockito.stub(config.getTranslator()).toReturn(sqlTranslator); - - JDBCProcedureExecution procedureExecution = new JDBCProcedureExecution(command, connection, Mockito.mock(ExecutionContext.class), config, sqlTranslator); - procedureExecution.execute(); - assertEquals(Arrays.asList(5), procedureExecution.getOutputParameterValues()); - Mockito.verify(cs, Mockito.times(1)).registerOutParameter(1, Types.INTEGER); - } - @Test public void testProcedureExecution1() throws Exception { - Command command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "exec pm2.spTest8(1)"); //$NON-NLS-1$ - Connection connection = Mockito.mock(Connection.class); - CallableStatement cs = Mockito.mock(CallableStatement.class); - Mockito.stub(cs.getUpdateCount()).toReturn(-1); - Mockito.stub(cs.getInt(2)).toReturn(5); - Mockito.stub(connection.prepareCall("{ call spTest8(?,?)}")).toReturn(cs); //$NON-NLS-1$ - Translator sqlTranslator = new Translator(); - - JDBCExecutionFactory config = Mockito.mock(JDBCExecutionFactory.class); - Mockito.stub(config.getTranslator()).toReturn(sqlTranslator); - - JDBCProcedureExecution procedureExecution = new JDBCProcedureExecution(command, connection, Mockito.mock(ExecutionContext.class), config, sqlTranslator); - procedureExecution.execute(); - assertEquals(Arrays.asList(5), procedureExecution.getOutputParameterValues()); - Mockito.verify(cs, Mockito.times(1)).registerOutParameter(2, Types.INTEGER); - } - -} Deleted: trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,65 +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 java.sql.Connection; -import java.sql.PreparedStatement; -import java.util.Arrays; - -import org.junit.Test; -import org.mockito.Mockito; -import org.teiid.connector.language.Command; -import org.teiid.connector.language.ExpressionValueSource; -import org.teiid.connector.language.Insert; -import org.teiid.connector.language.Literal; -import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; -import org.teiid.resource.adapter.jdbc.JDBCUpdateExecution; -import org.teiid.resource.cci.ExecutionContext; -import org.teiid.translator.jdbc.Translator; - -public class TestJDBCUpdateExecution { - - @Test public void testBulkUpdate() throws Exception { - Command command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "insert into BQT1.SmallA (IntKey, IntNum) values (1, 2)"); //$NON-NLS-1$ - Literal value = ((Literal)((ExpressionValueSource)((Insert)command).getValueSource()).getValues().get(0)); - Literal value1 = ((Literal)((ExpressionValueSource)((Insert)command).getValueSource()).getValues().get(1)); - value.setMultiValued(true); - value.setBindValue(true); - value.setValue(Arrays.asList(1, 2)); - value1.setMultiValued(true); - value1.setBindValue(true); - value1.setValue(Arrays.asList(2, 3)); - Connection connection = Mockito.mock(Connection.class); - PreparedStatement p = Mockito.mock(PreparedStatement.class); - Mockito.stub(p.executeBatch()).toReturn(new int [] {1, 1}); - Mockito.stub(connection.prepareStatement("INSERT INTO SmallA (IntKey, IntNum) VALUES (?, ?)")).toReturn(p); //$NON-NLS-1$ - - JDBCExecutionFactory config = Mockito.mock(JDBCExecutionFactory.class); - Mockito.stub(config.getTranslator()).toReturn(new Translator()); - - JDBCUpdateExecution updateExecution = new JDBCUpdateExecution(command, connection, Mockito.mock(ExecutionContext.class), config, config.getTranslator()); - updateExecution.execute(); - Mockito.verify(p, Mockito.times(2)).addBatch(); - } - -} Deleted: trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.class =================================================================== (Binary files differ) Deleted: trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,93 +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.assertEquals; - -import java.io.IOException; -import java.util.Collection; - -import junit.framework.Assert; - -import org.mockito.Mockito; -import org.teiid.connector.language.Command; -import org.teiid.resource.ConnectorException; -import org.teiid.resource.cci.ExecutionContext; -import org.teiid.translator.jdbc.TranslatedCommand; -import org.teiid.translator.jdbc.Translator; - -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.query.function.metadata.FunctionMetadataReader; -import com.metamatrix.query.function.metadata.FunctionMethod; - -public class TranslationHelper { - - public static final String PARTS_VDB = "/PartsSupplier.vdb"; //$NON-NLS-1$ - public static final String BQT_VDB = "/bqt.vdb"; //$NON-NLS-1$ - - public static Command helpTranslate(String vdbFileName, String sql) { - return helpTranslate(vdbFileName, null, sql); - } - - public static Command helpTranslate(String vdbFileName, String udf, String sql) { - TranslationUtility util = null; - if (PARTS_VDB.equals(vdbFileName)) { - util = new TranslationUtility(TranslationHelper.class.getResource(vdbFileName)); - } else if (BQT_VDB.equals(vdbFileName)){ - util = FakeTranslationFactory.getInstance().getBQTTranslationUtility(); - } else { - Assert.fail("unknown vdb"); //$NON-NLS-1$ - } - - if (udf != null) { - try { - Collection <FunctionMethod> methods = FunctionMetadataReader.loadFunctionMethods(TranslationHelper.class.getResource(udf).openStream()); - util.setUDF(methods); - } catch (IOException e) { - throw new MetaMatrixRuntimeException("failed to load UDF"); //$NON-NLS-1$ - } - } - return util.parseCommand(sql); - } - - public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { - helpTestVisitor(vdb,null,input, expectedOutput, translator); - } - - public static void helpTestVisitor(String vdb, String udf, String input, String expectedOutput, Translator translator) throws ConnectorException { - // Convert from sql to objects - Command obj = helpTranslate(vdb, udf, input); - - helpTestVisitor(expectedOutput, translator, obj); - } - - public static void helpTestVisitor(String expectedOutput, - Translator translator, Command obj) throws ConnectorException { - TranslatedCommand tc = new TranslatedCommand(Mockito.mock(ExecutionContext.class), translator); - tc.translateCommand(obj); - assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ - } - -} Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeConnection.java (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeConnection.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeConnection.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeConnection.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -0,0 +1,55 @@ +/* + * 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.resource.adapter.jdbc; + +import java.sql.SQLException; +import java.sql.Statement; + +import com.metamatrix.core.util.SimpleMock; + +/** + * FakeConnection for unit testing + */ +public class FakeConnection { + + boolean closed; + boolean fail; + + /* (non-Javadoc) + * @see java.sql.Connection#createStatement() + */ + public Statement createStatement() throws SQLException { + if (fail) { + throw new SQLException(); + } + return SimpleMock.createSimpleMock(Statement.class); + } + + /* (non-Javadoc) + * @see java.sql.Connection#isClosed() + */ + public boolean isClosed() { + return closed; + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeConnection.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/FakeMetadataFactory.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -0,0 +1,66 @@ +/* + * 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.resource.adapter.jdbc; + +import static org.junit.Assert.assertEquals; +import junit.framework.Assert; + +import org.mockito.Mockito; +import org.teiid.connector.language.Command; +import org.teiid.resource.ConnectorException; +import org.teiid.resource.cci.ExecutionContext; +import org.teiid.translator.jdbc.TranslatedCommand; +import org.teiid.translator.jdbc.Translator; + +import com.metamatrix.cdk.api.TranslationUtility; +import com.metamatrix.cdk.unittest.FakeTranslationFactory; + +public class FakeMetadataFactory { + + public static final String PARTS_VDB = "/PartsSupplier.vdb"; //$NON-NLS-1$ + public static final String BQT_VDB = "/bqt.vdb"; //$NON-NLS-1$ + + public static Command helpTranslate(String vdbFileName, String sql) { + TranslationUtility util = null; + if (PARTS_VDB.equals(vdbFileName)) { + util = new TranslationUtility(FakeMetadataFactory.class.getResource(vdbFileName)); + } else if (BQT_VDB.equals(vdbFileName)){ + util = FakeTranslationFactory.getInstance().getBQTTranslationUtility(); + } else { + Assert.fail("unknown vdb"); //$NON-NLS-1$ + } + return util.parseCommand(sql); + } + + public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { + // Convert from sql to objects + Command obj = helpTranslate(vdb, input); + + TranslatedCommand tc = new TranslatedCommand(Mockito.mock(ExecutionContext.class), translator); + tc.translateCommand(obj); + + // Check stuff + assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/FakeMetadataFactory.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCExecutionFactory.java (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCExecutionFactory.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCExecutionFactory.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCExecutionFactory.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -0,0 +1,44 @@ +/* + * 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.resource.adapter.jdbc; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.translator.jdbc.Translator; +import org.teiid.translator.jdbc.sqlserver.SQLServerSQLTranslator; +public class TestJDBCExecutionFactory { + + @Test public void testGetExtensionTranslationClassDefault() throws Exception { + JDBCExecutionFactory mcf = new JDBCExecutionFactory(); + assertSame(Translator.class, mcf.getTranslator().getClass()); + } + + @Test public void testGetExtensionTranslationClass() throws Exception { + JDBCExecutionFactory mcf = new JDBCExecutionFactory(); + mcf.setExtensionTranslationClassName(SQLServerSQLTranslator.class.getName()); + assertSame(SQLServerSQLTranslator.class, mcf.getTranslator().getClass()); + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCExecutionFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCProcedureExecution.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -0,0 +1,77 @@ +/* + * 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.resource.adapter.jdbc; + +import static org.junit.Assert.assertEquals; + +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.Types; +import java.util.Arrays; + +import org.junit.Test; +import org.mockito.Mockito; +import org.teiid.connector.language.Command; +import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.JDBCProcedureExecution; +import org.teiid.resource.cci.ExecutionContext; +import org.teiid.translator.jdbc.Translator; + +public class TestJDBCProcedureExecution { + + @Test public void testProcedureExecution() throws Exception { + Command command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "exec pm2.spTest8a()"); //$NON-NLS-1$ + Connection connection = Mockito.mock(Connection.class); + CallableStatement cs = Mockito.mock(CallableStatement.class); + Mockito.stub(cs.getUpdateCount()).toReturn(-1); + Mockito.stub(cs.getInt(1)).toReturn(5); + Mockito.stub(connection.prepareCall("{ call spTest8a(?)}")).toReturn(cs); //$NON-NLS-1$ + Translator sqlTranslator = new Translator(); + + JDBCExecutionFactory config = Mockito.mock(JDBCExecutionFactory.class); + Mockito.stub(config.getTranslator()).toReturn(sqlTranslator); + + JDBCProcedureExecution procedureExecution = new JDBCProcedureExecution(command, connection, Mockito.mock(ExecutionContext.class), config, sqlTranslator); + procedureExecution.execute(); + assertEquals(Arrays.asList(5), procedureExecution.getOutputParameterValues()); + Mockito.verify(cs, Mockito.times(1)).registerOutParameter(1, Types.INTEGER); + } + @Test public void testProcedureExecution1() throws Exception { + Command command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "exec pm2.spTest8(1)"); //$NON-NLS-1$ + Connection connection = Mockito.mock(Connection.class); + CallableStatement cs = Mockito.mock(CallableStatement.class); + Mockito.stub(cs.getUpdateCount()).toReturn(-1); + Mockito.stub(cs.getInt(2)).toReturn(5); + Mockito.stub(connection.prepareCall("{ call spTest8(?,?)}")).toReturn(cs); //$NON-NLS-1$ + Translator sqlTranslator = new Translator(); + + JDBCExecutionFactory config = Mockito.mock(JDBCExecutionFactory.class); + Mockito.stub(config.getTranslator()).toReturn(sqlTranslator); + + JDBCProcedureExecution procedureExecution = new JDBCProcedureExecution(command, connection, Mockito.mock(ExecutionContext.class), config, sqlTranslator); + procedureExecution.execute(); + assertEquals(Arrays.asList(5), procedureExecution.getOutputParameterValues()); + Mockito.verify(cs, Mockito.times(1)).registerOutParameter(2, Types.INTEGER); + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCProcedureExecution.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCUpdateExecution.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -0,0 +1,65 @@ +/* + * 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.resource.adapter.jdbc; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.util.Arrays; + +import org.junit.Test; +import org.mockito.Mockito; +import org.teiid.connector.language.Command; +import org.teiid.connector.language.ExpressionValueSource; +import org.teiid.connector.language.Insert; +import org.teiid.connector.language.Literal; +import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.JDBCUpdateExecution; +import org.teiid.resource.cci.ExecutionContext; +import org.teiid.translator.jdbc.Translator; + +public class TestJDBCUpdateExecution { + + @Test public void testBulkUpdate() throws Exception { + Command command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "insert into BQT1.SmallA (IntKey, IntNum) values (1, 2)"); //$NON-NLS-1$ + Literal value = ((Literal)((ExpressionValueSource)((Insert)command).getValueSource()).getValues().get(0)); + Literal value1 = ((Literal)((ExpressionValueSource)((Insert)command).getValueSource()).getValues().get(1)); + value.setMultiValued(true); + value.setBindValue(true); + value.setValue(Arrays.asList(1, 2)); + value1.setMultiValued(true); + value1.setBindValue(true); + value1.setValue(Arrays.asList(2, 3)); + Connection connection = Mockito.mock(Connection.class); + PreparedStatement p = Mockito.mock(PreparedStatement.class); + Mockito.stub(p.executeBatch()).toReturn(new int [] {1, 1}); + Mockito.stub(connection.prepareStatement("INSERT INTO SmallA (IntKey, IntNum) VALUES (?, ?)")).toReturn(p); //$NON-NLS-1$ + + JDBCExecutionFactory config = Mockito.mock(JDBCExecutionFactory.class); + Mockito.stub(config.getTranslator()).toReturn(new Translator()); + + JDBCUpdateExecution updateExecution = new JDBCUpdateExecution(command, connection, Mockito.mock(ExecutionContext.class), config, config.getTranslator()); + updateExecution.execute(); + Mockito.verify(p, Mockito.times(2)).addBatch(); + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TestJDBCUpdateExecution.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/TranslationHelper.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -0,0 +1,93 @@ +/* + * 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.resource.adapter.jdbc; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.Collection; + +import junit.framework.Assert; + +import org.mockito.Mockito; +import org.teiid.connector.language.Command; +import org.teiid.resource.ConnectorException; +import org.teiid.resource.cci.ExecutionContext; +import org.teiid.translator.jdbc.TranslatedCommand; +import org.teiid.translator.jdbc.Translator; + +import com.metamatrix.cdk.api.TranslationUtility; +import com.metamatrix.cdk.unittest.FakeTranslationFactory; +import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.query.function.metadata.FunctionMetadataReader; +import com.metamatrix.query.function.metadata.FunctionMethod; + +public class TranslationHelper { + + public static final String PARTS_VDB = "/PartsSupplier.vdb"; //$NON-NLS-1$ + public static final String BQT_VDB = "/bqt.vdb"; //$NON-NLS-1$ + + public static Command helpTranslate(String vdbFileName, String sql) { + return helpTranslate(vdbFileName, null, sql); + } + + public static Command helpTranslate(String vdbFileName, String udf, String sql) { + TranslationUtility util = null; + if (PARTS_VDB.equals(vdbFileName)) { + util = new TranslationUtility(TranslationHelper.class.getResource(vdbFileName)); + } else if (BQT_VDB.equals(vdbFileName)){ + util = FakeTranslationFactory.getInstance().getBQTTranslationUtility(); + } else { + Assert.fail("unknown vdb"); //$NON-NLS-1$ + } + + if (udf != null) { + try { + Collection <FunctionMethod> methods = FunctionMetadataReader.loadFunctionMethods(TranslationHelper.class.getResource(udf).openStream()); + util.setUDF(methods); + } catch (IOException e) { + throw new MetaMatrixRuntimeException("failed to load UDF"); //$NON-NLS-1$ + } + } + return util.parseCommand(sql); + } + + public static void helpTestVisitor(String vdb, String input, String expectedOutput, Translator translator) throws ConnectorException { + helpTestVisitor(vdb,null,input, expectedOutput, translator); + } + + public static void helpTestVisitor(String vdb, String udf, String input, String expectedOutput, Translator translator) throws ConnectorException { + // Convert from sql to objects + Command obj = helpTranslate(vdb, udf, input); + + helpTestVisitor(expectedOutput, translator, obj); + } + + public static void helpTestVisitor(String expectedOutput, + Translator translator, Command obj) throws ConnectorException { + TranslatedCommand tc = new TranslatedCommand(Mockito.mock(ExecutionContext.class), translator); + tc.translateCommand(obj); + assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/resource/adapter/jdbc/TranslationHelper.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/translator) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/translator/TestEscapeSyntaxModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.translator; +package org.teiid.translator.jdbc; import java.sql.Timestamp; import java.util.Arrays; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestExtractFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/translator/TestExtractFunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestExtractFunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.translator; +package org.teiid.translator.jdbc; import java.sql.Timestamp; import java.util.Arrays; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestLocateFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/translator/TestLocateFunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestLocateFunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.translator; +package org.teiid.translator.jdbc; import static org.junit.Assert.assertEquals; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestModFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/translator/TestModFunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestModFunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.translator; +package org.teiid.translator.jdbc; import java.math.BigDecimal; import java.math.BigInteger; Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/extension/TestSQLConversionVisitor.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -0,0 +1,451 @@ +/* + * 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.translator.jdbc; + +import static org.junit.Assert.assertEquals; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.teiid.connector.language.LanguageObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl; +import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl; +import org.teiid.dqp.internal.datamgr.language.TestInsertImpl; +import org.teiid.dqp.internal.datamgr.language.TestProcedureImpl; +import org.teiid.dqp.internal.datamgr.language.TestQueryImpl; +import org.teiid.dqp.internal.datamgr.language.TestUpdateImpl; +import org.teiid.dqp.internal.datamgr.language.TstLanguageBridgeFactory; +import org.teiid.resource.ConnectorException; +import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; +import org.teiid.resource.cci.ExecutionContext; +import org.teiid.translator.jdbc.SQLConversionVisitor; +import org.teiid.translator.jdbc.Translator; + +/** + */ +public class TestSQLConversionVisitor { + + public static final ExecutionContext context = new ExecutionContextImpl("VDB", //$NON-NLS-1$ + 1, + "Payload", //$NON-NLS-1$ + "ConnectionID", //$NON-NLS-1$ + "Connector", //$NON-NLS-1$ + "RequestID", //$NON-NLS-1$ + "PartID", //$NON-NLS-1$ + "ExecCount"); //$NON-NLS-1$ + + private static Translator TRANSLATOR; + + @BeforeClass public static void oneTimeSetup() throws ConnectorException { + TRANSLATOR = new Translator(); + JDBCExecutionFactory env = new JDBCExecutionFactory(); + env.setTrimStrings(true); + TRANSLATOR.initialize(env); + } + + public String getTestVDB() { + return TranslationHelper.PARTS_VDB; + } + + public void helpTestVisitor(String vdb, String input, String expectedOutput) { + helpTestVisitor(vdb, input, expectedOutput, false); + } + + public void helpTestVisitor(String vdb, String input, String expectedOutput, boolean usePreparedStatement) { + Translator trans = new Translator(); + JDBCExecutionFactory env = new JDBCExecutionFactory(); + if (usePreparedStatement) { + env.setUseBindVariables(true); + } + try { + trans.initialize(env); + TranslationHelper.helpTestVisitor(vdb, input, expectedOutput, trans); + } catch (ConnectorException e) { + throw new RuntimeException(e); + } + } + + public static final RuntimeMetadata metadata = TstLanguageBridgeFactory.metadataFactory; + + private String getStringWithContext(LanguageObject obj) throws ConnectorException { + JDBCExecutionFactory env = new JDBCExecutionFactory(); + env.setUseCommentsInSourceQuery(true); + Translator trans = new Translator(); + trans.initialize(env); + SQLConversionVisitor visitor = trans.getSQLConversionVisitor(); + visitor.setExecutionContext(context); + visitor.append(obj); + return visitor.toString(); + } + + @Test public void testSimple() { + helpTestVisitor(getTestVDB(), + "select part_name from parts", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testAliasInSelect() { + helpTestVisitor(getTestVDB(), + "select part_name as x from parts", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME AS x FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testAliasedGroup() { + helpTestVisitor(getTestVDB(), + "select y.part_name from parts y", //$NON-NLS-1$ + "SELECT y.PART_NAME FROM PARTS AS y"); //$NON-NLS-1$ + } + + @Test public void testAliasedGroupAndElement() { + helpTestVisitor(getTestVDB(), + "select y.part_name AS z from parts y", //$NON-NLS-1$ + "SELECT y.PART_NAME AS z FROM PARTS AS y"); //$NON-NLS-1$ + } + + @Test public void testLiteralString() { + helpTestVisitor(getTestVDB(), + "select 'x' from parts", //$NON-NLS-1$ + "SELECT 'x' FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralInteger() { + helpTestVisitor(getTestVDB(), + "select 5 from parts", //$NON-NLS-1$ + "SELECT 5 FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralFloat() { + helpTestVisitor(getTestVDB(), + "select 5.2 from parts", //$NON-NLS-1$ + "SELECT 5.2 FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralLowFloat() { + helpTestVisitor(getTestVDB(), + "select 0.012 from parts", //$NON-NLS-1$ + "SELECT 0.012 FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralLowFloat2() { + helpTestVisitor(getTestVDB(), + "select 0.00012 from parts", //$NON-NLS-1$ + "SELECT 0.00012 FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralHighFloat() { + helpTestVisitor(getTestVDB(), + "select 12345.123 from parts", //$NON-NLS-1$ + "SELECT 12345.123 FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralHighFloat2() { + helpTestVisitor(getTestVDB(), + "select 1234567890.1234567 from parts", //$NON-NLS-1$ + "SELECT 1234567890.1234567 FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralBoolean() { + helpTestVisitor(getTestVDB(), + "select {b'true'}, {b'false'} from parts", //$NON-NLS-1$ + "SELECT 1, 0 FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralDate() { + helpTestVisitor(getTestVDB(), + "select {d '2003-12-31'} from parts", //$NON-NLS-1$ + "SELECT {d '2003-12-31'} FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralTime() { + helpTestVisitor(getTestVDB(), + "select {t '23:59:59'} from parts", //$NON-NLS-1$ + "SELECT {t '23:59:59'} FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralNull() { + helpTestVisitor(getTestVDB(), + "select null from parts", //$NON-NLS-1$ + "SELECT NULL FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testLiteralTimestamp() { + helpTestVisitor(getTestVDB(), + "select {ts '2003-12-31 23:59:59.123'} from parts", //$NON-NLS-1$ + "SELECT {ts '2003-12-31 23:59:59.123'} FROM PARTS"); //$NON-NLS-1$ + } + + @Test public void testSQL89Join() { + helpTestVisitor(getTestVDB(), + "select p.part_name from parts p, supplier_parts s where p.part_id = s.part_id", //$NON-NLS-1$ + "SELECT p.PART_NAME FROM PARTS AS p, SUPPLIER_PARTS AS s WHERE p.PART_ID = s.PART_ID"); //$NON-NLS-1$ + } + + @Test public void testSQL92Join() { + helpTestVisitor(getTestVDB(), + "select p.part_name from parts p join supplier_parts s on p.part_id = s.part_id", //$NON-NLS-1$ + "SELECT p.PART_NAME FROM PARTS AS p INNER JOIN SUPPLIER_PARTS AS s ON p.PART_ID = s.PART_ID"); //$NON-NLS-1$ + } + + @Test public void testSelfJoin() { + helpTestVisitor(getTestVDB(), + "select p.part_name from parts p join parts p2 on p.part_id = p2.part_id", //$NON-NLS-1$ + "SELECT p.PART_NAME FROM PARTS AS p INNER JOIN PARTS AS p2 ON p.PART_ID = p2.PART_ID"); //$NON-NLS-1$ + } + + @Test public void testRightOuterJoin() { + helpTestVisitor(getTestVDB(), + "select p.part_name from parts p right join supplier_parts s on p.part_id = s.part_id", //$NON-NLS-1$ + "SELECT p.PART_NAME FROM SUPPLIER_PARTS AS s LEFT OUTER JOIN PARTS AS p ON p.PART_ID = s.PART_ID"); //$NON-NLS-1$ + } + + @Test public void testLeftOuterJoin() { + helpTestVisitor(getTestVDB(), + "select p.part_name from parts p left join supplier_parts s on p.part_id = s.part_id", //$NON-NLS-1$ + "SELECT p.PART_NAME FROM PARTS AS p LEFT OUTER JOIN SUPPLIER_PARTS AS s ON p.PART_ID = s.PART_ID"); //$NON-NLS-1$ + } + + @Test public void testFullOuterJoin() { + helpTestVisitor(getTestVDB(), + "select p.part_name from parts p full join supplier_parts s on p.part_id = s.part_id", //$NON-NLS-1$ + "SELECT p.PART_NAME FROM PARTS AS p FULL OUTER JOIN SUPPLIER_PARTS AS s ON p.PART_ID = s.PART_ID"); //$NON-NLS-1$ + } + + @Test public void testCompare1() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id = 'x'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID = 'x'"); //$NON-NLS-1$ + } + + @Test public void testCompare2() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id <> 'x'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID <> 'x'"); //$NON-NLS-1$ + } + + @Test public void testCompare3() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id < 'x'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID < 'x'"); //$NON-NLS-1$ + } + + @Test public void testCompare4() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id <= 'x'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID <= 'x'"); //$NON-NLS-1$ + } + + @Test public void testCompare5() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id > 'x'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID > 'x'"); //$NON-NLS-1$ + } + + @Test public void testCompare6() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id >= 'x'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID >= 'x'"); //$NON-NLS-1$ + } + + @Test public void testIn1() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id in ('x')", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID = 'x'"); //$NON-NLS-1$ + } + + @Test public void testIn2() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id in ('x', 'y')", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IN ('x', 'y')"); //$NON-NLS-1$ + } + + @Test public void testIn3() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id not in ('x', 'y')", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID NOT IN ('x', 'y')"); //$NON-NLS-1$ + } + + @Test public void testIsNull1() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id is null", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IS NULL"); //$NON-NLS-1$ + } + + @Test public void testIsNull2() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id is not null", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IS NOT NULL"); //$NON-NLS-1$ + } + + @Test public void testInsertNull() { + helpTestVisitor(getTestVDB(), + "insert into parts (part_id, part_name, part_color, part_weight) values ('a', null, 'c', 'd')", //$NON-NLS-1$ + "INSERT INTO PARTS (PART_ID, PART_NAME, PART_COLOR, PART_WEIGHT) VALUES ('a', NULL, 'c', 'd')"); //$NON-NLS-1$ + } + + @Test public void testUpdateNull() { + helpTestVisitor(getTestVDB(), + "update parts set part_weight = null where part_color = 'b'", //$NON-NLS-1$ + "UPDATE PARTS SET PART_WEIGHT = NULL WHERE PARTS.PART_COLOR = 'b'"); //$NON-NLS-1$ + } + + @Test public void testUpdateWhereNull() { + helpTestVisitor(getTestVDB(), + "update parts set part_weight = 'a' where part_weight = null", //$NON-NLS-1$ + "UPDATE PARTS SET PART_WEIGHT = 'a' WHERE NULL <> NULL"); //$NON-NLS-1$ + } + + @Test public void testPreparedStatementCreationWithUpdate() { + helpTestVisitor(getTestVDB(), + "update parts set part_weight = 'a' where part_weight < 5", //$NON-NLS-1$ + "UPDATE PARTS SET PART_WEIGHT = ? WHERE PARTS.PART_WEIGHT < ?", //$NON-NLS-1$ + true); + } + + @Test public void testPreparedStatementCreationWithInsert() { + helpTestVisitor(getTestVDB(), + "insert into parts (part_weight) values (5)", //$NON-NLS-1$ + "INSERT INTO PARTS (PART_WEIGHT) VALUES (?)", //$NON-NLS-1$ + true); + } + + @Test public void testPreparedStatementCreationWithSelect() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_id not in ('x', 'y') and part_weight < 6", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID NOT IN (?, ?) AND PARTS.PART_WEIGHT < ?", //$NON-NLS-1$ + true); + } + + @Test public void testPreparedStatementCreationWithLike() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where part_name like '%foo'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_NAME LIKE ?", //$NON-NLS-1$ + true); + } + + /** + * ideally this should not happen, but to be on the safe side + * only the right side should get replaced + */ + public void defer_testPreparedStatementCreationWithLeftConstant() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where 'x' = 'y'", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE 1 = ?", //$NON-NLS-1$ + true); + } + + /** + * In the future, functions can be made smarter about which of their literal arguments + * either are (or are not) eligible to be bind variables + */ + @Test public void testPreparedStatementCreationWithFunction() { + helpTestVisitor(getTestVDB(), + "select part_name from parts where concat(part_name, 'x') = concat('y', part_weight)", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE concat(PARTS.PART_NAME, 'x') = concat('y', PARTS.PART_WEIGHT)", //$NON-NLS-1$ + true); + } + + @Test public void testPreparedStatementCreationWithCase() { + helpTestVisitor(getTestVDB(), + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_WEIGHT = CASE WHEN PARTS.PART_NAME='a' THEN 'b' ELSE 'c' END", //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_WEIGHT = CASE WHEN PARTS.PART_NAME = ? THEN 'b' ELSE 'c' END", //$NON-NLS-1$ + true); + } + + @Test public void testVisitIDeleteWithComment() throws Exception { + String expected = "DELETE /*teiid sessionid:ConnectionID, requestid:RequestID.PartID*/ FROM g1 WHERE 100 >= 200 AND 500 < 600"; //$NON-NLS-1$ + assertEquals(expected, getStringWithContext(TestDeleteImpl.example())); + } + + @Test public void testVisitIInsertWithComment() throws Exception { + String expected = "INSERT /*teiid sessionid:ConnectionID, requestid:RequestID.PartID*/ INTO g1 (e1, e2, e3, e4) VALUES (1, 2, 3, 4)"; //$NON-NLS-1$ + assertEquals(expected, getStringWithContext(TestInsertImpl.example("g1"))); //$NON-NLS-1$ + } + + @Test public void testVisitISelectWithComment() throws Exception { + String expected = "SELECT /*teiid sessionid:ConnectionID, requestid:RequestID.PartID*/ g1.e1, g1.e2, g1.e3, g1.e4 FROM g1, g2 AS myAlias, g3, g4 WHERE 100 >= 200 AND 500 < 600 GROUP BY g1.e1, g1.e2, g1.e3, g1.e4 HAVING 100 >= 200 AND 500 < 600 ORDER BY e1, e2 DESC, e3, e4 DESC"; //$NON-NLS-1$ + assertEquals(expected, getStringWithContext(TestQueryImpl.example(false))); + expected = "SELECT /*teiid sessionid:ConnectionID, requestid:RequestID.PartID*/ DISTINCT g1.e1, g1.e2, g1.e3, g1.e4 FROM g1, g2 AS myAlias, g3, g4 WHERE 100 >= 200 AND 500 < 600 GROUP BY g1.e1, g1.e2, g1.e3, g1.e4 HAVING 100 >= 200 AND 500 < 600 ORDER BY e1, e2 DESC, e3, e4 DESC"; //$NON-NLS-1$ + assertEquals(expected, getStringWithContext(TestQueryImpl.example(true))); + } + + @Test public void testVisitIUpdateWithComment() throws Exception { + String expected = "UPDATE /*teiid sessionid:ConnectionID, requestid:RequestID.PartID*/ g1 SET e1 = 1, e2 = 1, e3 = 1, e4 = 1 WHERE 1 = 1"; //$NON-NLS-1$ + assertEquals(expected, getStringWithContext(TestUpdateImpl.example())); + } + + @Test public void testVisitIProcedureWithComment() throws Exception { + String expected = "{ /*teiid sessionid:ConnectionID, requestid:RequestID.PartID*/ call sq3(?,?)}"; //$NON-NLS-1$ + assertEquals(expected, getStringWithContext(TestProcedureImpl.example())); + } + + @Test public void testTrimStrings() throws Exception { + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, "select stringkey from bqt1.smalla", "SELECT rtrim(SmallA.StringKey) FROM SmallA", TRANSLATOR); //$NON-NLS-1$ //$NON-NLS-2$ + } + + @Test public void testNestedSetQuery() throws Exception { + String input = "select part_id id FROM parts UNION ALL (select part_name FROM parts UNION select part_id FROM parts)"; //$NON-NLS-1$ + String output = "SELECT rtrim(PARTS.PART_ID) AS id FROM PARTS UNION ALL (SELECT PARTS.PART_NAME FROM PARTS UNION SELECT rtrim(PARTS.PART_ID) FROM PARTS)"; //$NON-NLS-1$ + + TranslationHelper.helpTestVisitor(TranslationHelper.PARTS_VDB, + input, + output, TRANSLATOR); + } + + @Test public void testNestedSetQuery1() throws Exception { + String input = "select part_id id FROM parts UNION (select part_name FROM parts EXCEPT select part_id FROM parts)"; //$NON-NLS-1$ + String output = "SELECT rtrim(PARTS.PART_ID) AS id FROM PARTS UNION (SELECT PARTS.PART_NAME FROM PARTS EXCEPT SELECT rtrim(PARTS.PART_ID) FROM PARTS)"; //$NON-NLS-1$ + + TranslationHelper.helpTestVisitor(TranslationHelper.PARTS_VDB, + input, + output, TRANSLATOR); + } + + @Test public void testNestedSetQuery2() throws Exception { + String input = "select part_id id FROM parts UNION select part_name FROM parts EXCEPT select part_id FROM parts"; //$NON-NLS-1$ + String output = "SELECT rtrim(PARTS.PART_ID) AS id FROM PARTS UNION SELECT PARTS.PART_NAME FROM PARTS EXCEPT SELECT rtrim(PARTS.PART_ID) FROM PARTS"; //$NON-NLS-1$ + + TranslationHelper.helpTestVisitor(TranslationHelper.PARTS_VDB, + input, + output, TRANSLATOR); + } + + @Test public void testNestedSetQuery3() throws Exception { + String input = "select part_id id FROM parts UNION (select part_name FROM parts Union ALL select part_id FROM parts)"; //$NON-NLS-1$ + String output = "SELECT rtrim(PARTS.PART_ID) AS id FROM PARTS UNION SELECT PARTS.PART_NAME FROM PARTS UNION SELECT rtrim(PARTS.PART_ID) FROM PARTS"; //$NON-NLS-1$ + + TranslationHelper.helpTestVisitor(TranslationHelper.PARTS_VDB, + input, + output, TRANSLATOR); + } + + @Test public void testOrderByUnrelated() throws Exception { + String input = "select part_id id FROM parts order by part_name"; //$NON-NLS-1$ + String output = "SELECT rtrim(PARTS.PART_ID) AS id FROM PARTS ORDER BY PARTS.PART_NAME"; //$NON-NLS-1$ + + TranslationHelper.helpTestVisitor(TranslationHelper.PARTS_VDB, + input, + output, TRANSLATOR); + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestSQLConversionVisitor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/access) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/access/TestAccessSQLTranslator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.access; +package org.teiid.translator.jdbc.access; import junit.framework.TestCase; Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2 (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/db2) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2ConvertModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2ConvertModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2ConvertModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.db2; +package org.teiid.translator.jdbc.db2; import java.math.BigDecimal; import java.math.BigInteger; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,17 +20,17 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.db2; +package org.teiid.translator.jdbc.db2; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.language.Command; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.resource.cci.ExecutionContext; import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.db2.DB2SQLTranslator; Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/derby) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbyCapabilities.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyCapabilities.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbyCapabilities.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.derby; +package org.teiid.translator.jdbc.derby; import static org.junit.Assert.*; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbySQLTranslator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/TestDerbySQLTranslator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,14 +20,14 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.derby; +package org.teiid.translator.jdbc.derby; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.translator.jdbc.derby.DerbySQLTranslator; Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2 (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/h2) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/TestH2Translator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/h2/TestH2Translator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/h2/TestH2Translator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,13 +20,13 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.h2; +package org.teiid.translator.jdbc.h2; import org.junit.BeforeClass; import org.junit.Test; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.translator.jdbc.h2.H2Translator; public class TestH2Translator { Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/mysql) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQL5Translator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQL5Translator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQL5Translator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,13 +20,13 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.mysql; +package org.teiid.translator.jdbc.mysql; import org.junit.BeforeClass; import org.junit.Test; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.translator.jdbc.mysql.MySQL5Translator; /** Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQLTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/TestMySQLTranslator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,14 +20,14 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.mysql; +package org.teiid.translator.jdbc.mysql; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.translator.jdbc.mysql.MySQLTranslator; /** Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.oracle; +package org.teiid.translator.jdbc.oracle; import java.sql.Timestamp; import java.util.Arrays; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLeftOrRightFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLeftOrRightFunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLeftOrRightFunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.oracle; +package org.teiid.translator.jdbc.oracle; import java.util.Arrays; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLog10FunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLog10FunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestLog10FunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.oracle; +package org.teiid.translator.jdbc.oracle; import java.util.Arrays; import java.util.List; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.oracle; +package org.teiid.translator.jdbc.oracle; import java.sql.Timestamp; import java.util.Arrays; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleConvertModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleConvertModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleConvertModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.oracle; +package org.teiid.translator.jdbc.oracle; import static org.junit.Assert.assertEquals; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.oracle; +package org.teiid.translator.jdbc.oracle; import static org.junit.Assert.assertEquals; @@ -28,7 +28,6 @@ import org.junit.Before; import org.junit.Test; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.language.Command; import org.teiid.connector.metadata.runtime.Column; import org.teiid.connector.metadata.runtime.MetadataStore; @@ -40,6 +39,7 @@ import org.teiid.metadata.TransformationMetadata; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.resource.cci.ExecutionContext; import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.Translator; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestSubstringFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestSubstringFunctionModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestSubstringFunctionModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.oracle; +package org.teiid.translator.jdbc.oracle; import java.util.Arrays; Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,13 +20,13 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.postgresql; +package org.teiid.translator.jdbc.postgresql; import org.junit.BeforeClass; import org.junit.Test; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.translator.jdbc.postgresql.PostgreSQLTranslator; public class TestPostgreSQLTranslator { Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,13 +20,12 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.sqlserver; +package org.teiid.translator.jdbc.sqlserver; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.language.Command; import org.teiid.connector.metadata.runtime.Column; import org.teiid.connector.metadata.runtime.MetadataStore; @@ -36,6 +35,7 @@ import org.teiid.metadata.TransformationMetadata; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.translator.jdbc.sqlserver.SQLServerSQLTranslator; import com.metamatrix.cdk.api.TranslationUtility; Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase (from rev 2103, trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/sybase) Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseConvertModifier.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.sybase; +package org.teiid.translator.jdbc.sybase; import static org.junit.Assert.assertEquals; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2010-05-07 20:11:50 UTC (rev 2104) @@ -20,17 +20,17 @@ * 02110-1301 USA. */ -package org.teiid.connector.jdbc.sybase; +package org.teiid.translator.jdbc.sybase; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.teiid.connector.jdbc.TranslationHelper; import org.teiid.connector.language.Command; import org.teiid.resource.ConnectorException; import org.teiid.resource.adapter.jdbc.JDBCExecutionFactory; +import org.teiid.resource.adapter.jdbc.TranslationHelper; import org.teiid.resource.cci.ExecutionContext; import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.sybase.SybaseSQLTranslator; Deleted: trunk/connectors/translator-text/src/test/resources/EmpData.txt =================================================================== --- trunk/connectors/translator-text/src/test/resources/EmpData.txt 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-text/src/test/resources/EmpData.txt 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,51 +0,0 @@ -LastName,FirstName,MiddleName,EmpId,Department,AnnualSalary,Title,HomePhone,Manager,Street,City,State,Zip -Kisselburg,Abbiegale,Tikvica ,9000059,G,64000,MGMT WannaBe,670-270-7947,9000073,123 State St.,New York,NY,10001 -Glore,Diodie,Vojvoda ,9000060,G,71000,Associate,480-650-9750,9000073,127 State St.,Los Angeles,CA,10005 -Dawson,Pinckney,Ostoja ,9000061,G,71000,Associate,110-400-3600,9000073,135 State St.,Detroit,MI,10013 -Waldrip,Trixie,Curic ,9000062,G,57000,Newbie,820-210-7045,9000073,136 State St.,Albany,NY,10014 -Kitchen,Zilpha,Buic ,9000063,G,60000,MGMT WannaBe,660-390-3785,9000073,138 State St.,Trenton,NJ,10016 -Wakeman,Gerard,Vlahovic ,9000064,G,78000,Newbie,700-190-5880,9000073,130 State St.,Jefferson City,MO,10008 -Rafferty,Dock,Korda ,9000065,G,70000,Newbie,400-190-6192,9000073,128 State St.,Sacramento,CA,10006 -Kersavage,Zelda,Mjesecevic ,9000066,G,56000,MGMT WannaBe,802-930-1482,9000073,137 State St.,Montpelier,VT,10015 -Zummer,Gerda,Milan ,9000067,G,69000,Newbie,920-100-9701,9000073,131 State St.,Bangor,ME,10009 -Davies,Allwyne,Radic ,9000068,G,61000,Associate,470-820-6096,9000073,126 State St.,Montgomery,AL,10004 -Deanford,Abe,Skrabalo ,9000069,G,67000,Associate,907-660-8233,9000073,124 State St.,Juneau,AK,10002 -Garcia,Orsal,Ucovic ,9000070,ML,79000,CFO,480-490-7710,9000075,150 State St.,Phoenix,AZ,10028 -Zook,Orson,Bendevis ,9000071,G,71000,Newbie,350-260-8654,9000073,133 State St.,Boston,MA,10011 -Rainier,Adelaid,Marinovic ,9000072,G,67000,Newbie,316-550-3499,9000073,125 State St.,Topeka,KS,10003 -Nealon,General,,9000073,G,77000,COO,203-420-3113,9000075,129 State St.,Hartford,CT,10007 -Garahana,Jarrod,Cvjetkovic ,9000074,G,66000,Associate,620-430-1782,9000073,132 State St.,New York,NY,10010 -Neely,Petronella,Goravica ,9000075,G,80000,CEO,230-320-6330,,134 State St.,Los Angeles,CA,10012 -Gamble,Johney,Kordic ,9000123,TM,74000,Associate,330-200-8319,9000132,162 State St.,Detroit,MI,10040 -Gertanovich,Orthell,Tvrdisa ,9000124,TM,63000,Associate,600-410-3667,9000132,165 State St.,Albany,NY,10043 -Kenyon,Jim,Radovanovic ,9000125,TM,80000,MGMT WannaBe,800-510-7741,9000132,161 State St.,Trenton,NJ,10039 -Gerber,Tristan,Rogec ,9000126,TM,57000,Associate,120-990-7278,9000132,169 State St.,Jefferson City,MO,10047 -Gibb,Jaromy,Kristic ,9000127,TM,69000,Associate,270-390-9549,9000132,160 State St.,Sacramento,CA,10038 -Rader,Allissa,Radicevic ,9000128,TM,59000,Newbie,750-420-2128,9000132,157 State St.,Montpelier,VT,10035 -Kammerer,Dilbert,Capor ,9000129,TM,70000,Associate,700-280-3808,9000132,159 State St.,Bangor,ME,10037 -Knippers,Tuesday,Balic ,9000130,TM,68000,MGMT WannaBe,960-140-1045,9000132,170 State St.,Montgomery,AL,10048 -Zumwalt,Patrycia,Srezovic ,9000131,TM,72000,Newbie,210-400-7920,9000132,167 State St.,Juneau,AK,10045 -Needham,Katlyn,Metkovic ,9000132,TM,76000,Goon,380-210-1611,9000070,163 State St.,Phoenix,AZ,10041 -Keefer,Almedia,,9000133,TM,61000,MGMT WannaBe,850-640-3038,9000132,158 State St.,Boston,MA,10036 -Rampton,Orman,Cavelis ,9000134,TM,76000,Newbie,950-930-1038,9000132,164 State St.,Topeka,KS,10042 -Krepps,Paul,Skobelj ,9000135,TM,64000,MGMT WannaBe,430-500-8830,9000132,168 State St.,Hartford,CT,10046 -Deans,Zeno,Jozovic ,9000136,TM,79000,Associate,830-190-9156,9000132,172 State St.,New York,NY,10050 -Zarafonetis,Parazetti,Roncevic ,9000137,TM,73000,Newbie,710-890-2886,9000132,166 State St.,Los Angeles,CA,10044 -Davis,Tyler,Vukic ,9000138,TM,80000,Associate,540-420-5160,9000132,171 State St.,Detroit,MI,10049 -Randolph,Orwin,Rasica ,9010233,ML,44000,Newbie,200-870-4749,9000070,151 State St.,Albany,NY,10029 -Ramsey,Orran,Slade ,9010234,ML,42000,Newbie,500-830-2947,9000070,149 State St.,Trenton,NJ,10027 -Wagonlander,Blondeena,Djano ,9010235,ML,41000,Newbie,780-760-9188,9000070,141 State St.,Jefferson City,MO,10019 -Wadsworth,Alice,Hasan ,9010236,ML,40000,Newbie,230-360-1247,9000070,140 State St.,Sacramento,CA,10018 -Nolen,Parnell,Buconic ,9010237,ML,47000,Newbie,620-300-7125,9000070,152 State St.,Montpelier,VT,10030 -Glidewell,Xoe,Bagovic ,9010238,ML,45000,Associate,850-850-5647,9000070,156 State St.,Bangor,ME,10034 -Zutter,Adam,Hendic ,9010239,ML,48000,Newbie,890-300-9999,9000070,139 State St.,Montgomery,AL,10017 -Gale,Turwayne,Dalmatin ,9010240,ML,36000,Associate,600-290-9758,9000070,154 State St.,Juneau,AK,10032 -Krikwood,Javin,Vidak ,9010241,ML,42000,MGMT WannaBe,380-280-5100,9000070,146 State St.,Phoenix,AZ,10024 -Giggs,Philbert,Vidak ,9010242,ML,52000,Associate,620-270-6404,9000070,153 State St.,Boston,MA,10031 -Danford,Garnett,Brigovic ,9010243,ML,39000,Associate,880-160-7833,9000070,145 State St.,Topeka,KS,10023 -Nash,Xavier,Semes ,9010244,ML,53000,MGMT WannaBe,800-550-5917,9000070,155 State St.,Hartford,CT,10033 -Kasparek,Gallard,Jelic ,9010245,ML,47000,Associate,590-460-5850,9000070,144 State St.,New York,NY,10022 -Kernodle,Dextor,Bupic ,9010246,ML,55000,MGMT WannaBe,440-750-1427,9000070,142 State St.,Los Angeles,CA,10020 -Neighbors,Karron,Stuk ,9010247,ML,40000,Newbie,430-790-9550,9000070,147 State St.,Detroit,MI,10025 -Gilbertson,Doil,Radic ,9010248,ML,51000,Associate,870-510-5367,9000070,143 State St.,Albany,NY,10021 -Neilsen,Katheleen,,9010249,ML,36000,Newbie,550-200-5470,9000070,148 State St.,Trenton,NJ,10026 Deleted: trunk/connectors/translator-text/src/test/resources/EmployeeTestDataSalary.txt =================================================================== --- trunk/connectors/translator-text/src/test/resources/EmployeeTestDataSalary.txt 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-text/src/test/resources/EmployeeTestDataSalary.txt 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,4 +0,0 @@ -Employees.EmpTable.location = src/test/resources/EmpData.txt -Employees.EmpTable.qualifier = " -Employees.EmpTable.delimiter = , -Employees.EmpTable.skipHeaderLines = 1 Deleted: trunk/connectors/translator-text/src/test/resources/libraryDelimited.txt =================================================================== --- trunk/connectors/translator-text/src/test/resources/libraryDelimited.txt 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-text/src/test/resources/libraryDelimited.txt 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,2 +0,0 @@ -"1", "2003-03-25", "Blind" -"2","1998-04-29", "Antipop" \ No newline at end of file Deleted: trunk/connectors/translator-text/src/test/resources/testDescriptorDelimited.txt =================================================================== --- trunk/connectors/translator-text/src/test/resources/testDescriptorDelimited.txt 2010-05-07 16:24:50 UTC (rev 2103) +++ trunk/connectors/translator-text/src/test/resources/testDescriptorDelimited.txt 2010-05-07 20:11:50 UTC (rev 2104) @@ -1,6 +0,0 @@ -text.library.location = src/test/resources/libraryDelimited.txt -text.library.qualifier = " -text.library.delimiter = , -text.library2.location = src/test/resources/libraryDelimited2.txt -text.library2.qualifier = " -text.library2.delimiter = ,