[teiid-commits] teiid SVN: r615 - in trunk/test-integration/src/test/java: com/metamatrix/data and 10 other directories.

Author: shawkins Date: 2009-03-23 09:32:28 -0400 (Mon, 23 Mar 2009) New Revision: 615 Added: trunk/test-integration/src/test/java/org/ trunk/test-integration/src/test/java/org/teiid/ trunk/test-integration/src/test/java/org/teiid/connector/ trunk/test-integration/src/test/java/org/teiid/connector/language/ trunk/test-integration/src/test/java/org/teiid/connector/metadata/ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataInConnector.java trunk/test-integration/src/test/java/org/teiid/connector/visitor/ trunk/test-integration/src/test/java/org/teiid/connector/visitor/util/ Removed: trunk/test-integration/src/test/java/com/metamatrix/data/language/ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataInConnector.java Modified: trunk/test-integration/src/test/java/org/teiid/connector/language/TestLanguageUtil.java trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/MockConnector.java trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java trunk/test-integration/src/test/java/org/teiid/connector/visitor/util/TestCollectorVisitor.java trunk/test-integration/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java Log: updating to add integration tests Copied: trunk/test-integration/src/test/java/org/teiid/connector/language (from rev 611, trunk/test-integration/src/test/java/com/metamatrix/data/language) Property changes on: trunk/test-integration/src/test/java/org/teiid/connector/language ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/test-integration/src/test/java/org/teiid/connector/language/TestLanguageUtil.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/language/TestLanguageUtil.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.data.language; +package org.teiid.connector.language; import java.util.HashSet; import java.util.List; Copied: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime (from rev 611, trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime) Property changes on: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/MockConnector.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/MockConnector.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/MockConnector.java 2009-03-23 13:32:28 UTC (rev 615) @@ -1,4 +1,4 @@ -package com.metamatrix.data.metadata.runtime; +package org.teiid.connector.metadata.runtime; import java.util.Properties; Modified: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestElement.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.data.metadata.runtime; +package org.teiid.connector.metadata.runtime; import java.util.Properties; @@ -57,7 +57,7 @@ public Element getElement(String groupName, String elementName, TranslationUtility transUtil) throws Exception { IQuery query = (IQuery) transUtil.parseCommand("SELECT " + elementName + " FROM " + groupName); //$NON-NLS-1$ //$NON-NLS-2$ - ISelectSymbol symbol = (ISelectSymbol) query.getSelect().getSelectSymbols().get(0); + ISelectSymbol symbol = query.getSelect().getSelectSymbols().get(0); IElement element = (IElement) symbol.getExpression(); return element.getMetadataObject(); } Modified: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestGroup.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.data.metadata.runtime; +package org.teiid.connector.metadata.runtime; import java.util.Properties; Deleted: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataInConnector.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataInConnector.java 2009-03-23 13:32:28 UTC (rev 615) @@ -1,26 +0,0 @@ -package com.metamatrix.data.metadata.runtime; - -import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.jdbc.api.AbstractMMQueryTestCase; - -public class TestMetadataInConnector extends AbstractMMQueryTestCase { - - private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/metadata/dqp.properties"; //$NON-NLS-1$ - private static final String VDB = "TestExtensions"; //$NON-NLS-1$ - - - public void testMetadataTable() throws Exception { - getConnection(VDB, DQP_PROP_FILE, ""); //$NON-NLS-1$ - execute("Select * from TableA"); //$NON-NLS-1$ - String expected[] = {"column1[string] column2[integer]"}; //$NON-NLS-1$ - assertResults(expected); - } - - public void testMetadataProcedure() throws Exception { - getConnection(VDB, DQP_PROP_FILE, ""); //$NON-NLS-1$ - executeStoredProcedure("exec AnyModel.ProcedureB(?)", new Object[] {"foo"}); //$NON-NLS-1$ //$NON-NLS-2$ - String expected[] = {"column1[string] column2[integer]"}; //$NON-NLS-1$ - assertResults(expected); - } - -} Copied: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataInConnector.java (from rev 613, trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java) =================================================================== --- trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataInConnector.java (rev 0) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataInConnector.java 2009-03-23 13:32:28 UTC (rev 615) @@ -0,0 +1,28 @@ +package org.teiid.connector.metadata.runtime; + +import org.junit.Test; + +import com.metamatrix.core.util.UnitTestUtil; +import com.metamatrix.jdbc.api.AbstractMMQueryTestCase; + +public class TestMetadataInConnector extends AbstractMMQueryTestCase { + + private static final String DQP_PROP_FILE = UnitTestUtil.getTestDataPath() + "/metadata/dqp.properties"; //$NON-NLS-1$ + private static final String VDB = "TestExtensions"; //$NON-NLS-1$ + + + @Test public void testMetadataTable() throws Exception { + getConnection(VDB, DQP_PROP_FILE, ""); //$NON-NLS-1$ + execute("Select * from TableA"); //$NON-NLS-1$ + String expected[] = {"column1[string] column2[integer]"}; //$NON-NLS-1$ + assertResults(expected); + } + + @Test public void testMetadataProcedure() throws Exception { + getConnection(VDB, DQP_PROP_FILE, ""); //$NON-NLS-1$ + execute("exec AnyModel.ProcedureB(?)", new Object[] {"foo"}); //$NON-NLS-1$ //$NON-NLS-2$ + String expected[] = {"column1[string] column2[integer]"}; //$NON-NLS-1$ + assertResults(expected); + } + +} Modified: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataObject.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.data.metadata.runtime; +package org.teiid.connector.metadata.runtime; import java.util.Arrays; import java.util.HashSet; Modified: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestParams.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,20 +20,17 @@ * 02110-1301 USA. */ -package com.metamatrix.data.metadata.runtime; +package org.teiid.connector.metadata.runtime; -import java.io.File; import java.sql.Timestamp; import java.util.List; +import junit.framework.TestCase; + import org.teiid.connector.language.IParameter; import org.teiid.connector.language.IProcedure; import org.teiid.connector.language.IParameter.Direction; -import org.teiid.connector.metadata.runtime.Parameter; -import org.teiid.connector.metadata.runtime.TypeModel; -import junit.framework.TestCase; - import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.core.util.UnitTestUtil; @@ -54,7 +51,7 @@ } private static String getTestVDBName() { - return UnitTestUtil.getTestDataPath() + ""+File.separator+"sptest"+File.separator+"spvdb.vdb"; //$NON-NLS-1$ + return UnitTestUtil.getTestDataPath() + "/sptest/spvdb.vdb"; //$NON-NLS-1$ } public static TranslationUtility createTranslationUtility(String vdbName) { Modified: trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestProcedure.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,19 +20,18 @@ * 02110-1301 USA. */ -package com.metamatrix.data.metadata.runtime; +package org.teiid.connector.metadata.runtime; import java.util.List; import java.util.Properties; +import junit.framework.TestCase; + import org.teiid.connector.language.IProcedure; import org.teiid.connector.metadata.runtime.Element; import org.teiid.connector.metadata.runtime.Parameter; import org.teiid.connector.metadata.runtime.Procedure; -import org.teiid.connector.metadata.runtime.RuntimeMetadata; -import junit.framework.TestCase; - import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.core.util.UnitTestUtil; @@ -92,9 +91,8 @@ } public void testProcedureWithResultSet() throws Exception { - RuntimeMetadata rmd = CONNECTOR_METADATA_UTILITY.createRuntimeMetadata(); Procedure proc = getProcedure("ConnectorMetadata.TestProc2", 1, CONNECTOR_METADATA_UTILITY); //$NON-NLS-1$ - assertEquals(null, proc.getNameInSource()); //$NON-NLS-1$ + assertEquals(null, proc.getNameInSource()); String[] nameInSource = new String[] { null, "Result set name in source" }; //$NON-NLS-1$ int[] direction = new int[] { Parameter.IN, Parameter.RESULT_SET }; Copied: trunk/test-integration/src/test/java/org/teiid/connector/visitor/util (from rev 611, trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util) Property changes on: trunk/test-integration/src/test/java/org/teiid/connector/visitor/util ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/test-integration/src/test/java/org/teiid/connector/visitor/util/TestCollectorVisitor.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/visitor/util/TestCollectorVisitor.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.data.visitor.util; +package org.teiid.connector.visitor.util; import java.util.*; Modified: trunk/test-integration/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java 2009-03-20 20:29:43 UTC (rev 611) +++ trunk/test-integration/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java 2009-03-23 13:32:28 UTC (rev 615) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.data.visitor.util; +package org.teiid.connector.visitor.util; import java.sql.Date; import java.sql.Time;