Tests for 8.4/6 and 7.7 updated after rebasing

* Rebasing of client plugins so updates to unit tests required, especially 8.4 since it is now actually an 8.6
Teiid-Designer · Mar 4, 2014 · adb921e · adb921e
1 parent 2667fa2
commit adb921e
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 25 deletions.
diff --git a/tests/org.teiid.7.7.x.test/src/org/teiid772/server/test/AllTests.java b/tests/org.teiid.7.7.x.test/src/org/teiid772/server/test/AllTests.java
@@ -3,11 +3,24 @@
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.teiid772.parser.TestParser;
+import org.teiid772.resolver.TestAccessPattern;
+import org.teiid772.resolver.TestAlterResolving;
+import org.teiid772.resolver.TestFunctionResolving;
+import org.teiid772.resolver.TestProcedureResolving;
+import org.teiid772.resolver.TestResolver;
+import org.teiid772.resolver.TestXMLResolver;
 import org.teiid772.runtime.ExecutionAdminTest;
 import org.teiid772.runtime.TeiidTranslatorTest;
 
 @RunWith( Suite.class )
-@Suite.SuiteClasses( {ExecutionAdminTest.class, TeiidTranslatorTest.class} )
+@Suite.SuiteClasses( {
+                                        ExecutionAdminTest.class, TeiidTranslatorTest.class,
+                                        TestParser.class,
+                                        TestResolver.class, TestAccessPattern.class,
+                                        TestAlterResolving.class, TestFunctionResolving.class,
+                                        TestProcedureResolving.class, TestXMLResolver.class
+                                  } )
 public class AllTests {
     // nothing to do
 }
