fixing GUI tests

Evolveum · Oct 28, 2021 · 093eced · 093eced
1 parent 1753bc7
commit 093eced
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/FocusDetailsModels.java b/...n/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/FocusDetailsModels.java
@@ -105,7 +105,7 @@ private List<ShadowWrapper> loadShadowWrappers() {
             long timestampWrapperStart = System.currentTimeMillis();
             try {
 
-                ShadowWrapper wrapper = loadShadowWrapper(projection, task, subResult);
+                ShadowWrapper wrapper = loadShadowWrapper(projection, true, task, subResult);
                 wrapper.setLoadWithNoFetch(true);
                 list.add(wrapper);
 
@@ -128,10 +128,10 @@ private Collection<SelectorOptions<GetOperationOptions>> createLoadOptionForShad
     }
 
     @NotNull
-    public ShadowWrapper loadShadowWrapper(PrismObject<ShadowType> projection, Task task, OperationResult result) throws SchemaException {
+    public ShadowWrapper loadShadowWrapper(PrismObject<ShadowType> projection, boolean noFetch, Task task, OperationResult result) throws SchemaException {
         PrismObjectWrapperFactory<ShadowType> factory = getPageBase().findObjectWrapperFactory(projection.getDefinition());
         WrapperContext context = new WrapperContext(task, result);
-        context.setCreateIfEmpty(false);
+        context.setCreateIfEmpty(noFetch ? false : true);
         ShadowWrapper wrapper = (ShadowWrapper) factory.createObjectWrapper(projection, ItemStatus.NOT_CHANGED, context);
         wrapper.setProjectionStatus(UserDtoStatus.MODIFY);
         return wrapper;

diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusProjectionsPanel.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusProjectionsPanel.java
@@ -964,7 +964,7 @@ private Collection<SelectorOptions<GetOperationOptions>> createLoadOptionForShad
     public ShadowWrapper loadShadowWrapper(PrismObject<ShadowType> projection, Task task, OperationResult result) throws SchemaException {
         PrismObjectWrapperFactory<ShadowType> factory = getPageBase().findObjectWrapperFactory(projection.getDefinition());
         WrapperContext context = new WrapperContext(task, result);
-        context.setCreateIfEmpty(false);
+        context.setCreateIfEmpty(true);
         context.setDetailsPageTypeConfiguration(findShadowDetailsPageConfiguration(projection.asObjectable()));
         ShadowWrapper wrapper = (ShadowWrapper) factory.createObjectWrapper(projection, ItemStatus.NOT_CHANGED, context);
         wrapper.setProjectionStatus(UserDtoStatus.MODIFY);

diff --git a/...dmin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java b/...dmin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java
@@ -86,7 +86,6 @@ public class TestIntegrationObjectWrapperFactory extends AbstractInitializedGuiI
             UserType.F_CREDENTIALS,
             UserType.F_ADMIN_GUI_CONFIGURATION,
             UserType.F_BEHAVIOR,
-            UserType.F_LENS_CONTEXT,  //experimental
             UserType.F_POLICY_EXCEPTION); //experimental
     private static final List<ItemPath> BASIC_SHADOW_CONTAINERS_PATHS = Arrays.asList(
             ShadowType.F_EXTENSION,
@@ -96,7 +95,6 @@ public class TestIntegrationObjectWrapperFactory extends AbstractInitializedGuiI
             ShadowType.F_ASSOCIATION,
             ShadowType.F_ACTIVATION,
             ShadowType.F_CREDENTIALS,
-            ShadowType.F_LENS_CONTEXT,
             ShadowType.F_POLICY_EXCEPTION);
     private static final List<ItemPath> BASIC_ORG_CONTAINERS_PATHS = Arrays.asList(
             OrgType.F_EXTENSION,
@@ -111,7 +109,6 @@ public class TestIntegrationObjectWrapperFactory extends AbstractInitializedGuiI
             OrgType.F_AUTOASSIGN,
             OrgType.F_CREDENTIALS,
             OrgType.F_BEHAVIOR,
-            ShadowType.F_LENS_CONTEXT,
             ShadowType.F_POLICY_EXCEPTION);
 
     @Override
@@ -419,6 +416,7 @@ public void test150CreateWrapperShadow() throws Exception {
         PrismObjectWrapperFactory<ShadowType> factory = modelServiceLocator.findObjectWrapperFactory(shadow.getDefinition());
         assertTrue("Wrong object factory found, expected shadow factory but got " + factory.getClass().getSimpleName(), factory instanceof ShadowWrapperFactoryImpl);
         WrapperContext context = new WrapperContext(task, result);
+        context.setCreateIfEmpty(true);
 
         PrismObjectWrapper<ShadowType> objectWrapper = factory.createObjectWrapper(shadow, ItemStatus.NOT_CHANGED, context);
         assertTrue("Wrong wrapper created. Expected ShadowWrapper but got " + objectWrapper.getClass().getSimpleName(), objectWrapper instanceof ShadowWrapper);