[teiid-commits] teiid SVN: r3015 - in trunk/engine/src/test/java/org/teiid/query: sql/symbol and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-22 09:40:07 -0400 (Tue, 22 Mar 2011)
New Revision: 3015

Modified:
   trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java
   trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestElementSymbol.java
Log:
TEIID-1520 better string storage on group/element symbols

Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java	2011-03-22 13:00:05 UTC (rev 3014)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java	2011-03-22 13:40:07 UTC (rev 3015)
@@ -186,8 +186,8 @@
     
     @Test public void testUnionPushDownWithJoin1() throws Exception {
         ProcessorPlan plan = TestOptimizer.helpPlan("select * from (SELECT IntKey FROM BQT1.SmallA where intkey in (1, 2) UNION ALL SELECT intkey FROM BQT2.SmallA where intkey in (3, 4)) A inner join (SELECT intkey FROM BQT1.SmallB where intkey in (1, 2) UNION ALL SELECT intkey FROM BQT2.SmallB where intkey in (3, 4)) B on a.intkey = b.intkey where a.intkey in (1, 4)", FakeMetadataFactory.exampleBQTCached(), null, TestOptimizer.getGenericFinder(),//$NON-NLS-1$
-            new String[] { "SELECT g_1.intkey, g_0.intkey FROM BQT2.SmallA AS g_0, BQT2.SmallB AS g_1 WHERE (g_0.intkey = g_1.intkey) AND (g_0.intkey IN (4)) AND (g_0.intkey = 4) AND (g_1.intkey IN (4)) AND (g_1.intkey = 4)",
-        		"SELECT g_1.intkey, g_0.IntKey FROM BQT1.SmallA AS g_0, BQT1.SmallB AS g_1 WHERE (g_0.IntKey = g_1.intkey) AND (g_0.intkey IN (1)) AND (g_0.IntKey = 1) AND (g_1.intkey = 1)" }, ComparisonMode.EXACT_COMMAND_STRING); 
+            new String[] { "SELECT g_1.intkey, g_0.IntKey FROM BQT1.SmallA AS g_0, BQT1.SmallB AS g_1 WHERE (g_0.IntKey = g_1.intkey) AND (g_0.intkey IN (1)) AND (g_0.IntKey = 1) AND (g_1.intkey = 1)",
+            		"SELECT g_1.intkey, g_0.intkey FROM BQT2.SmallA AS g_0, BQT2.SmallB AS g_1 WHERE (g_0.intkey = g_1.intkey) AND (g_0.intkey IN (4)) AND (g_0.intkey = 4) AND (g_1.intkey = 4)" }, ComparisonMode.EXACT_COMMAND_STRING); 
 
         TestOptimizer.checkNodeTypes(plan, new int[] {
             2,      // Access

Modified: trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestElementSymbol.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestElementSymbol.java	2011-03-22 13:00:05 UTC (rev 3014)
+++ trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestElementSymbol.java	2011-03-22 13:40:07 UTC (rev 3015)
@@ -254,7 +254,6 @@
 		
 		// Change original, clone shouldn't change
 		String originalName = e1.getName();		
-		e1.setName("a"); //$NON-NLS-1$
 		assertTrue("Cloned value changed but should not have: ", copy.getName().equals(originalName)); //$NON-NLS-1$
 
 		GroupSymbol originalGroup = e1.getGroupSymbol();