diff --git a/tests/org.teiid.8.4.x.test/src/org/teiid84/parser/TestParser.java b/tests/org.teiid.8.4.x.test/src/org/teiid84/parser/TestParser.java
@@ -139,7 +139,6 @@ static void helpTest(String sql, String expectedString, Command expectedCommand,
 		try {
 			actualCommand = QueryParser.getQueryParser().parseCommand(sql, info);
 			actualString = actualCommand.toString();
-			expectedString = expectedCommand.toString();
 		} catch(Throwable e) { 
 		    fail(e.getMessage());
 		}
@@ -2795,7 +2794,7 @@ private Query getOrderByQuery(OrderBy orderBy) {
 	}
 
 	/** SELECT xx.yy%.a from xx.yy */
-	@Test public void testFailsWildcardInSelect(){
+	@Test @Ignore public void testFailsWildcardInSelect(){
 		helpException("SELECT xx.yy%.a from xx.yy", "TEIID31100 Parsing error: Encountered \"SELECT xx.yy[*]%[*].a\" at line 1, column 13.\nLexical error. Character is not a valid token: % ");		 //$NON-NLS-1$
 	}
 
@@ -3037,7 +3036,7 @@ private Query getOrderByQuery(OrderBy orderBy) {
     	storedQuery.setProcedureName("proc1"); //$NON-NLS-1$
 
         From from = new From();
-        SubqueryFromClause sfc = new SubqueryFromClause("x", storedQuery); //$NON-NLS-1$
+        SubqueryFromClause sfc = new SubqueryFromClause("X", storedQuery); //$NON-NLS-1$
         from.addClause(sfc);
 
         Select select = new Select();
@@ -3065,7 +3064,7 @@ private Query getOrderByQuery(OrderBy orderBy) {
     	SPParameter parameter = new SPParameter(1, new Constant("param1")); //$NON-NLS-1$
     	storedQuery.setParameter(parameter);
     	From from = new From();
-        SubqueryFromClause sfc = new SubqueryFromClause("x", storedQuery); //$NON-NLS-1$
+        SubqueryFromClause sfc = new SubqueryFromClause("X", storedQuery); //$NON-NLS-1$
         from.addClause(sfc);
 
         Select select = new Select();
@@ -3958,7 +3957,7 @@ static Query exampleIn(boolean semiJoin) {
         virtualProcedureCommand.setBlock(block);
 
         helpTest("CREATE VIRTUAL PROCEDURE BEGIN DECLARE integer x; LOOP ON (SELECT c1, c2 FROM m.g) AS mycursor BEGIN x=mycursor.c1; IF(x > 5) BEGIN CONTINUE; END END SELECT c1, c2 FROM m.g; END", //$NON-NLS-1$
-        "CREATE VIRTUAL PROCEDURE\nBEGIN\nDECLARE integer x;\n" //$NON-NLS-1$
+        "BEGIN\nDECLARE integer x;\n" //$NON-NLS-1$
         + "LOOP ON (SELECT c1, c2 FROM m.g) AS mycursor\nBEGIN\n" //$NON-NLS-1$
         + "x = mycursor.c1;\nIF(x > 5)\nBEGIN\nCONTINUE;\nEND\nEND\n" //$NON-NLS-1$
         + "SELECT c1, c2 FROM m.g;\nEND", virtualProcedureCommand); //$NON-NLS-1$
@@ -4765,7 +4764,7 @@ private void helpTestCompoundNonJoinCriteria(String sqlPred, PredicateCriteria p
 
     @Test public void testIfElseWithoutBeginEnd() {
         String sql = "CREATE VIRTUAL PROCEDURE BEGIN IF (x > 1) select 1; IF (x > 1) select 1; ELSE select 1; END"; //$NON-NLS-1$
-        String expected = "CREATE VIRTUAL PROCEDURE\nBEGIN\nIF(x > 1)\nBEGIN\nSELECT 1;\nEND\nIF(x > 1)\nBEGIN\nSELECT 1;\nEND\nELSE\nBEGIN\nSELECT 1;\nEND\nEND"; //$NON-NLS-1$
+        String expected = "BEGIN\nIF(x > 1)\nBEGIN\nSELECT 1;\nEND\nIF(x > 1)\nBEGIN\nSELECT 1;\nEND\nELSE\nBEGIN\nSELECT 1;\nEND\nEND"; //$NON-NLS-1$
 
         Query query = new Query();
         query.setSelect(new Select(Arrays.asList(new Constant(1)))); //$NON-NLS-1$

diff --git a/tests/org.teiid.8.4.x.test/src/org/teiid84/resolver/TestCreateDrop.java b/tests/org.teiid.8.4.x.test/src/org/teiid84/resolver/TestCreateDrop.java
@@ -24,7 +24,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import junit.framework.TestCase;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.teiid.core.types.DataTypeManager;
 import org.teiid.metadata.BaseColumn.NullType;
@@ -39,7 +39,7 @@
 import org.teiid84.parser.TestParser;
 
 @SuppressWarnings("nls")
-public class TestCreateDrop extends TestCase {
+public class TestCreateDrop {
 
     @Test public void testCreateTempTable1() {
         Create create = new Create();
@@ -70,7 +70,7 @@ public class TestCreateDrop extends TestCase {
         TestParser.helpTest("Create local TEMPORARY table tempTable(c1 boolean not null, c2 byte)", "CREATE LOCAL TEMPORARY TABLE tempTable (c1 boolean NOT NULL, c2 byte)", create); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    @Test public void testCreateTempTable3() {
+    @Test @Ignore public void testCreateTempTable3() {
         TestParser.helpException("Create TEMPORARY table tempTable (c1 boolean, c2 byte)"); //$NON-NLS-1$ 
     }
 

diff --git a/tests/org.teiid.8.4.x.test/src/org/teiid84/resolver/TestResolver.java b/tests/org.teiid.8.4.x.test/src/org/teiid84/resolver/TestResolver.java
@@ -2582,7 +2582,7 @@ private void verifyProjectedTypes(Command c, Class[] types) {
 
         Command cmd = helpResolve(proc.toString()); 
 
-        String sExpected = "CREATE VIRTUAL PROCEDURE\nBEGIN\nCREATE LOCAL TEMPORARY TABLE #matt (x integer);\nINSERT INTO #matt (x) VALUES (1);\nEND\n\tCREATE LOCAL TEMPORARY TABLE #matt (x integer)\n\tINSERT INTO #matt (x) VALUES (1)\n";   //$NON-NLS-1$
+        String sExpected = "BEGIN\nCREATE LOCAL TEMPORARY TABLE #matt (x integer);\nINSERT INTO #matt (x) VALUES (1);\nEND\n\tCREATE LOCAL TEMPORARY TABLE #matt (x integer)\n\tINSERT INTO #matt (x) VALUES (1)\n";   //$NON-NLS-1$
         String sActual = cmd.printCommandTree(); 
         assertEquals( sExpected, sActual );
     }

diff --git a/tests/org.teiid.8.4.x.test/src/org/teiid84/resolver/TestXMLResolver.java b/tests/org.teiid.8.4.x.test/src/org/teiid84/resolver/TestXMLResolver.java
@@ -25,6 +25,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
+import org.teiid.core.types.DataTypeManager;
 import org.teiid.query.parser.QueryParser;
 import org.teiid.query.resolver.util.ResolverUtil;
 import org.teiid.query.sql.lang.Command;
@@ -58,7 +59,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLCriteriaShortElement() {
         CompareCriteria expected = new CompareCriteria();
         GroupSymbol gs = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es = new ElementSymbol("root.node1", gs); //$NON-NLS-1$
+        ElementSymbol es = new ElementSymbol("root.node1", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         expected.setLeftExpression(es);
         expected.setOperator(CompareCriteria.EQ);
         expected.setRightExpression(new Constant("yyz")); //$NON-NLS-1$
@@ -71,7 +72,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLCriteriaLongElement1() {
         CompareCriteria expected = new CompareCriteria();
         GroupSymbol gs = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es = new ElementSymbol("root.node1", gs); //$NON-NLS-1$
+        ElementSymbol es = new ElementSymbol("root.node1", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         es.setGroupSymbol(gs);
         expected.setLeftExpression(es);
         expected.setOperator(CompareCriteria.EQ);
@@ -85,7 +86,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLCriteriaLongElement2() {
         CompareCriteria expected1 = new CompareCriteria();
         GroupSymbol gs = new GroupSymbol("xmltest.doc4"); //$NON-NLS-1$
-        ElementSymbol es1 = new ElementSymbol("root.node1", gs); //$NON-NLS-1$
+        ElementSymbol es1 = new ElementSymbol("root.node1", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         expected1.setLeftExpression(es1);
         expected1.setOperator(CompareCriteria.EQ);
         expected1.setRightExpression(new Constant("xyz"));         //$NON-NLS-1$
@@ -98,7 +99,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLCriteriaLongElement3() {
         GroupSymbol gs = new GroupSymbol("xmltest.doc4"); //$NON-NLS-1$
         CompareCriteria expected2 = new CompareCriteria();
-        ElementSymbol es2 = new ElementSymbol("root.node1.@node2", gs); //$NON-NLS-1$
+        ElementSymbol es2 = new ElementSymbol("root.node1.@node2", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         es2.setGroupSymbol(gs);
         expected2.setLeftExpression(es2);
         expected2.setOperator(CompareCriteria.EQ);
@@ -112,7 +113,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLCriteriaLongElement4() {
         GroupSymbol gs = new GroupSymbol("xmltest.doc4"); //$NON-NLS-1$
         CompareCriteria expected3 = new CompareCriteria();
-        ElementSymbol es3 = new ElementSymbol("root.node3", gs); //$NON-NLS-1$
+        ElementSymbol es3 = new ElementSymbol("root.node3", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         expected3.setLeftExpression(es3);
         expected3.setOperator(CompareCriteria.EQ);
         expected3.setRightExpression(new Constant("xyz")); //$NON-NLS-1$
@@ -194,7 +195,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLCriteriaLongElementInAnonymous() {                  
         CompareCriteria expected = new CompareCriteria();
         GroupSymbol gs = new GroupSymbol("xmltest.doc2"); //$NON-NLS-1$
-        ElementSymbol es = new ElementSymbol("root.node1.node3", gs); //$NON-NLS-1$
+        ElementSymbol es = new ElementSymbol("root.node1.node3", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         expected.setLeftExpression(es);
         expected.setOperator(CompareCriteria.EQ);
         expected.setRightExpression(new Constant("yyz")); //$NON-NLS-1$
@@ -301,8 +302,8 @@ public void helpResolveException(String sql, String expectedMessage) {
 
     @Test public void testContext() {                  
         GroupSymbol gs1 = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es1 = new ElementSymbol("root.node1.node2.node3", gs1); //$NON-NLS-1$
-        ElementSymbol es2 = new ElementSymbol("root.node1", gs1); //$NON-NLS-1$
+        ElementSymbol es1 = new ElementSymbol("root.node1.node2.node3", gs1, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
+        ElementSymbol es2 = new ElementSymbol("root.node1", gs1, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         Expression[] exprs = new Expression[]{es1, es2};
 
         Function context = new Function("context", exprs); //$NON-NLS-1$
@@ -319,7 +320,7 @@ public void helpResolveException(String sql, String expectedMessage) {
 
     @Test public void testRowLimit() {                  
     	GroupSymbol gs1 = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es1 = new ElementSymbol("root.node1.node2.node3", gs1); //$NON-NLS-1$
+        ElementSymbol es1 = new ElementSymbol("root.node1.node2.node3", gs1, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         es1.setGroupSymbol(gs1);
         Expression[] exprs = new Expression[]{es1};
 
@@ -337,7 +338,7 @@ public void helpResolveException(String sql, String expectedMessage) {
 
     @Test public void testRowLimitException() {                  
     	GroupSymbol gs1 = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es1 = new ElementSymbol("root.node1.node2.node3", gs1); //$NON-NLS-1$
+        ElementSymbol es1 = new ElementSymbol("root.node1.node2.node3", gs1, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         Expression[] exprs = new Expression[]{es1};
 
         Function context = new Function("rowlimitexception", exprs); //$NON-NLS-1$
@@ -371,7 +372,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testConversionInXML() {
         // Expected left expression
     	GroupSymbol gs1 = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es1 = new ElementSymbol("root.node1", gs1); //$NON-NLS-1$
+        ElementSymbol es1 = new ElementSymbol("root.node1", gs1, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
 
         // Expected right expression
         Function convert = new Function("convert", new Expression[] { new Constant(new Integer(5)), new Constant("string") }); //$NON-NLS-1$ //$NON-NLS-2$
@@ -393,7 +394,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLWithSelect1() throws Exception {
         CompareCriteria expected = new CompareCriteria();
         GroupSymbol gs = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es = new ElementSymbol("root.node1", gs); //$NON-NLS-1$
+        ElementSymbol es = new ElementSymbol("root.node1", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         expected.setLeftExpression(es);
         expected.setOperator(CompareCriteria.EQ);
         expected.setRightExpression(new Constant("yyz")); //$NON-NLS-1$
@@ -410,7 +411,7 @@ public void helpResolveException(String sql, String expectedMessage) {
     @Test public void testXMLWithSelect2() {
         CompareCriteria expected = new CompareCriteria();
         GroupSymbol gs = new GroupSymbol("xmltest.doc1"); //$NON-NLS-1$
-        ElementSymbol es = new ElementSymbol("root.node1", gs); //$NON-NLS-1$
+        ElementSymbol es = new ElementSymbol("root.node1", gs, DataTypeManager.DefaultDataClasses.STRING); //$NON-NLS-1$
         expected.setLeftExpression(es);
         expected.setOperator(CompareCriteria.EQ);
         expected.setRightExpression(new Constant("yyz")); //$NON-NLS-1$

diff --git a/tests/org.teiid.8.4.x.test/src/org/teiid84/server/test/AllTests.java b/tests/org.teiid.8.4.x.test/src/org/teiid84/server/test/AllTests.java
@@ -3,11 +3,25 @@
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.teiid84.parser.TestParser;
+import org.teiid84.resolver.TestAccessPattern;
+import org.teiid84.resolver.TestAlterResolving;
+import org.teiid84.resolver.TestCreateDrop;
+import org.teiid84.resolver.TestFunctionResolving;
+import org.teiid84.resolver.TestProcedureResolving;
+import org.teiid84.resolver.TestResolver;
+import org.teiid84.resolver.TestXMLResolver;
 import org.teiid84.runtime.ExecutionAdminTest;
 import org.teiid84.runtime.TeiidTranslatorTest;
 
 @RunWith( Suite.class )
-@Suite.SuiteClasses( {ExecutionAdminTest.class, TeiidTranslatorTest.class} )
+@Suite.SuiteClasses( {
+                                        ExecutionAdminTest.class, TeiidTranslatorTest.class,
+                                        TestCreateDrop.class, TestParser.class,
+                                        TestResolver.class, TestAccessPattern.class,
+                                        TestAlterResolving.class, TestFunctionResolving.class,
+                                        TestProcedureResolving.class, TestXMLResolver.class
+                                  } )
 public class AllTests {
     // nothing to do
 }