Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Mar 17, 2020
2 parents 2a9e1d7 + c8e01fb commit 27ed054
Show file tree
Hide file tree
Showing 194 changed files with 11,520 additions and 11,309 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.html
View file
Expand Up @@ -26,7 +26,7 @@
</span>
</div>
</div>
<div class="row">
<div class="row" style="margin-left: 15px;">
<span wicket:id="feedback" class="text-danger"/>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.java
View file
Expand Up @@ -163,10 +163,11 @@ protected void onError(AjaxRequestTarget target, RuntimeException e) {
}

});
feedback.setFilter(new ComponentFeedbackMessageFilter(inputPanel.getValidatableComponent()));
} else {
feedback.setFilter(new ComponentFeedbackMessageFilter(component));
}

feedback.setFilter(new ComponentFeedbackMessageFilter(component));

if (component instanceof InputPanel) {
InputPanel inputPanel = (InputPanel) component;

Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackAlerts.html
View file
Expand Up @@ -7,7 +7,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:panel>
<div wicket:id="list">
<div wicket:id="list" style="margin-top: 5px">
<div wicket:id="message">
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestInitialObjects.java
View file
Expand Up @@ -42,7 +42,7 @@ public void testInitialObjects() throws Exception {
} catch (Throwable e) {
String msg = "Error processing file "+file.getName()+": "+e.getMessage();
logger.error(msg, e);
display(msg, e);
displayException(msg, e);
throw e;
}
}
Expand Down
14 changes: 6 additions & 8 deletions infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
View file
Expand Up @@ -90,15 +90,13 @@ public TimeIntervalStatusType getValidityStatus(ActivationType activationType, X
XMLGregorianCalendar validTo = activationType.getValidTo();
if (validFrom == null && validTo == null) {
return null;
} else if (validTo != null && referenceTime.compare(validTo) == DatatypeConstants.GREATER) {
return TimeIntervalStatusType.AFTER;
} else if (validFrom != null && referenceTime.compare(validFrom) == DatatypeConstants.LESSER) {
return TimeIntervalStatusType.BEFORE;
} else {
return TimeIntervalStatusType.IN;
}
TimeIntervalStatusType status = TimeIntervalStatusType.IN;
if (validFrom != null && (referenceTime == null || referenceTime.compare(validFrom) == DatatypeConstants.LESSER)) {
status = TimeIntervalStatusType.BEFORE;
}
if (validTo != null && referenceTime.compare(validTo) == DatatypeConstants.GREATER) {
status = TimeIntervalStatusType.AFTER;
}
return status;
}

public void computeEffective(String lifecycleStatus, ActivationType activationType, LifecycleStateModelType stateModel) {
Expand Down
33 changes: 0 additions & 33 deletions infra/common/src/test/java/com/evolveum/midpoint/common/AbstractActivationComputerTest.java
View file
Expand Up @@ -35,7 +35,6 @@ public abstract class AbstractActivationComputerTest extends AbstractUnitTest {
protected static final XMLGregorianCalendar SUMMER_SOLSTICE = XmlTypeConverter.createXMLGregorianCalendar(2013, 6, 21, 5, 4, 0);
protected static final XMLGregorianCalendar AUTUMN_EQUINOX = XmlTypeConverter.createXMLGregorianCalendar(2013, 9, 22, 20, 4, 0);
protected static final XMLGregorianCalendar WINTER_SOLSTICE = XmlTypeConverter.createXMLGregorianCalendar(2013, 12, 21, 17, 11, 0);
protected static final XMLGregorianCalendar YEAR_END = XmlTypeConverter.createXMLGregorianCalendar(2013, 12, 31, 23, 59, 59);

// Undefined state
protected static final String LIFECYCLE_STATE_LIMBO = "limbo";
Expand Down Expand Up @@ -100,38 +99,6 @@ public void testGetAdministrativeArchived() throws Exception {
assertEquals("Unexpected effective status", ActivationStatusType.ARCHIVED, effectiveStatus);
}

@Test
public void testGetDraftAdministrativeEnabled() throws Exception {
// GIVEN
Clock clock = createClock(YEAR_START);
ActivationComputer activationComputer = createActivationComputer(clock);
ActivationType activationType = createActivationType(
ActivationStatusType.DISABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);

// WHEN
ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(
SchemaConstants.LIFECYCLE_DRAFT, activationType, createLifecycleModel());

// THEN
assertEquals("Unexpected effective status", ActivationStatusType.DISABLED, effectiveStatus);
}

@Test
public void testGetProposedAdministrativeEnabled() throws Exception {
// GIVEN
Clock clock = createClock(YEAR_START);
ActivationComputer activationComputer = createActivationComputer(clock);
ActivationType activationType = createActivationType(
ActivationStatusType.ENABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);

// WHEN
ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(
SchemaConstants.LIFECYCLE_PROPOSED, activationType, createLifecycleModel());

// THEN
assertEquals("Unexpected effective status", ActivationStatusType.DISABLED, effectiveStatus);
}

@Test
public void testGetLimboAdministrativeEnabled() {
// GIVEN
Expand Down
39 changes: 39 additions & 0 deletions infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputerDefault.java
View file
Expand Up @@ -6,6 +6,13 @@
*/
package com.evolveum.midpoint.common;

import static org.testng.AssertJUnit.assertEquals;

import org.testng.annotations.Test;

import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LifecycleStateModelType;

public class TestActivationComputerDefault extends AbstractActivationComputerTest {
Expand All @@ -14,4 +21,36 @@ public class TestActivationComputerDefault extends AbstractActivationComputerTes
protected LifecycleStateModelType createLifecycleModel() {
return null;
}

@Test
public void testGetDraftAdministrativeEnabled() {
// GIVEN
Clock clock = createClock(YEAR_START);
ActivationComputer activationComputer = createActivationComputer(clock);
ActivationType activationType = createActivationType(
ActivationStatusType.DISABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);

// WHEN
ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(
SchemaConstants.LIFECYCLE_DRAFT, activationType, createLifecycleModel());

// THEN
assertEquals("Unexpected effective status", ActivationStatusType.DISABLED, effectiveStatus);
}

@Test
public void testGetProposedAdministrativeEnabled() {
// GIVEN
Clock clock = createClock(YEAR_START);
ActivationComputer activationComputer = createActivationComputer(clock);
ActivationType activationType = createActivationType(
ActivationStatusType.ENABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);

// WHEN
ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(
SchemaConstants.LIFECYCLE_PROPOSED, activationType, createLifecycleModel());

// THEN
assertEquals("Unexpected effective status", ActivationStatusType.DISABLED, effectiveStatus);
}
}
3 changes: 0 additions & 3 deletions infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputerLifecycle.java
View file
Expand Up @@ -36,7 +36,6 @@ protected LifecycleStateModelType createLifecycleModel() throws SchemaException,
}

@Test
@Override
public void testGetProposedAdministrativeEnabled() throws Exception {
// GIVEN
Clock clock = createClock(YEAR_START);
Expand All @@ -53,7 +52,6 @@ public void testGetProposedAdministrativeEnabled() throws Exception {
}

@Test
@Override
public void testGetDraftAdministrativeEnabled() throws Exception {
// GIVEN
Clock clock = createClock(YEAR_START);
Expand Down Expand Up @@ -108,5 +106,4 @@ protected void testComputeInhumed(
testCompute(LIFECYCLE_STATE_INHUMED, now, administrativeStatus,
validFrom, validTo, ActivationStatusType.ARCHIVED, expectedValidity);
}

}
4 changes: 2 additions & 2 deletions infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/AbstractPrismTest.java
View file
Expand Up @@ -47,11 +47,11 @@ public void initPrismContext() throws SchemaException, SAXException, IOException
PrismTestUtil.resetPrismContext(new PrismInternalTestUtil());
}

protected void display(String title, DebugDumpable value) {
protected void displayValue(String title, DebugDumpable value) {
PrismTestUtil.display(title, value);
}

protected void display(String title, Object value) {
public void displayValue(String title, Object value) {
PrismTestUtil.display(title, value);
}

Expand Down
42 changes: 21 additions & 21 deletions infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
View file
Expand Up @@ -1543,18 +1543,18 @@ public void testObjectDeltaNarrow01() throws Exception {
ObjectDelta<UserType> userDelta = getPrismContext().deltaFactory().object()
.createModificationAddProperty(UserType.class, USER_FOO_OID,
UserType.F_ADDITIONAL_NAMES, "blabla", "bubu");
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
display("user", user);
displayValue("user", user);

// WHEN
when();
ObjectDelta<UserType> narrowedDelta = userDelta.narrow(user, false);

// THEN
then();
display("Narrowed delta", narrowedDelta);
displayValue("Narrowed delta", narrowedDelta);

PrismAsserts.assertIsModify(narrowedDelta);
PrismAsserts.assertModifications(narrowedDelta, 1);
Expand All @@ -1572,19 +1572,19 @@ public void testObjectDeltaNarrow02() throws Exception {
ObjectDelta<UserType> userDelta = getPrismContext().deltaFactory().object()
.createModificationAddProperty(UserType.class, USER_FOO_OID,
UserType.F_ADDITIONAL_NAMES, "blabla", "bubu");
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
user.setPropertyRealValue(UserType.F_ADDITIONAL_NAMES, "bubu");
display("user", user);
displayValue("user", user);

// WHEN
when();
ObjectDelta<UserType> narrowedDelta = userDelta.narrow(user, false);

// THEN
then();
display("Narrowed delta", narrowedDelta);
displayValue("Narrowed delta", narrowedDelta);

PrismAsserts.assertIsModify(narrowedDelta);
PrismAsserts.assertModifications(narrowedDelta, 1);
Expand All @@ -1602,19 +1602,19 @@ public void testObjectDeltaNarrow03() throws Exception {
ObjectDelta<UserType> userDelta = getPrismContext().deltaFactory().object()
.createModificationAddProperty(UserType.class, USER_FOO_OID,
UserType.F_ADDITIONAL_NAMES, "blabla", "bubu");
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
user.setPropertyRealValues(UserType.F_ADDITIONAL_NAMES, "bubu", "blabla");
display("user", user);
displayValue("user", user);

// WHEN
when();
ObjectDelta<UserType> narrowedDelta = userDelta.narrow(user, false);

// THEN
then();
display("Narrowed delta", narrowedDelta);
displayValue("Narrowed delta", narrowedDelta);

PrismAsserts.assertIsModify(narrowedDelta);
PrismAsserts.assertModifications(narrowedDelta, 0);
Expand All @@ -1628,19 +1628,19 @@ public void testObjectDeltaNarrowAssignmen01() throws Exception {
.createModificationDeleteContainer(UserType.class, USER_FOO_OID,
UserType.F_ASSIGNMENT,
createAssignmentValue(null, ASSIGNMENT_PATLAMA_DESCRIPTION));
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
addAssignment(user, ASSIGNMENT_ABRAKADABRA_ID, ASSIGNMENT_ABRAKADABRA_DESCRIPTION);
display("user", user);
displayValue("user", user);

// WHEN
when();
ObjectDelta<UserType> narrowedDelta = userDelta.narrow(user, false);

// THEN
then();
display("Narrowed delta", narrowedDelta);
displayValue("Narrowed delta", narrowedDelta);

PrismAsserts.assertIsModify(narrowedDelta);
PrismAsserts.assertModifications(narrowedDelta, 0);
Expand All @@ -1654,19 +1654,19 @@ public void testObjectDeltaNarrowAssignmen02() throws Exception {
.createModificationDeleteContainer(UserType.class, USER_FOO_OID,
UserType.F_ASSIGNMENT,
createAssignmentValue(ASSIGNMENT_PATLAMA_ID, null));
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
addAssignment(user, ASSIGNMENT_ABRAKADABRA_ID, ASSIGNMENT_ABRAKADABRA_DESCRIPTION);
display("user", user);
displayValue("user", user);

// WHEN
when();
ObjectDelta<UserType> narrowedDelta = userDelta.narrow(user, false);

// THEN
then();
display("Narrowed delta", narrowedDelta);
displayValue("Narrowed delta", narrowedDelta);

PrismAsserts.assertIsModify(narrowedDelta);
PrismAsserts.assertModifications(narrowedDelta, 0);
Expand All @@ -1680,20 +1680,20 @@ public void testObjectDeltaNarrowAssignmen11() throws Exception {
.createModificationDeleteContainer(UserType.class, USER_FOO_OID,
UserType.F_ASSIGNMENT,
createAssignmentValue(null, ASSIGNMENT_PATLAMA_DESCRIPTION));
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
addAssignment(user, ASSIGNMENT_PATLAMA_ID, ASSIGNMENT_PATLAMA_DESCRIPTION);
addAssignment(user, ASSIGNMENT_ABRAKADABRA_ID, ASSIGNMENT_ABRAKADABRA_DESCRIPTION);
display("user", user);
displayValue("user", user);

// WHEN
when();
ObjectDelta<UserType> narrowedDelta = userDelta.narrow(user, false);

// THEN
then();
display("Narrowed delta", narrowedDelta);
displayValue("Narrowed delta", narrowedDelta);

PrismAsserts.assertIsModify(narrowedDelta);
PrismAsserts.assertModifications(narrowedDelta, 1);
Expand All @@ -1711,20 +1711,20 @@ public void testObjectDeltaNarrowAssignmen12() throws Exception {
.createModificationDeleteContainer(UserType.class, USER_FOO_OID,
UserType.F_ASSIGNMENT,
createAssignmentValue(ASSIGNMENT_PATLAMA_ID, null));
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
addAssignment(user, ASSIGNMENT_PATLAMA_ID, ASSIGNMENT_PATLAMA_DESCRIPTION);
addAssignment(user, ASSIGNMENT_ABRAKADABRA_ID, ASSIGNMENT_ABRAKADABRA_DESCRIPTION);
display("user", user);
displayValue("user", user);

// WHEN
when();
ObjectDelta<UserType> narrowedDelta = userDelta.narrow(user, false);

// THEN
then();
display("Narrowed delta", narrowedDelta);
displayValue("Narrowed delta", narrowedDelta);

PrismAsserts.assertIsModify(narrowedDelta);
PrismAsserts.assertModifications(narrowedDelta, 1);
Expand Down
4 changes: 2 additions & 2 deletions infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestEquals.java
View file
Expand Up @@ -28,12 +28,12 @@ public void testContainsEquivalentValue01() throws Exception {
.createModificationDeleteContainer(UserType.class, USER_FOO_OID,
UserType.F_ASSIGNMENT,
createAssignmentValue(ASSIGNMENT_PATLAMA_ID, null));
display("userDelta", userDelta);
displayValue("userDelta", userDelta);

PrismObject<UserType> user = createUserFoo();
addAssignment(user, ASSIGNMENT_PATLAMA_ID, ASSIGNMENT_PATLAMA_DESCRIPTION);
addAssignment(user, ASSIGNMENT_ABRAKADABRA_ID, ASSIGNMENT_ABRAKADABRA_DESCRIPTION);
display("user", user);
displayValue("user", user);

PrismContainer<AssignmentType> assignmentContainer = user.findContainer(UserType.F_ASSIGNMENT);

Expand Down
2 changes: 1 addition & 1 deletion infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPolyString.java
View file
Expand Up @@ -203,7 +203,7 @@ private void testNormalization(PolyStringNormalizer normalizer, String orig, Str
PolyString polyString = new PolyString(orig);
polyString.recompute(normalizer);
String norm = polyString.getNorm();
display("X: "+orig+" -> "+norm, unicodeEscape(orig)+"\n"+unicodeEscape(norm));
displayValue("X: "+orig+" -> "+norm, unicodeEscape(orig)+"\n"+unicodeEscape(norm));
assertEquals("orig have changed", orig, polyString.getOrig());
assertEquals("wrong norm", expectedNorm, polyString.getNorm());
assertEquals("wrong toString", orig, polyString.toString());
Expand Down

0 comments on commit 27ed054

Please sign in to comment.