Skip to content

Commit

Permalink
Merge branch 'master' into feature/better-inttest
Browse files Browse the repository at this point in the history
# Conflicts:
#	infra/schema/src/test/java/com/evolveum/midpoint/schema/TestFilterSimplifier.java
#	infra/schema/testng-unit.xml
#	model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
  • Loading branch information
virgo47 committed Mar 2, 2020
2 parents b487e09 + d9553f8 commit 2a2ae2d
Show file tree
Hide file tree
Showing 26 changed files with 449 additions and 72 deletions.
Expand Up @@ -28,6 +28,7 @@ public DatePanel(String id, IModel<XMLGregorianCalendar> model) {
super(id);

DateInput date = new DateInput(ID_INPUT, new XmlGregorianCalendarModel(model));
date.setOutputMarkupId(true);
add(date);
}

Expand Down
Expand Up @@ -27,6 +27,7 @@
import com.evolveum.midpoint.web.component.prism.ValueStatus;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.web.page.admin.configuration.PageSystemConfiguration;
import com.evolveum.midpoint.web.page.admin.server.OperationalButtonsPanel;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

Expand Down Expand Up @@ -149,6 +150,9 @@ protected void onTimer(AjaxRequestTarget target) {

@Override
protected IModel<String> createPageTitleModel() {
if (PageAdminObjectDetails.this instanceof PageSystemConfiguration){
return super.createPageTitleModel();
}
String simpleName = getObjectSimpleName();
String lokalizedSimpleName = new StringResourceModel("ObjectType." + simpleName).setDefaultValue(simpleName).getString();
if (isAdd()) {
Expand Down
Expand Up @@ -8,8 +8,10 @@

import javax.xml.datatype.XMLGregorianCalendar;

import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.spring.injection.annot.SpringBean;

Expand Down
Expand Up @@ -12,6 +12,8 @@

import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.web.session.OrgStructurePanelStorage;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

import org.apache.commons.lang3.ObjectUtils;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
Expand All @@ -30,7 +32,6 @@
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.logging.LoggingUtils;
import com.evolveum.midpoint.util.logging.Trace;
Expand Down Expand Up @@ -165,9 +166,12 @@ private List<PrismObject<OrgType>> loadOrgRoots() {

List<PrismObject<OrgType>> list = new ArrayList<>();
try {
ObjectQuery query = ObjectQueryUtil.createRootOrgQuery(getPageBase().getPrismContext());
ObjectQuery query = getPageBase().getPrismContext().queryFor(OrgType.class)
.isRoot()
.asc(OrgType.F_NAME)
.build();
ObjectFilter assignableItemsFilter = getAssignableItemsFilter();
if (assignableItemsFilter != null){
if (assignableItemsFilter != null) {
query.addFilter(assignableItemsFilter);
}
list = getPageBase().getModelService().searchObjects(OrgType.class, query, null, task, result);
Expand Down
Expand Up @@ -161,7 +161,7 @@ protected IModel<String> createPageTitleModel() {
@Override
protected String load() {
if (editedResourceOid == null) {
return PageResourceWizard.super.createPageTitleModel().getObject();
return createStringResource("PageResourceWizard.title").getString();
}
String name = WebComponentUtil.getName(modelRaw.getObject());
return createStringResource("PageResourceWizard.title.edit", name).getString();
Expand Down
Expand Up @@ -264,19 +264,25 @@ public static <R extends AbstractRoleType> ObjectQuery createDirectMemberQuery(R
q0 = prismContext.queryFor(FocusType.class)
.type(objectType);
}
S_AtomicFilterExit q = q0.item(FocusType.F_ASSIGNMENT, AssignmentType.F_TARGET_REF)

// Use exists filter to build a query like this:
// $a/targetRef = oid1 and $a/tenantRef = oid2 and $a/orgRef = oid3
S_AtomicFilterExit q = q0.exists(FocusType.F_ASSIGNMENT)
.block()
.item(AssignmentType.F_TARGET_REF)
.ref(createReferenceValuesList(targetObject, relations));

if (tenant != null && tenant.getObjectType() != null) {
q = q.and().item(FocusType.F_ASSIGNMENT, AssignmentType.F_TENANT_REF).ref(ObjectTypeUtil.createObjectRef(tenant.getObjectType(),
q = q.and().item(AssignmentType.F_TENANT_REF).ref(ObjectTypeUtil.createObjectRef(tenant.getObjectType(),
prismContext).asReferenceValue());
}

if (project != null && project.getObjectType() != null) {
q = q.and().item(FocusType.F_ASSIGNMENT, AssignmentType.F_ORG_REF).ref(ObjectTypeUtil.createObjectRef(project.getObjectType(),
q = q.and().item(AssignmentType.F_ORG_REF).ref(ObjectTypeUtil.createObjectRef(project.getObjectType(),
prismContext).asReferenceValue());
}

ObjectQuery query = q.build();
ObjectQuery query = q.endBlock().build();
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Searching members of role {} with query:\n{}", targetObject.getOid(), query.debugDump());
}
Expand Down
Expand Up @@ -10,6 +10,7 @@

import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;

Expand Down Expand Up @@ -61,6 +62,11 @@ protected boolean isSelfProfile(){
return true;
}

@Override
protected IModel<String> createPageTitleModel() {
return createStringResource("PageAdmin.menu.profile");
}

@Override
protected void createBreadcrumb() {
super.createBreadcrumb();
Expand Down
Expand Up @@ -12,6 +12,7 @@

import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;

Expand Down Expand Up @@ -65,6 +66,11 @@ protected boolean isSelfProfile(){
return true;
}

@Override
protected IModel<String> createPageTitleModel() {
return createStringResource("PageAdmin.menu.profile");
}

@Override
protected void createBreadcrumb() {
super.createBreadcrumb();
Expand Down
Expand Up @@ -10,6 +10,7 @@

import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;

Expand Down Expand Up @@ -63,6 +64,11 @@ protected boolean isSelfProfile(){
return true;
}

@Override
protected IModel<String> createPageTitleModel() {
return createStringResource("PageAdmin.menu.profile");
}

@Override
protected void createBreadcrumb() {
super.createBreadcrumb();
Expand Down
Expand Up @@ -8,6 +8,7 @@

import com.evolveum.midpoint.gui.api.GuiStyleConstants;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;

Expand Down Expand Up @@ -65,6 +66,11 @@ protected String getObjectOidParameter() {
}


@Override
protected IModel<String> createPageTitleModel() {
return createStringResource("PageAdmin.menu.profile");
}

@Override
protected boolean isSelfProfile(){
return true;
Expand Down
Expand Up @@ -41,10 +41,13 @@ public class TestPageOrg extends AbstractInitializedGuiIntegrationTest {
private static final Trace LOGGER = TraceManager.getTrace(TestPageOrg.class);

private static final String MAIN_FORM = "mainPanel:mainForm";
private static final String FORM_INPUT_DESCRIPTION = "tabPanel:panel:basicSystemConfiguration:values:0:value:propertiesLabel:properties:1:property:values:0:valueContainer:form:input:input";
// private static final String FORM_INPUT_DESCRIPTION = "tabPanel:panel:basicSystemConfiguration:values:0:value:propertiesLabel:properties:1:property:values:0:valueContainer:form:input:input";
private static final String PATH_FORM_NAME = "tabPanel:panel:main:values:0:value:propertiesLabel:properties:0:property:values:0:valueContainer:form:input:originValueContainer:origValueWithButton:origValue:input";
private static final String FORM_SAVE = "save";

private static final String NEW_ORG_NAME = "A-newOrg"; // starts with "A" to be alphabetically first
private static final String NEW_ORG_CHILD_NAME = "newOrgChild";

@Override
public void initSystem(Task initTask, OperationResult initResult) throws Exception {
super.initSystem(initTask, initResult);
Expand All @@ -69,12 +72,12 @@ public void test003testAddNewOrg() throws Exception {
renderPage(PageOrgUnit.class);

FormTester formTester = tester.newFormTester(MAIN_FORM, false);
formTester.setValue(PATH_FORM_NAME, "newOrg");
formTester = formTester.submit(FORM_SAVE);
formTester.setValue(PATH_FORM_NAME, NEW_ORG_NAME);
formTester.submit(FORM_SAVE);

Thread.sleep(5000);

PrismObject<OrgType> newOrg = findObjectByName(OrgType.class, "newOrg");
PrismObject<OrgType> newOrg = findObjectByName(OrgType.class, NEW_ORG_NAME);
assertNotNull(newOrg, "New org not created.");
LOGGER.info("created org: {}", newOrg.debugDump());
}
Expand All @@ -86,25 +89,22 @@ public void test004testCreateChild() throws Exception {
tester.assertRenderedPage(PageOrgUnit.class);

FormTester formTester = tester.newFormTester(MAIN_FORM, false);
formTester.setValue(PATH_FORM_NAME, "newOrgChild");
formTester = formTester.submit(FORM_SAVE);
formTester.setValue(PATH_FORM_NAME, NEW_ORG_CHILD_NAME);
formTester.submit(FORM_SAVE);

Thread.sleep(5000);

PrismObject<OrgType> newOrgChild = findObjectByName(OrgType.class, "newOrgChild");
PrismObject<OrgType> newOrg = findObjectByName(OrgType.class, "newOrg");
PrismObject<OrgType> newOrgChild = findObjectByName(OrgType.class, NEW_ORG_CHILD_NAME);
PrismObject<OrgType> newOrg = findObjectByName(OrgType.class, NEW_ORG_NAME);
assertNotNull(newOrgChild, "New org not created.");
assertAssignedOrg(newOrgChild, newOrg.getOid());
}

private Page renderPage(Class<? extends Page> expectedRenderedPageClass) {
private void renderPage(Class<? extends Page> expectedRenderedPageClass) {
LOGGER.info("render page system configuration");
PageParameters params = new PageParameters();
Page pageAccount = tester.startPage(expectedRenderedPageClass, params);
tester.startPage(expectedRenderedPageClass, params);

tester.assertRenderedPage(expectedRenderedPageClass);

return pageAccount;
}

}
@@ -0,0 +1,142 @@
/*
* Copyright (c) 2010-2018 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 com.evolveum.midpoint.gui.test.TestMidPointSpringApplication;
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.AbstractInitializedGuiIntegrationTest;
import com.evolveum.midpoint.web.page.admin.roles.AbstractRoleMemberPanel;
import com.evolveum.midpoint.web.page.admin.roles.PageRole;
import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
import org.apache.wicket.Page;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.FormTester;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ActiveProfiles;
import org.testng.annotations.Test;

import static com.evolveum.midpoint.web.AdminGuiTestConstants.USER_JACK_OID;
import static com.evolveum.midpoint.web.AdminGuiTestConstants.USER_JACK_USERNAME;
import static org.testng.Assert.assertNotNull;

/**
* @author Hiroyuki Wada
*/
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
@ActiveProfiles("test")
@SpringBootTest(classes = TestMidPointSpringApplication.class)
public class TestPageRole extends AbstractInitializedGuiIntegrationTest {

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

private static final String MAIN_FORM = "mainPanel:mainForm";
private static final String PATH_FORM_NAME = "tabPanel:panel:main:values:0:value:propertiesLabel:properties:0:property:values:0:valueContainer:form:input:originValueContainer:origValueWithButton:origValue:input";
private static final String FORM_SAVE = "save";

@Override
public void initSystem(Task initTask, OperationResult initResult) throws Exception {
super.initSystem(initTask, initResult);
PrismObject<SystemConfigurationType> systemConfig = parseObject(SYSTEM_CONFIGURATION_FILE);

LOGGER.info("adding system config page");
addObject(systemConfig, ModelExecuteOptions.createOverwrite(), initTask, initResult);
}

@Test
public void test001testAddNewRole() throws Exception {
renderPage(PageRole.class);

FormTester formTester = tester.newFormTester(MAIN_FORM, false);
formTester.setValue(PATH_FORM_NAME, "newRole");
formTester = formTester.submit(FORM_SAVE);

Thread.sleep(5000);

PrismObject<RoleType> newRole = findObjectByName(RoleType.class, "newRole");
assertNotNull(newRole, "New role not created.");
LOGGER.info("created role: {}", newRole.debugDump());
}

/**
* MID-6092
*/
@Test
public void test002testMembers() throws Exception {
// GIVEN
PrismObject<RoleType> role1 = createObject(RoleType.class, "Role0001");
PrismObject<RoleType> role2 = createObject(RoleType.class, "Role0002");
String role1Oid = addObject(role1);
String role2Oid = addObject(role2);
Task task = createTask("assign");
// Assign Role0001 with orgRef P0001
assignParametricRole(USER_JACK_OID, role1Oid, ORG_SAVE_ELAINE_OID, null, task, task.getResult());
assignRole(USER_ADMINISTRATOR_OID, role1Oid);
// Assign Role0002 with orgRef P0001
assignParametricRole(USER_ADMINISTRATOR_OID, role2Oid, ORG_SAVE_ELAINE_OID, null, task, task.getResult());

String panel = "mainPanel:mainForm:tabPanel:panel";
String memberTable = panel + ":form:memberContainer:memberTable:mainForm:table:box:tableContainer:table";

// WHEN
// Open Role0001 page
renderPage(PageRole.class, role1Oid);
// Show Members tab
clickOnTab(8);

// THEN
tester.assertComponent(panel, AbstractRoleMemberPanel.class);
tester.debugComponentTrees(":rows:.*:cells:3:cell:link:label");
// It should show all members who are assigned Role0001
tester.hasLabel(memberTable + ":body:rows:1:cells:3:cell:link:label", USER_ADMINISTRATOR_USERNAME);
tester.hasLabel(memberTable + ":body:rows:2:cells:3:cell:link:label", USER_JACK_USERNAME);
tester.assertNotExists(memberTable + ":body:rows:3:cells:3:cell:link:label");

// WHEN
// Choose P0001 in 'Org/Project' filter selection
tester.clickLink(panel + ":form:project:inputContainer:choose");
tester.clickLink("mainPopup:content:table:mainForm:table:box:tableContainer:table:body:rows:7:cells:2:cell:link");
executeModalWindowCloseCallback("mainPopup");

// THEN
// It should show only one user who is assigned Role0001 with orgRef P0001
tester.debugComponentTrees(":rows:.*:cells:3:cell:link:label");
tester.hasLabel(memberTable + ":body:rows:3:cells:3:cell:link:label", USER_JACK_USERNAME);
tester.assertNotExists(memberTable + ":body:rows:4:cells:3:cell:link:label");
}

private void clickOnTab(int order) {
tester.assertRenderedPage(PageRole.class);
String tabPath = "mainPanel:mainForm:tabPanel:tabs-container:tabs:" + order + ":link";
tester.clickLink(tabPath);
}

private Page renderPage(Class<? extends Page> expectedRenderedPageClass) {
return renderPage(expectedRenderedPageClass, null);
}

private Page renderPage(Class<? extends Page> expectedRenderedPageClass, String oid) {
LOGGER.info("render page role");
PageParameters params = new PageParameters();
if (oid != null) {
params.add(OnePageParameterEncoder.PARAMETER, oid);
}
Page pageRole = tester.startPage(expectedRenderedPageClass, params);

tester.assertRenderedPage(expectedRenderedPageClass);

return pageRole;
}
}

0 comments on commit 2a2ae2d

Please sign in to comment.