Author: shawkins Date: 2012-07-20 19:02:19 -0400 (Fri, 20 Jul 2012) New Revision: 4256 Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java Log: correcting a testing issue where the wrong vdb may be referenced by the VFS Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java =================================================================== --- trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-20 21:09:19 UTC (rev 4255) +++ trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-20 23:02:19 UTC (rev 4256) @@ -39,7 +39,6 @@ import org.teiid.core.TeiidRuntimeException; import org.teiid.core.util.FileUtils; import org.teiid.core.util.LRUCache; -import org.teiid.core.util.PropertiesUtils; import org.teiid.metadata.FunctionMethod; import org.teiid.query.function.FunctionTree; import org.teiid.query.function.SystemFunctionManager; @@ -92,7 +91,7 @@ } public static IndexMetadataStore loadMetadata(String vdbName, URL url) throws IOException, MalformedURLException, URISyntaxException { - String fileName = PropertiesUtils.toHex(url.toExternalForm().getBytes()); + String fileName = String.valueOf(vdbName + "-" + url.toExternalForm().hashCode()); VirtualFile root = VFS.getChild(fileName); if (!root.exists()) { VFS.mountZip(url.openStream(), fileName, root, TempFileProvider.create("vdbs", Executors.newScheduledThreadPool(2))); 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 2012-07-20 21:09:19 UTC (rev 4255) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2012-07-20 23:02:19 UTC (rev 4256) @@ -70,7 +70,7 @@ vdbImport.setName(VDB2); param.vdbImports = Arrays.asList(vdbImport); server.removeVDB(VDB1); - server.deployVDB(VDB1, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb", param); + server.deployVDB(VDB1, UnitTestUtil.getTestDataPath()+"/PartsSupplier.vdb", param); this.internalConnection = server.createConnection("jdbc:teiid:"+VDB1); executeTest("select * from tables where schemaname='BQT1' order by name", expectedAfter); //$NON-NLS-1$