Author: rareddy Date: 2010-08-03 23:22:15 -0400 (Tue, 03 Aug 2010) New Revision: 2410 Added: trunk/test-integration/common/src/test/resources/empty.vdb Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java Log: TEIID-860 Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java 2010-08-04 03:16:30 UTC (rev 2409) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java 2010-08-04 03:22:15 UTC (rev 2410) @@ -1,7 +1,5 @@ package org.teiid.systemmodel; -import java.sql.SQLException; - import org.junit.Before; import org.junit.Test; import org.teiid.core.util.UnitTestUtil; @@ -78,6 +76,5 @@ @Test public void test_PG_USER() throws Exception { execute("select * FROM pg_user"); //$NON-NLS-1$ TestMMDatabaseMetaData.compareResultSet(this.internalResultSet); - } - + } } Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2010-08-04 03:16:30 UTC (rev 2409) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java 2010-08-04 03:22:15 UTC (rev 2410) @@ -24,6 +24,7 @@ import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.*; import org.teiid.core.util.UnitTestUtil; import org.teiid.jdbc.AbstractMMQueryTestCase; import org.teiid.jdbc.FakeServer; @@ -148,4 +149,18 @@ "select lookup('SYS.KeyColumns', 'RefKeyUID', 'KeyName', 'PK_PARTS')", expected); //$NON-NLS-1$ } + + @Test public void test_UID_OID_are_Equal() throws Exception { + execute("select distinct(UID) FROM SYS.Schemas"); //$NON-NLS-1$ + int uidCount = getRowCount(); + execute("select distinct(OID) FROM SYS.Schemas"); //$NON-NLS-1$ + int oidCount = getRowCount(); + assertEquals(uidCount, oidCount); + + execute("select distinct(UID) FROM SYS.DataTypes"); //$NON-NLS-1$ + uidCount = getRowCount(); + execute("select distinct(OID) FROM SYS.DataTypes"); //$NON-NLS-1$ + oidCount = getRowCount(); + assertEquals(uidCount, oidCount); + } } Added: trunk/test-integration/common/src/test/resources/empty.vdb =================================================================== (Binary files differ) Property changes on: trunk/test-integration/common/src/test/resources/empty.vdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream