Skip to content

Commit

Permalink
Migrate (forgotten) story tests
Browse files Browse the repository at this point in the history 
(but there are 6 test failures)
  • Loading branch information
@mederly
mederly committed Nov 17, 2018
1 parent 22d00ae commit d88d3de
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 25 deletions.
3 changes: 2 additions & 1 deletion testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
View file
Expand Up @@ -18,6 +18,7 @@
import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismReference;
import com.evolveum.midpoint.prism.PrismReferenceImpl;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.match.MatchingRule;
import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
Expand Down Expand Up @@ -169,7 +170,7 @@ protected PrismReferenceValue prv(String oid) {
}

protected PrismReference ref(List<ObjectReferenceType> orts) {
PrismReference rv = new PrismReference(new QName("dummy"));
PrismReference rv = new PrismReferenceImpl(new QName("dummy"));
orts.forEach(ort -> rv.add(ort.asReferenceValue().clone()));
return rv;
}
Expand Down
30 changes: 12 additions & 18 deletions ...ing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java
View file
Expand Up @@ -39,6 +39,7 @@

import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl;
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.delta.*;
import org.apache.commons.lang.StringUtils;
import org.opends.server.types.Entry;
import org.opends.server.util.EmbeddedUtils;
Expand All @@ -53,13 +54,6 @@
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
import com.evolveum.midpoint.prism.crypto.EncryptionException;
import com.evolveum.midpoint.prism.delta.ChangeType;
import com.evolveum.midpoint.prism.delta.ContainerDelta;
import com.evolveum.midpoint.prism.delta.DiffUtil;
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.delta.PropertyDelta;
import com.evolveum.midpoint.prism.delta.ReferenceDelta;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.query.ObjectQuery;
Expand Down Expand Up @@ -713,7 +707,7 @@ public void test124AddAccountDirectAlreadyExists() throws Exception {
assertShadowName(abomShadow,
"uid=abomba1,OU=people,DC=example,DC=com");

ReferenceDelta abombaDeleteAccDelta = ReferenceDelta
ReferenceDelta abombaDeleteAccDelta = ReferenceDeltaImpl
.createModificationDelete(ShadowType.class,
UserType.F_LINK_REF, prismContext,
new PrismReferenceValueImpl(abombaOid));
Expand All @@ -727,7 +721,7 @@ public void test124AddAccountDirectAlreadyExists() throws Exception {
repositoryService.getObject(ShadowType.class, abombaOid, null,
parentResult);

ReferenceDelta abomDeleteAccDelta = ReferenceDelta
ReferenceDelta abomDeleteAccDelta = ReferenceDeltaImpl
.createModificationDelete(ShadowType.class,
UserType.F_LINK_REF, prismContext,
abomShadow.asPrismObject());
Expand Down Expand Up @@ -767,12 +761,12 @@ public void test124AddAccountDirectAlreadyExists() throws Exception {
display(result);

// return the previous changes of resource back
Collection<? extends ItemDelta> schemaHandlingDelta = ContainerDelta
Collection<? extends ItemDelta> schemaHandlingDelta = ContainerDeltaImpl
.createModificationReplaceContainerCollection(
ResourceType.F_SCHEMA_HANDLING,
resourceTypeOpenDjrepo.asPrismObject()
.getDefinition(), oldSchemaHandling.asPrismContainerValue().clone());
PropertyDelta syncDelta = PropertyDelta
PropertyDelta syncDelta = PropertyDeltaImpl
.createModificationReplaceProperty(
ResourceType.F_SYNCHRONIZATION,
resourceTypeOpenDjrepo.asPrismObject()
Expand Down Expand Up @@ -1214,11 +1208,11 @@ public void test250ModifyObjectTwoTimesCommunicationProblem() throws Exception {

Collection<PropertyDelta> modifications = new ArrayList<>();

PropertyDelta fullNameDelta = PropertyDelta.createModificationReplaceProperty(new ItemPath(UserType.F_FULL_NAME), getUserDefinition(), new PolyString("jackNew2"));
PropertyDelta fullNameDelta = PropertyDeltaImpl.createModificationReplaceProperty(new ItemPath(UserType.F_FULL_NAME), getUserDefinition(), new PolyString("jackNew2"));
modifications.add(fullNameDelta);

PrismPropertyValue<ActivationStatusType> enabledUserAction = new PrismPropertyValueImpl<>(ActivationStatusType.ENABLED, OriginType.USER_ACTION, null);
PropertyDelta<ActivationStatusType> enabledDelta = PropertyDelta.createDelta(SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, getUserDefinition());
PropertyDelta<ActivationStatusType> enabledDelta = PropertyDeltaImpl.createDelta(SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, getUserDefinition());
enabledDelta.addValueToAdd(enabledUserAction);
modifications.add(enabledDelta);

Expand All @@ -1240,15 +1234,15 @@ public void test250ModifyObjectTwoTimesCommunicationProblem() throws Exception {


Collection<PropertyDelta> newModifications = new ArrayList<>();
PropertyDelta fullNameDeltaNew = PropertyDelta.createModificationReplaceProperty(new ItemPath(UserType.F_FULL_NAME), getUserDefinition(), new PolyString("jackNew2a"));
PropertyDelta fullNameDeltaNew = PropertyDeltaImpl.createModificationReplaceProperty(new ItemPath(UserType.F_FULL_NAME), getUserDefinition(), new PolyString("jackNew2a"));
newModifications.add(fullNameDeltaNew);


PropertyDelta givenNameDeltaNew = PropertyDelta.createModificationReplaceProperty(new ItemPath(UserType.F_GIVEN_NAME), getUserDefinition(), new PolyString("jackNew2a"));
PropertyDelta givenNameDeltaNew = PropertyDeltaImpl.createModificationReplaceProperty(new ItemPath(UserType.F_GIVEN_NAME), getUserDefinition(), new PolyString("jackNew2a"));
newModifications.add(givenNameDeltaNew);

PrismPropertyValue<ActivationStatusType> enabledOutboundAction = new PrismPropertyValueImpl<>(ActivationStatusType.ENABLED, OriginType.USER_ACTION, null);
PropertyDelta<ActivationStatusType> enabledDeltaNew = PropertyDelta.createDelta(SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, getUserDefinition());
PropertyDelta<ActivationStatusType> enabledDeltaNew = PropertyDeltaImpl.createDelta(SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, getUserDefinition());
enabledDeltaNew.addValueToAdd(enabledOutboundAction);
newModifications.add(enabledDeltaNew);

Expand Down Expand Up @@ -1480,7 +1474,7 @@ public void test270ModifyDiscoveryAddCommunicationProblem() throws Exception {

OperationResult modifyGivenNameResult = new OperationResult("execute changes -> modify user's given name");
LOGGER.trace("execute changes -> modify user's given name");
Collection<? extends ItemDelta> givenNameDelta = PropertyDelta.createModificationReplacePropertyCollection(UserType.F_GIVEN_NAME, getUserDefinition(), new PolyString("Bob"));
Collection<? extends ItemDelta> givenNameDelta = PropertyDeltaImpl.createModificationReplacePropertyCollection(UserType.F_GIVEN_NAME, getUserDefinition(), new PolyString("Bob"));
ObjectDelta familyNameD = ObjectDelta.createModifyDelta(USER_BOB_NO_GIVEN_NAME_OID, givenNameDelta, UserType.class, prismContext);
Collection<ObjectDelta<? extends ObjectType>> modifyFamilyNameDelta = MiscSchemaUtil.createCollection(familyNameD);
modelService.executeChanges(modifyFamilyNameDelta, null, task, modifyGivenNameResult);
Expand Down Expand Up @@ -2566,7 +2560,7 @@ private Collection<ObjectDelta<? extends ObjectType>> createDeltas(Class type, F
}

private void modifyResourceAvailabilityStatus(AvailabilityStatusType status, OperationResult parentResult) throws Exception {
PropertyDelta resourceStatusDelta = PropertyDelta.createModificationReplaceProperty(new ItemPath(
PropertyDelta resourceStatusDelta = PropertyDeltaImpl.createModificationReplaceProperty(new ItemPath(
ResourceType.F_OPERATIONAL_STATE, OperationalStateType.F_LAST_AVAILABILITY_STATUS),
resourceTypeOpenDjrepo.asPrismObject().getDefinition(), status);
Collection<PropertyDelta> modifications = new ArrayList<>();
Expand Down
4 changes: 3 additions & 1 deletion testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java
View file
Expand Up @@ -30,6 +30,7 @@
import javax.xml.namespace.QName;

import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.delta.ReferenceDeltaImpl;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
Expand Down Expand Up @@ -434,7 +435,8 @@ public void test140CreateServiceAccount() throws Exception {
ObjectDelta<ServiceType> delta = ObjectDelta.createEmptyModifyDelta(ServiceType.class, SERVICE_BARELLIUM_OID, prismContext);
PrismReferenceValue accountRefVal = new PrismReferenceValueImpl();
accountRefVal.setObject(account);
ReferenceDelta accountDelta = ReferenceDelta.createModificationAdd(UserType.F_LINK_REF, getUserDefinition(), accountRefVal);
ReferenceDelta accountDelta = ReferenceDeltaImpl
.createModificationAdd(UserType.F_LINK_REF, getUserDefinition(), accountRefVal);
delta.addModification(accountDelta);

try {
Expand Down
8 changes: 3 additions & 5 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
View file
Expand Up @@ -25,6 +25,7 @@

import javax.xml.namespace.QName;

import com.evolveum.midpoint.prism.delta.*;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
Expand All @@ -35,10 +36,6 @@
import com.evolveum.midpoint.prism.PrismContainerDefinition;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismObjectDefinition;
import com.evolveum.midpoint.prism.delta.ChangeType;
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.delta.PropertyDelta;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.util.PrismAsserts;
Expand Down Expand Up @@ -1088,7 +1085,8 @@ public void test300Smith111Rename() throws Exception {
result.computeStatus();
TestUtil.assertSuccess(result);

Collection<? extends ItemDelta> fullNameModification = PropertyDelta.createModificationReplacePropertyCollection(UserType.F_FAMILY_NAME, userSmith.getDefinition(), new PolyString("Smither", "smither"));
Collection<? extends ItemDelta> fullNameModification = PropertyDeltaImpl
.createModificationReplacePropertyCollection(UserType.F_FAMILY_NAME, userSmith.getDefinition(), new PolyString("Smither", "smither"));
ObjectDelta.createModifyDelta(userSmith.getOid(), fullNameModification, UserType.class, prismContext);


Expand Down

0 comments on commit d88d3de

Please sign in to comment.