Skip to content

Commit

Permalink
TestWrapperDelta.java: assign(me)nt typo + cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Apr 29, 2021
1 parent 3dd18f8 commit d51cf5e
Showing 1 changed file with 40 additions and 38 deletions.
78 changes: 40 additions & 38 deletions gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestWrapperDelta.java
View file
@@ -1,23 +1,37 @@
/*
* Copyright (c) 2010-2019 Evolveum and contributors
* Copyright (C) 2010-2021 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
*/
package com.evolveum.midpoint.gui;

import static org.testng.AssertJUnit.*;

import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;

import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;

import com.evolveum.midpoint.gui.api.factory.wrapper.PrismObjectWrapperFactory;
import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext;
import com.evolveum.midpoint.gui.api.prism.ItemStatus;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
import com.evolveum.midpoint.gui.api.util.ModelServiceLocator;
import com.evolveum.midpoint.gui.api.factory.wrapper.PrismObjectWrapperFactory;
import com.evolveum.midpoint.gui.impl.factory.wrapper.ProfilingClassLoggerWrapperFactoryImpl;
import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyValueWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
import com.evolveum.midpoint.gui.test.TestMidPointSpringApplication;
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
Expand All @@ -40,20 +54,6 @@
import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
import com.evolveum.prism.xml.ns._public.types_3.ModificationTypeType;
import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;

import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;

import static org.testng.AssertJUnit.*;

@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
@ActiveProfiles("test")
Expand All @@ -72,6 +72,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
importObjectFromFile(USER_ELAINE, initTask, initResult);
}

@Test
public void test100modifyUserFullname() throws Exception {
Task task = getTestTask();

Expand All @@ -80,12 +81,11 @@ public void test100modifyUserFullname() throws Exception {
PrismObject<UserType> userElaineBefore = getUser(USER_ELAINE_OID);

WrapperContext ctx = new WrapperContext(task, result);
PrismObjectWrapper objectWrapper =createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);
PrismObjectWrapper<UserType> objectWrapper = createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);

PrismPropertyWrapper<PolyString> fullName = objectWrapper.findProperty(UserType.F_FULL_NAME);
fullName.getValue().setRealValue(PrismTestUtil.createPolyString("Sparrow-Marley"));


//GIVEN
ObjectDelta<UserType> elaineDelta = objectWrapper.getObjectDelta();
assertModificationsSize(elaineDelta, 1);
Expand All @@ -108,15 +108,16 @@ public void test101modifyUserWeapon() throws Exception {
PrismObject<UserType> userElaineBefore = getUser(USER_ELAINE_OID);

WrapperContext ctx = new WrapperContext(task, result);
PrismObjectWrapper objectWrapper =createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);
PrismObjectWrapper<UserType> objectWrapper = createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);

PrismPropertyWrapper<String> weapon = objectWrapper.findProperty(ItemPath.create(UserType.F_EXTENSION, PIRACY_WEAPON));
for (PrismPropertyValueWrapper<String> valueWrapper : weapon.getValues()) {
valueWrapper.setRealValue(null);
}

ModelServiceLocator locator = getServiceLocator(task);
PrismPropertyValueWrapper<String> newValue = locator.createValueWrapper(weapon, new PrismPropertyValueImpl("revolver"), ValueStatus.ADDED, ctx);
PrismPropertyValueWrapper<String> newValue = locator.createValueWrapper(
weapon, new PrismPropertyValueImpl<>("revolver"), ValueStatus.ADDED, ctx);
weapon.getValues().add(newValue);

ObjectDelta<UserType> elaineDelta = objectWrapper.getObjectDelta();
Expand All @@ -141,9 +142,11 @@ public void test110modifyUserAddAssignment() throws Exception {
PrismObject<UserType> userElaineBefore = getUser(USER_ELAINE_OID);

WrapperContext ctx = new WrapperContext(task, result);
PrismObjectWrapper objectWrapper =createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);
PrismObjectWrapper<UserType> objectWrapper =
createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);

PrismContainerValue<AssignmentType> newAssignmentClone = createDummyResourceAssignment(objectWrapper, 0, task, result);
PrismContainerValue<AssignmentType> newAssignmentClone =
createDummyResourceAssignment(objectWrapper, 0, task, result);

ObjectDelta<UserType> delta = objectWrapper.getObjectDelta();
assertModificationsSize(delta, 1);
Expand All @@ -167,14 +170,14 @@ public void test110modifyUserAddAssignment() throws Exception {
}

