Adapt test to changed handling of hidden items

LookupTableType.row is now present but marked as incomplete.
Evolveum · Jan 17, 2020 · f3767f2 · f3767f2
1 parent 5d1d692
commit f3767f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
@@ -1241,9 +1241,17 @@ public static <O extends Objectable> void assertEquivalent(String message, ItemP
         }
     }
 
-    public static void assertIncomplete(PrismObject<?> object, ItemPath itemPath) {
+    @SuppressWarnings("UnusedReturnValue")
+    public static Item<?, ?> assertEmptyAndIncomplete(PrismObject<?> object, ItemPath itemPath) {
+        Item<?, ?> item = assertIncomplete(object, itemPath);
+        assertTrue(itemPath + " has values in " + object + ": " + item, item.hasNoValues());
+        return item;
+    }
+
+    public static Item<?, ?> assertIncomplete(PrismObject<?> object, ItemPath itemPath) {
         Item<?, ?> item = object.findItem(itemPath);
         assertNotNull("No " + itemPath + " in " + object, item);
         assertTrue(itemPath + " is not incomplete in " + object, item.isIncomplete());
+        return item;
     }
 }
diff --git a/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java b/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
@@ -116,8 +116,7 @@ public void test100LookupLanguagesGet() throws Exception {
 
         assertEquals("Wrong lang lookup name", LOOKUP_LANGUAGES_NAME, lookup.asObjectable().getName().getOrig());
 
-        PrismContainer<LookupTableRowType> tableContainer = lookup.findContainer(LookupTableType.F_ROW);
-        assertNull("Table container sneaked in", tableContainer);
+        PrismAsserts.assertEmptyAndIncomplete(lookup, LookupTableType.F_ROW);
 
         assertSteadyResources();
     }
@@ -148,8 +147,7 @@ public void test102LookupLanguagesGetExclude() throws Exception {
 
         assertEquals("Wrong lang lookup name", LOOKUP_LANGUAGES_NAME, lookup.asObjectable().getName().getOrig());
 
-        PrismContainer<LookupTableRowType> tableContainer = lookup.findContainer(LookupTableType.F_ROW);
-        assertNull("Table container sneaked in", tableContainer);
+        PrismAsserts.assertEmptyAndIncomplete(lookup, LookupTableType.F_ROW);
 
         assertSteadyResources();
     }