Skip to content

Commit

Permalink
(partialy) fixing MID-2107 - try searching in repo, use shadow value..
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Dec 18, 2014
1 parent d631acb commit b3ac4fa
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 4 deletions.
17 changes: 16 additions & 1 deletion ...volveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
View file
Expand Up @@ -213,7 +213,22 @@ public boolean handle(PrismObject<O> object, OperationResult parentResult) {
objectResolver.searchIterative(targetTypeClass, query, options, handler, result);
} catch (SchemaException | CommunicationException | ConfigurationException
| SecurityViolationException e) {
throw new ExpressionEvaluationException("Unexpected expressione exception "+e+": "+e.getMessage(), e);
if (BooleanUtils.isTrue(getExpressionEvaluatorType().isSearchOnResource())) {
options = SelectorOptions.createCollection(GetOperationOptions.createNoFetch());
try {
objectResolver.searchIterative(targetTypeClass, query, options, handler, result);
} catch (SchemaException | CommunicationException | ConfigurationException
| SecurityViolationException e1) {
// TODO improve handling of exception.. we do not want to
// stop whole projection computation, but what to do if the
// shadow for group doesn't exist? (MID-2107)
throw new ExpressionEvaluationException("Unexpected expression exception "+e+": "+e.getMessage(), e);
}
} else {
throw new ExpressionEvaluationException("Unexpected expression exception "+e+": "+e.getMessage(), e);
}


} catch (ObjectNotFoundException e) {
throw e;
}
Expand Down
105 changes: 102 additions & 3 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
View file
Expand Up @@ -19,6 +19,7 @@
import static org.testng.AssertJUnit.assertNotNull;

import java.io.File;
import java.util.Collection;

import javax.xml.namespace.QName;

Expand All @@ -34,14 +35,19 @@
import com.evolveum.icf.dummy.resource.DummyResource;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismProperty;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.util.PrismAsserts;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.test.DummyResourceContoller;
import com.evolveum.midpoint.test.IntegrationTestTools;
import com.evolveum.midpoint.test.util.TestUtil;
import com.evolveum.midpoint.util.MiscUtil;
import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPolicyEnforcementType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
Expand All @@ -67,8 +73,8 @@ public class TestScience extends AbstractStoryTest {
private static final File ROLE_STATISTICS_FILE = new File(TEST_DIR, "/role-statistics.xml");
private static final String ROLE_STATISTICS_OID = "23d90f70-1924-419e-9beb-78a8bde6d261";

// private static final File ROLE_MATH_FILE = new File(TEST_DIR, "/role-math.xml");
// private static final String ROLE_MATH_OID = "";
private static final File ROLE_MATH_FILE = new File(TEST_DIR, "/role-math.xml");
private static final String ROLE_MATH_OID = "";

private static final File GROUP_STATS_USERS_LDIF_FILE = new File(TEST_DIR, "group-stats.ldif");

Expand Down Expand Up @@ -221,7 +227,98 @@ public void test100jackAssignRoleStatistics() throws Exception {
assertFalse("Generated value must not be empty", generatedValue.isEmpty());

}


@Test
public void test101unassignRoleStats() throws Exception{
final String TEST_NAME = "test101unassignRoleStats";
TestUtil.displayTestTile(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestScience.class.getName() + "." + TEST_NAME);

OperationResult result = task.getResult();


assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE);

unassignRole(USER_JACK_OID, ROLE_STATISTICS_OID);


PrismObject<UserType> userJack = repositoryService.getObject(UserType.class, USER_JACK_OID, null, result);
AssertJUnit.assertNotNull("User jack not found", userJack);
UserType jackType = userJack.asObjectable();

IntegrationTestTools.display("User Jack", jackType);

AssertJUnit.assertEquals("Wrong number of link refs", 3, jackType.getLinkRef().size());

assertUserJack(userJack);
assertLinks(userJack, 3);
String accountStatsOid = getLinkRefOid(userJack, RESOURCE_DUMMY_STATS_OID);
String accountUnixOid = getLinkRefOid(userJack, RESOURCE_DUMMY_UNIX_OID);
String accountOpenDjOid = getLinkRefOid(userJack, RESOURCE_OPENDJ_AD_SIMULATION_OID);

PrismObject<ShadowType> shadowStats = provisioningService.getObject(ShadowType.class, accountStatsOid, null, task, result);
IntegrationTestTools.display("Stats account: ", shadowStats);
PrismObject<ShadowType> shadowUnix = provisioningService.getObject(ShadowType.class, accountUnixOid, null, task, result);
IntegrationTestTools.display("Unix account: ", shadowUnix);
PrismObject<ShadowType> shadowOpenDj = provisioningService.getObject(ShadowType.class, accountOpenDjOid, null, task, result);
IntegrationTestTools.display("AD account: ", shadowOpenDj);

ObjectDelta<UserType> delteStatsAccountDelta= ObjectDelta.createModificationDeleteReference(UserType.class, USER_JACK_OID, UserType.F_LINK_REF, prismContext, accountStatsOid);
modelService.executeChanges((Collection) MiscUtil.createCollection(delteStatsAccountDelta), null, task, result);

AssertJUnit.assertTrue("Expected empty assignment", jackType.getAssignment().isEmpty());

PrismObject<UserType> userJackAfter = repositoryService.getObject(UserType.class, USER_JACK_OID, null, result);
AssertJUnit.assertNotNull("User jack not found", userJackAfter);
UserType jackTypeAfter = userJackAfter.asObjectable();

IntegrationTestTools.display("User Jack", jackTypeAfter);

AssertJUnit.assertEquals("Wrong number of link refs", 2, jackTypeAfter.getLinkRef().size());

}

@Test
public void test102assignRoleStats() throws Exception{
final String TEST_NAME = "test102assignRoleStats";
TestUtil.displayTestTile(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestScience.class.getName() + "." + TEST_NAME);

OperationResult result = task.getResult();


assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE);
openDJController.stop();

assignRole(USER_JACK_OID, ROLE_STATISTICS_OID);


PrismObject<UserType> userJack = repositoryService.getObject(UserType.class, USER_JACK_OID, null, result);
AssertJUnit.assertNotNull("User jack not found", userJack);
UserType jackType = userJack.asObjectable();

IntegrationTestTools.display("User Jack", jackType);

AssertJUnit.assertEquals("Wrong number of link refs", 3, jackType.getLinkRef().size());

assertUserJack(userJack);
assertLinks(userJack, 3);
String accountStatsOid = getLinkRefOid(userJack, RESOURCE_DUMMY_STATS_OID);
String accountUnixOid = getLinkRefOid(userJack, RESOURCE_DUMMY_UNIX_OID);
String accountOpenDjOid = getLinkRefOid(userJack, RESOURCE_OPENDJ_AD_SIMULATION_OID);

PrismObject<ShadowType> shadowStats = provisioningService.getObject(ShadowType.class, accountStatsOid, null, task, result);
IntegrationTestTools.display("Stats account: ", shadowStats);
PrismObject<ShadowType> shadowUnix = provisioningService.getObject(ShadowType.class, accountUnixOid, null, task, result);
IntegrationTestTools.display("Unix account: ", shadowUnix);
PrismObject<ShadowType> shadowOpenDj = provisioningService.getObject(ShadowType.class, accountOpenDjOid, null, task, result);
IntegrationTestTools.display("AD account: ", shadowOpenDj);

openDJController.start();


}


@Test
public void test200delteUserJack() throws Exception {
Expand All @@ -247,5 +344,7 @@ public void test200delteUserJack() throws Exception {


}



}

0 comments on commit b3ac4fa

Please sign in to comment.