Skip to content

Commit

Permalink
Fixing model-intest
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Jun 8, 2017
1 parent 5425657 commit 19f1c09
Show file tree
Hide file tree
Showing 8 changed files with 617 additions and 548 deletions.
6 changes: 4 additions & 2 deletions ...del-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
View file
Expand Up @@ -436,8 +436,10 @@ public String debugDump(int indent) {
sb.append("\n");
DebugUtil.debugDumpWithLabel(sb, "forceRecon", forceRecon, indent + 1);
}
if (!constructionTriple.isEmpty()) {
sb.append("\n");
sb.append("\n");
if (constructionTriple.isEmpty()) {
DebugUtil.debugDumpWithLabel(sb, "Constructions", "(empty)", indent+1);
} else {
DebugUtil.debugDumpWithLabel(sb, "Constructions", constructionTriple, indent+1);
}
if (!personaConstructionTriple.isEmpty()) {
Expand Down
269 changes: 119 additions & 150 deletions model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
View file

Large diffs are not rendered by default.

372 changes: 182 additions & 190 deletions model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
View file

Large diffs are not rendered by default.

341 changes: 168 additions & 173 deletions ...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions ...test/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
View file
Expand Up @@ -79,7 +79,4 @@ public void test910DeleteDummyAccounts() throws Exception {
// Not relevant for deprecated syntax
}




}
13 changes: 9 additions & 4 deletions repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
View file
Expand Up @@ -137,6 +137,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -2063,7 +2064,7 @@ protected <F extends FocusType> void assertNoRoleMembershipRef(PrismObject<F> fo
assertNull("No roleMembershipRef expected in "+focus+", but found: "+memRef, memRef);
}

protected void generateRoles(int numberOfRoles, String nameFormat, String oidFormat, Consumer<RoleType> mutator, OperationResult result) throws Exception {
protected void generateRoles(int numberOfRoles, String nameFormat, String oidFormat, BiConsumer<RoleType,Integer> mutator, OperationResult result) throws Exception {
long startMillis = System.currentTimeMillis();

PrismObjectDefinition<RoleType> roleDefinition = getRoleDefinition();
Expand All @@ -2075,7 +2076,7 @@ protected void generateRoles(int numberOfRoles, String nameFormat, String oidFor
roleType.setName(createPolyStringType(name));
roleType.setOid(oid);
if (mutator != null) {
mutator.accept(roleType);
mutator.accept(roleType, i);
}
LOGGER.info("Adding {}:\n{}", role, role.debugDump(1));
repositoryService.addObject(role, null, result);
Expand Down Expand Up @@ -2103,12 +2104,16 @@ protected String assignmentSummary(PrismObject<UserType> user) {

private void relationToMap(Map<String, Integer> map, ObjectReferenceType ref) {
if (ref != null) {
Integer i = map.get(ref.getRelation().getLocalPart());
String relation = null;
if (ref.getRelation() != null) {
relation = ref.getRelation().getLocalPart();
}
Integer i = map.get(relation);
if (i == null) {
i = 0;
}
i++;
map.put(ref.getRelation().getLocalPart(), i);
map.put(relation, i);
}
}

Expand Down
2 changes: 1 addition & 1 deletion testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNotoriousRole.java
View file
Expand Up @@ -114,7 +114,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
super.initSystem(initTask, initResult);

generateRoles(NUMBER_OF_LEVEL_A_ROLES, ROLE_LEVEL_A_NAME_FORMAT, ROLE_LEVEL_A_OID_FORMAT,
role -> {
(role,i) -> {
role.beginInducement().targetRef(ROLE_NOTORIOUS_OID, RoleType.COMPLEX_TYPE).end();
},
initResult);
Expand Down
159 changes: 134 additions & 25 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
View file
Expand Up @@ -20,82 +20,134 @@
import java.util.List;
import java.util.Map;

import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;

import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
import org.testng.annotations.Test;

import com.evolveum.icf.dummy.resource.DummyAccount;
import com.evolveum.midpoint.model.api.context.ModelContext;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.util.PrismTestUtil;
import com.evolveum.midpoint.schema.constants.MidPointConstants;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.internals.InternalMonitor;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
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.MidPointTestConstants;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SystemException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectFactory;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;

/**
* MID-3938
*
* @author Radovan Semancik
*
*/
@ContextConfiguration(locations = {"classpath:ctx-story-test-main.xml"})
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
public class TestPlentyOfAssignments extends AbstractStoryTest {

public static final File TEST_DIR = new File(MidPointTestConstants.TEST_RESOURCES_DIR, "plenty-of-assignments");

protected static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml");
protected static final String RESOURCE_DUMMY_OID = "10000000-0000-0000-0000-000000000004";
private static final String RESOURCE_DUMMY_NS = MidPointConstants.NS_RI;

public static final File USER_CHEESE_FILE = new File(TEST_DIR, "user-cheese.xml");
public static final String USER_CHEESE_OID = "9e796c76-45e0-11e7-9dfd-1792e56081d0";

protected static final File USER_BOB_FILE = new File(TEST_DIR, "user-bob.xml");
protected static final String USER_BOB_OID = "f5ffef5e-4b96-11e7-8e4c-1b0bc353a751";
protected static final String USER_BOB_USERNAME = "bob";
protected static final String USER_BOB_FULLNAME = "Bob";

public static final File ROLE_BASIC_FILE = new File(TEST_DIR, "role-basic.xml");
public static final String ROLE_BASIC_OID = "6909ff20-45e4-11e7-b0a3-0fe76ff4380e";

private static final int NUMBER_OF_ORDINARY_ROLES = 2; // including superuser role
private static final int NUMBER_OF_GENERATED_ROLES = 1000;
private static final String GENERATED_ROLE_OID_FORMAT = "00000000-0000-ffff-2000-00000000%04d";
private static final int NUMBER_OF_GENERATED_EMPTY_ROLES = 1000;
private static final String GENERATED_EMPTY_ROLE_OID_FORMAT = "00000000-0000-ffff-2000-e0000000%04d";
private static final int NUMBER_OF_GENERATED_DUMMY_ROLES = 10;
private static final String GENERATED_DUMMY_ROLE_OID_FORMAT = "00000000-0000-ffff-2000-d0000000%04d";

private static final int NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER = 600;
private static final int NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER = 400;
private static final int NUMBER_OF_CHEESE_ASSIGNMENTS_ORDINARY = 1;
private static final int NUMBER_OF_CHEESE_ASSIGNMENTS = NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER + NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER + NUMBER_OF_CHEESE_ASSIGNMENTS_ORDINARY;

private static final int NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS = NUMBER_OF_GENERATED_DUMMY_ROLES;

private static final Trace LOGGER = TraceManager.getTrace(TestPlentyOfAssignments.class);


private RepoReadInspector inspector;

@Override
public void initSystem(Task initTask, OperationResult initResult) throws Exception {
super.initSystem(initTask, initResult);

initDummyResourcePirate(null, RESOURCE_DUMMY_FILE, RESOURCE_DUMMY_OID, initTask, initResult);

importObjectFromFile(ROLE_BASIC_FILE, initResult);

generateRoles(NUMBER_OF_GENERATED_ROLES, "role%04d", GENERATED_ROLE_OID_FORMAT, null, initResult);
ObjectFactory objectFactory = new ObjectFactory();
generateRoles(NUMBER_OF_GENERATED_EMPTY_ROLES, "Empty Role %04d", GENERATED_EMPTY_ROLE_OID_FORMAT, null, initResult);
generateRoles(NUMBER_OF_GENERATED_DUMMY_ROLES, "Dummy Role %04d", GENERATED_DUMMY_ROLE_OID_FORMAT,
(role,i) -> {
ItemPathType attrPath = new ItemPathType(
new ItemPath(new QName(RESOURCE_DUMMY_NS, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME)));
JAXBElement<Object> evaluator = objectFactory.createValue(String.format("bottle of rum #%04d", i));
role
.beginInducement()
.beginConstruction()
.resourceRef(RESOURCE_DUMMY_OID, ResourceType.COMPLEX_TYPE)
.kind(ShadowKindType.ACCOUNT)
.beginAttribute()
.ref(attrPath)
.beginOutbound()
.beginExpression()
.expressionEvaluator(evaluator);
try {
IntegrationTestTools.displayXml("RRRRRRRRR", role.asPrismObject());
} catch (SchemaException e) {
throw new SystemException(e);
}
}, initResult);

inspector = new RepoReadInspector();
InternalMonitor.setInspector(inspector);
}

private String generateRoleOid(int num) {
return String.format(GENERATED_ROLE_OID_FORMAT, num);
private String generateRoleOid(String format, int num) {
return String.format(format, num);
}

@Test
public void test000Sanity() throws Exception {
final String TEST_NAME = "test000Sanity";
displayTestTile(TEST_NAME);

assertObjects(RoleType.class, NUMBER_OF_GENERATED_ROLES + NUMBER_OF_ORDINARY_ROLES);
assertObjects(RoleType.class, NUMBER_OF_GENERATED_EMPTY_ROLES + NUMBER_OF_GENERATED_DUMMY_ROLES + NUMBER_OF_ORDINARY_ROLES);

display("Repo reads", InternalMonitor.getRepositoryReadCount());
display("Object compares", InternalMonitor.getPrismObjectCompareCount());
Expand Down Expand Up @@ -234,39 +286,96 @@ public void test120CheesePreviewChanges() throws Exception {

private PrismObject<UserType> prepareCheese() throws Exception {
PrismObject<UserType> cheese = PrismTestUtil.parseObject(USER_CHEESE_FILE);
addAssignments(cheese, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER);
addAssignments(cheese, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER);
addAssignments(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER);
addAssignments(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER);
return cheese;
}

private void assertCheeseRoleMembershipRef(PrismObject<UserType> cheese) {

assertRoleMembershipRefs(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER);
assertRoleMembershipRefs(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER);

assertRoleMembershipRef(cheese, ROLE_BASIC_OID, SchemaConstants.ORG_DEFAULT);

assertRoleMembershipRefs(cheese, NUMBER_OF_CHEESE_ASSIGNMENTS);
}

/**
* MID-3938 #8
*/
@Test
public void test200AddBob() throws Exception {
final String TEST_NAME = "test200AddBob";
displayTestTile(TEST_NAME);

Task task = createTask(TEST_NAME);
OperationResult result = task.getResult();

PrismObject<UserType> userBefore = PrismTestUtil.parseObject(USER_BOB_FILE);
addAssignments(userBefore, GENERATED_DUMMY_ROLE_OID_FORMAT, null, 0, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS);
display("User before", assignmentSummary(userBefore));

inspector.reset();
rememberPrismObjectCompareCount();
rememberRepositoryReadCount();
long startMillis = System.currentTimeMillis();

// WHEN
displayWhen(TEST_NAME);

addObject(userBefore, task, result);

// THEN
displayThen(TEST_NAME);
long endMillis = System.currentTimeMillis();
assertSuccess(result);

display("Added jack in "+(endMillis - startMillis)+"ms ("+((endMillis - startMillis)/NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS)+"ms per assignment)");

PrismObject<UserType> userAfter = getUser(USER_BOB_OID);
display("User after", assignmentSummary(userAfter));
assertBobRoleMembershipRef(userAfter);

display("Repo reads", InternalMonitor.getRepositoryReadCount());
display("Object compares", InternalMonitor.getPrismObjectCompareCount());

display("Inspector", inspector);

// inspector.assertRead(RoleType.class, NUMBER_OF_JACK_DUMMY_ROLE_ASSIGNMENTS);
// assertRepositoryReadCount(xxx); // may be influenced by tasks

assertPrismObjectCompareCount(0);

DummyAccount dummyAccount = assertDummyAccount(null, USER_BOB_USERNAME, USER_BOB_FULLNAME, true);
display("Dummy account", dummyAccount);
// TODO: assert drink: bottles of rum
}

private void addAssignments(PrismObject<UserType> user, QName relation, int offset, int num) {
private void assertBobRoleMembershipRef(PrismObject<UserType> user) {

assertRoleMembershipRefs(user, GENERATED_DUMMY_ROLE_OID_FORMAT, null, 0, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS);
assertRoleMembershipRefs(user, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS);
}

private void addAssignments(PrismObject<UserType> user, String roleOidFormat, QName relation, int offset, int num) {
UserType userType = user.asObjectable();
for (int i = 0; i < num; i++) {
AssignmentType assignmentType = new AssignmentType();
String oid = generateRoleOid(offset + i);
String oid = generateRoleOid(roleOidFormat, offset + i);
assignmentType.targetRef(oid, RoleType.COMPLEX_TYPE, relation);
userType.getAssignment().add(assignmentType);
}
}

private void assertCheeseRoleMembershipRef(PrismObject<UserType> cheese) {

assertRoleMembershipRefs(cheese, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER);
assertRoleMembershipRefs(cheese, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER);

assertRoleMembershipRef(cheese, ROLE_BASIC_OID, SchemaConstants.ORG_DEFAULT);

assertRoleMembershipRefs(cheese, NUMBER_OF_CHEESE_ASSIGNMENTS);
}

private void assertRoleMembershipRefs(PrismObject<UserType> user, QName relation, int offset, int num) {
private void assertRoleMembershipRefs(PrismObject<UserType> user, String roleOidFormat, QName relation, int offset, int num) {
for (int i = 0; i < num; i++) {
assertRoleMembershipRef(user, relation, offset + i);
assertRoleMembershipRef(user, roleOidFormat, relation, offset + i);
}
}

private void assertRoleMembershipRef(PrismObject<UserType> user, QName relation, int num) {
assertRoleMembershipRef(user, generateRoleOid(num), relation);
private void assertRoleMembershipRef(PrismObject<UserType> user, String roleOidFormat, QName relation, int num) {
assertRoleMembershipRef(user, generateRoleOid(roleOidFormat, num), relation);
}

private void assertRoleMembershipRef(PrismObject<UserType> user, String roleOid, QName relation) {
Expand Down

0 comments on commit 19f1c09

Please sign in to comment.