Author: rareddy Date: 2010-08-03 23:16:30 -0400 (Tue, 03 Aug 2010) New Revision: 2409 Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java Log: TEIID-1104: Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2010-08-03 23:36:58 UTC (rev 2408) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2010-08-04 03:16:30 UTC (rev 2409) @@ -30,6 +30,7 @@ import org.teiid.adminapi.VDB; import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.cache.DefaultCacheFactory; import org.teiid.client.DQP; import org.teiid.client.security.ILogon; import org.teiid.deployers.MetadataStoreGroup; @@ -69,6 +70,7 @@ this.sessionService.setVDBRepository(repo); this.dqp.setBufferService(new FakeBufferService()); + this.dqp.setCacheFactory(new DefaultCacheFactory()); this.dqp.setTransactionService(new FakeTransactionService()); ConnectorManagerRepository cmr = Mockito.mock(ConnectorManagerRepository.class); @@ -136,12 +138,13 @@ final Properties p = new Properties(); EmbeddedProfile.parseURL(embeddedURL, p); - return new ConnectionImpl(new LocalServerConnection(p) { + LocalServerConnection conn = new LocalServerConnection(p) { @Override protected ClientServiceRegistry getClientServiceRegistry() { return FakeServer.this; } - }, p, embeddedURL); + }; + return new ConnectionImpl(conn, p, embeddedURL); } Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2010-08-03 23:36:58 UTC (rev 2408) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2010-08-04 03:16:30 UTC (rev 2409) @@ -68,6 +68,44 @@ private void executeTest(String sql, String[] expected){ execute(sql); - assertResults(expected); + if (expected != null) { + assertResults(expected); + } else { + printResults(true); + } } + + @Test + public void testMergeWithEmptyVDB() throws Exception { + server.deployVDB("empty", UnitTestUtil.getTestDataPath() + "/empty.vdb"); + this.internalConnection = server.createConnection("jdbc:teiid:empty"); + + String[] expectedBefore = { + "VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]", + }; + + executeTest("select * from tables where schemaname ='BQT1'", expectedBefore); //$NON-NLS-1$ + + this.internalConnection.close(); + + server.deployVDB(VDB2, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb"); + + server.mergeVDBS(VDB2, "empty"); + + String[] expectedAfter = { + "VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]", + "empty BQT1 HugeA Table null true false mmuuid:7c66fc80-33d2-1dfa-9931-e83d04ce10a0 500000 null false false -70645926", + "empty BQT1 HugeB Table null true false mmuuid:b0369400-33f8-1dfa-9931-e83d04ce10a0 500000 null false false 1906808737", + "empty BQT1 LargeA Table null true false mmuuid:3976a800-33b2-1dfa-9931-e83d04ce10a0 10000 null false false 1317837587", + "empty BQT1 LargeB Table null true false mmuuid:5fb40600-33c3-1dfa-9931-e83d04ce10a0 10000 null false false -655406176", + "empty BQT1 MediumA Table null true false mmuuid:61074980-338d-1dfa-9931-e83d04ce10a0 1000 null false false -122563142", + "empty BQT1 MediumB Table null true false mmuuid:e24bd1c0-33a4-1dfa-9931-e83d04ce10a0 1000 null false false -1189500311", + "empty BQT1 SmallA Table null true false mmuuid:0968424f-e6a0-1df9-ac06-b890ff96f710 50 null false false 97548178", + "empty BQT1 SmallB Table null true false mmuuid:06fb8980-3377-1dfa-9931-e83d04ce10a0 50 null false false -1716729278" + }; + + this.internalConnection = server.createConnection("jdbc:teiid:empty"); + executeTest("select * from tables where schemaname='BQT1'", expectedAfter); //$NON-NLS-1$ + + } }