Author: shawkins Date: 2009-05-12 21:01:53 -0400 (Tue, 12 May 2009) New Revision: 922 Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/InlineViewCase.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestInlineView.java Log: adding mysql and postgres as test targets Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/InlineViewCase.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/InlineViewCase.java 2009-05-13 01:01:18 UTC (rev 921) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/InlineViewCase.java 2009-05-13 01:01:53 UTC (rev 922) @@ -25,11 +25,6 @@ import java.util.List; import java.util.Set; -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.query.QueryParserException; -import com.metamatrix.api.exception.query.QueryResolverException; -import com.metamatrix.api.exception.query.QueryValidatorException; - public class InlineViewCase { public String name; public String userQuery; @@ -37,7 +32,7 @@ public Set<String> sourceQueries; public List<List<Object>> expectedResults; - public String getFullyQualifiedQuery() throws QueryParserException, QueryResolverException, QueryValidatorException, MetaMatrixComponentException { + public String getFullyQualifiedQuery() { return optimizedQuery; } public InlineViewCase(String name, String userQuery, String optimizedQuery, Set<String> sourceQueries, List expectedResults) { Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestInlineView.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestInlineView.java 2009-05-13 01:01:18 UTC (rev 921) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestInlineView.java 2009-05-13 01:01:53 UTC (rev 922) @@ -77,7 +77,8 @@ sourceQueries.add("db2"); //$NON-NLS-1$ sourceQueries.add("sybase"); //$NON-NLS-1$ sourceQueries.add("sqlserver"); //$NON-NLS-1$ - + sourceQueries.add("mysql"); //$NON-NLS-1$ + sourceQueries.add("postgres"); //$NON-NLS-1$ return new InlineViewCase("testANSIJoinInlineView", userQuery, optimizedQuery, //$NON-NLS-1$ sourceQueries, expectedResults); @@ -100,7 +101,8 @@ sourceQueries.add("db2"); //$NON-NLS-1$ sourceQueries.add("sybase"); //$NON-NLS-1$ sourceQueries.add("sqlserver"); //$NON-NLS-1$ - + sourceQueries.add("mysql"); //$NON-NLS-1$ + sourceQueries.add("postgres"); //$NON-NLS-1$ return new InlineViewCase("testInlineView", userQuery, optimizedQuery, //$NON-NLS-1$ sourceQueries, expectedResults); } @@ -121,7 +123,8 @@ sourceQueries.add("db2"); //$NON-NLS-1$ sourceQueries.add("sybase"); //$NON-NLS-1$ sourceQueries.add("sqlserver"); //$NON-NLS-1$ - + sourceQueries.add("mysql"); //$NON-NLS-1$ + sourceQueries.add("postgres"); //$NON-NLS-1$ return new InlineViewCase("testInlineViewWithDistinctAndOrderBy", userQuery, optimizedQuery, //$NON-NLS-1$ sourceQueries, expectedResults); @@ -139,7 +142,8 @@ sourceQueries.add("db2"); //$NON-NLS-1$ sourceQueries.add("sybase"); //$NON-NLS-1$ sourceQueries.add("sqlserver"); //$NON-NLS-1$ - + sourceQueries.add("mysql"); //$NON-NLS-1$ + sourceQueries.add("postgres"); //$NON-NLS-1$ return new InlineViewCase("testInlineViewOfVirtual", userQuery, optimizedQuery, //$NON-NLS-1$ sourceQueries, expectedResults); } @@ -160,7 +164,8 @@ sourceQueries.add("db2"); //$NON-NLS-1$ sourceQueries.add("sybase"); //$NON-NLS-1$ sourceQueries.add("sqlserver"); //$NON-NLS-1$ - + sourceQueries.add("mysql"); //$NON-NLS-1$ + sourceQueries.add("postgres"); //$NON-NLS-1$ return new InlineViewCase("testInlineViewWithOuterOrderAndGroup", userQuery, optimizedQuery, //$NON-NLS-1$ sourceQueries, expectedResults); } @@ -184,7 +189,8 @@ sourceQueries.add("db2"); //$NON-NLS-1$ sourceQueries.add("sybase"); //$NON-NLS-1$ sourceQueries.add("sqlserver"); //$NON-NLS-1$ - + sourceQueries.add("mysql"); //$NON-NLS-1$ + sourceQueries.add("postgres"); //$NON-NLS-1$ return new InlineViewCase("testInlineViewsInUnions", userQuery, optimizedQuery, //$NON-NLS-1$ sourceQueries, expectedResults); @@ -213,12 +219,12 @@ //sourceQueries.add("db2"); //$NON-NLS-1$ sourceQueries.add("sybase"); //$NON-NLS-1$ sourceQueries.add("sqlserver"); //$NON-NLS-1$ - + sourceQueries.add("mysql"); //$NON-NLS-1$ + sourceQueries.add("postgres"); //$NON-NLS-1$ return new InlineViewCase("testUnionInInlineView", userQuery, optimizedQuery, //$NON-NLS-1$ sourceQueries, expectedResults); } - protected void runTest(InlineViewCase testCase) throws Exception { FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();