[teiid-commits] teiid SVN: r2645 - in trunk/engine/src/test/java/org/teiid: query/validator and 1 other directory.
Author: rareddy
Date: 2010-10-13 11:46:43 -0400 (Wed, 13 Oct 2010)
New Revision: 2645
Modified:
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourceElementReplacementVisitor.java
trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java
Log:
TEIID-1273, TEIID-1295, TEIID-1296:fixing the tests
Modified:
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourceElementReplacementVisitor.java
===================================================================
---
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourceElementReplacementVisitor.java 2010-10-12
20:23:14 UTC (rev 2644)
+++
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourceElementReplacementVisitor.java 2010-10-13
15:46:43 UTC (rev 2645)
@@ -123,15 +123,15 @@
}
public void testInsertMatching() throws Exception {
- helpTest("INSERT INTO MultiModel.Phys(a, SOURCE_NAME) VALUES('a',
'x')", //$NON-NLS-1$
+ helpTest("INSERT INTO MultiModel.Phys(a, SOURCE_NAME) VALUES ('a',
'x')", //$NON-NLS-1$
getMetadata(),
- "INSERT INTO MultiModel.Phys (a, SOURCE_NAME) SELECT a WHERE
'1' = '2'"); //$NON-NLS-1$
+ "INSERT INTO MultiModel.Phys (a) VALUES ('a')");
//$NON-NLS-1$
}
public void testInsertNotMatching() throws Exception {
- helpTest("INSERT INTO MultiModel.Phys(a, SOURCE_NAME) VALUES('a',
'y')", //$NON-NLS-1$
+ helpTest("INSERT INTO MultiModel.Phys(a, SOURCE_NAME) VALUES ('a',
'y')", //$NON-NLS-1$
getMetadata(),
- "INSERT INTO MultiModel.Phys (a, SOURCE_NAME) SELECT a WHERE
'1' = '2'"); //$NON-NLS-1$
+ "INSERT INTO MultiModel.Phys (a) SELECT a FROM MultiModel.Phys
WHERE 1 = 0"); //$NON-NLS-1$
}
public void testInsertAll() throws Exception {
Modified: trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java 2010-10-12
20:23:14 UTC (rev 2644)
+++ trunk/engine/src/test/java/org/teiid/query/validator/TestValidator.java 2010-10-13
15:46:43 UTC (rev 2645)
@@ -2036,7 +2036,7 @@
@Test public void testDisallowUpdateOnMultisourceElement() throws Exception {
Set<String> models = new HashSet<String>();
models.add("pm1");
- ValidatorReport report = helpValidateInModeler("pm1.vsp36",
"UPDATE PM1.G1 set SOURCE_NAME='blah'", new
MultiSourceMetadataWrapper(FakeMetadataFactory.example1Cached(), models)); //$NON-NLS-1$
+ ValidatorReport report = helpValidateInModeler("pm1.vsp36",
"UPDATE PM1.G1 set SOURCE_NAME='blah'", new
MultiSourceMetadataWrapper(FakeMetadataFactory.example1(), models)); //$NON-NLS-1$
assertEquals(report.toString(), 1, report.getItems().size());
}
}