Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Mar 17, 2015 · d2d7f8a · d2d7f8a
2 parents c965ab0 + 3f28841
commit d2d7f8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
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
@@ -585,8 +585,11 @@ public void test168LookupLanguagesDeleteRowByKey() throws Exception {
 
         assertSteadyResources();
     }
-
-    @Test
+
+    /**
+     * todo probably enable this test, implementation in repository is not available yet.
+     */
+    @Test(enabled = false)
     public void test170LookupLanguagesReplaceRows() throws Exception {
 		final String TEST_NAME="test170LookupLanguagesReplaceRows";
         TestUtil.displayTestTile(this, TEST_NAME);

diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
@@ -159,6 +159,9 @@ private void addGetCompare(File file) throws Exception {
                 if (UserType.class.equals(clazz)) {
                     o = SelectorOptions.createCollection(UserType.F_JPEG_PHOTO,
                             GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE));
+                } else if (LookupTableType.class.equals(clazz)) {
+                    o = SelectorOptions.createCollection(LookupTableType.F_TABLE,
+                            GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE));
                 }
                 PrismObject<? extends ObjectType> newObject = repositoryService.getObject(clazz, oids.get(i), o, result);
                 LOGGER.info("Old\n{}\nnew\n{}", new Object[]{object.debugDump(3), newObject.debugDump(3)});