From cf3425f5455684b68e756fb85d16a2b15e5d6093 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 29 Dec 2012 22:14:23 +0100 Subject: [PATCH] Fixed broken test --- .../jooq/test/_/testcases/MetaDataTests.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java index b8887bb077..716a60ce22 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java @@ -487,30 +487,34 @@ extends BaseTest> metaTables) { for (Table metaTable : metaTables) { - Table generatedTable = schema().getTable(metaTable.getName()); - // Every table returned from meta should have a corresponding - // table by name in the generated test tables - if (generatedTable != null) { - assertNotNull(generatedTable); - assertEquals(metaTable, generatedTable); + // Check only the "TEST" schema, not "MULTI_SCHEMA" and others + if (schema().equals(metaTable.getSchema())) { + Table generatedTable = schema().getTable(metaTable.getName()); - // Check if fields match, as well - List> metaFields = metaTable.getFields(); - assertTrue(metaFields.containsAll(generatedTable.getFields())); + // Every table returned from meta should have a corresponding + // table by name in the generated test tables + if (generatedTable != null) { + assertNotNull(generatedTable); + assertEquals(metaTable, generatedTable); - // Check if relations are correctly loaded (and typed) as well - // [#1977] Fix this, once the "main key" concept has been removed - if (generatedTable instanceof UpdatableTable && metaTable instanceof UpdatableTable) { - UpdatableTable generatedUTable = (UpdatableTable) generatedTable; - UpdatableTable metaUTable = (UpdatableTable) metaTable; + // Check if fields match, as well + List> metaFields = metaTable.getFields(); + assertTrue(metaFields.containsAll(generatedTable.getFields())); - // [#1977] TODO: Add key checks - } + // Check if relations are correctly loaded (and typed) as well + // [#1977] Fix this, once the "main key" concept has been removed + if (generatedTable instanceof UpdatableTable && metaTable instanceof UpdatableTable) { + UpdatableTable generatedUTable = (UpdatableTable) generatedTable; + UpdatableTable metaUTable = (UpdatableTable) metaTable; - // Only truly updatable tables should be "Updatable" - else { - assertFalse(metaTable instanceof UpdatableTable); + // [#1977] TODO: Add key checks + } + + // Only truly updatable tables should be "Updatable" + else { + assertFalse(metaTable instanceof UpdatableTable); + } } } }