@Test
public void test111modifyUserAssignemnt() throws Exception {
public void test111modifyUserAssignment() throws Exception {
Task task = getTestTask();
OperationResult result = task.getResult();

PrismObject<UserType> userElaineBefore = getUser(USER_ELAINE_OID);

WrapperContext ctx = new WrapperContext(task, result);
PrismObjectWrapper<UserType> objectWrapper =createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);
PrismObjectWrapper<UserType> objectWrapper = createObjectWrapper(userElaineBefore, ItemStatus.NOT_CHANGED, ctx);

PrismContainerWrapper<AssignmentType> assignment = objectWrapper.findContainer(UserType.F_ASSIGNMENT);
assertNotNull("unexpected null assignment wrapper", assignment);
Expand Down Expand Up @@ -310,7 +313,7 @@ public void test300SaveSystemConfigWithoutChanges() throws Exception {
SystemConfigurationType systemConfig = getSystemConfiguration();

WrapperContext ctx = new WrapperContext(task, result);
PrismObjectWrapper objectWrapper =createObjectWrapper(systemConfig.asPrismContainer(), ItemStatus.NOT_CHANGED, ctx);
PrismObjectWrapper<UserType> objectWrapper = createObjectWrapper(systemConfig.asPrismContainer(), ItemStatus.NOT_CHANGED, ctx);

//GIVEN
ObjectDelta<UserType> systemConfigDelta = objectWrapper.getObjectDelta();
Expand Down Expand Up @@ -340,7 +343,7 @@ public void test301ModifyProfilingClassLoggerOfSystemConfig() throws Exception {

assertModification(systemConfigDelta, ItemPath.create(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_CLASS_LOGGER, ClassLoggerConfigurationType.F_LEVEL),
ModificationTypeType.ADD, LoggingLevelType.DEBUG);
assertModification(systemConfigDelta, ItemPath.create(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_CLASS_LOGGER, ClassLoggerConfigurationType. F_APPENDER),
assertModification(systemConfigDelta, ItemPath.create(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_CLASS_LOGGER, ClassLoggerConfigurationType.F_APPENDER),
ModificationTypeType.ADD, "MIDPOINT_PROFILE_LOG");
//WHEN
executeChanges(systemConfigDelta, null, task, result);
Expand All @@ -352,10 +355,10 @@ public void test301ModifyProfilingClassLoggerOfSystemConfig() throws Exception {
loggerLevel = profilingClassLogger.getValue().findProperty(ClassLoggerConfigurationType.F_LEVEL);
appenderLevel = profilingClassLogger.getValue().findProperty(ClassLoggerConfigurationType.F_APPENDER);

if(!loggerLevel.getValue().getRealValue().equals(LoggingLevelType.DEBUG)) {
if (!loggerLevel.getValue().getRealValue().equals(LoggingLevelType.DEBUG)) {
AssertJUnit.fail("Expected value: " + LoggingLevelType.DEBUG + " after executing of changes. Values present: " + loggerLevel.getValue().getRealValue());
}
if(!appenderLevel.getValues().get(0).getRealValue().equals("MIDPOINT_PROFILE_LOG")) {
if (!appenderLevel.getValues().get(0).getRealValue().equals("MIDPOINT_PROFILE_LOG")) {
AssertJUnit.fail("Expected value: " + "MIDPOINT_PROFILE_LOG" + " after executing of changes. Values present: " + appenderLevel.getValues().get(0).getRealValue());
}

Expand Down Expand Up @@ -489,7 +492,7 @@ private <O extends ObjectType> void assertModificationsSize(ObjectDelta<O> delta
assertNotNull("Unexpeted null delta", delta);
logger.trace("Delta: {}", delta.debugDump());

Collection<? extends ItemDelta<?,?>> modifications = delta.getModifications();
Collection<? extends ItemDelta<?, ?>> modifications = delta.getModifications();
assertEquals("Unexpected modifications size", expectedModifications, modifications.size());

}
Expand All @@ -513,7 +516,6 @@ private <O extends ObjectType, D extends ItemDelta> void assertModification(Obje
break;
}


assertEquals("Unexpected numbers of values", expectedValues.length, modificationValues.size());
List<Object> realValues = modificationValues.stream().map(v -> v.getRealValue()).collect(Collectors.toList());
for (Object expectedValue : expectedValues) {
Expand All @@ -524,11 +526,11 @@ private <O extends ObjectType, D extends ItemDelta> void assertModification(Obje

}

private <O extends ObjectType> PrismObjectWrapper<O> createObjectWrapper(PrismObject<O> object, ItemStatus status, WrapperContext context) throws Exception{
private <O extends ObjectType> PrismObjectWrapper<O> createObjectWrapper(
PrismObject<O> object, ItemStatus status, WrapperContext context) throws Exception {
ModelServiceLocator locator = getServiceLocator(context.getTask());
PrismObjectWrapperFactory objectFactory = locator.findObjectWrapperFactory(object.getDefinition());
PrismObjectWrapperFactory<O> objectFactory = locator.findObjectWrapperFactory(object.getDefinition());

PrismObjectWrapper objectWrapper = objectFactory.createObjectWrapper(object, status, context);
return objectWrapper;
return objectFactory.createObjectWrapper(object, status, context);
}
}

0 comments on commit d51cf5e

Please sign in to comment.