diff --git a/build-system/pom.xml b/build-system/pom.xml index 44292c3c178..72883ce0de0 100644 --- a/build-system/pom.xml +++ b/build-system/pom.xml @@ -55,7 +55,7 @@ 2.4.3 1.8.5 2.1.3 - 1.0.1 + 2.43.1 1.6.4 4.0.6.RELEASE 3.2.5.RELEASE diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml index 30801a26573..0d0eaa247b2 100644 --- a/gui/admin-gui/pom.xml +++ b/gui/admin-gui/pom.xml @@ -386,11 +386,23 @@ test - org.seleniumhq.selenium.client-drivers - selenium-java-client-driver + org.seleniumhq.selenium + selenium-java ${selenium.version} test + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium.version} + + + org.seleniumhq.selenium + selenium-remote-driver + + + test + com.evolveum.midpoint.tools test-ng diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java index c0e1b84753b..50322d5ccf4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java @@ -115,13 +115,12 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskExecutionStatusType; import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; -import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; +import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import org.apache.commons.lang.StringUtils; import org.apache.wicket.Component; import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox; -import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -380,14 +379,6 @@ protected IModel createDescription(IModel model) { initConfirmationDialogs(); } - private String getLabelFromPolyString(PolyStringType poly){ - if(poly == null || poly.getOrig() == null){ - return "-"; - } else{ - return poly.getOrig(); - } - } - private void initSummaryInfo(Form mainForm){ WebMarkupContainer summaryContainer = new WebMarkupContainer(ID_SUMMARY_PANEL); @@ -954,43 +945,46 @@ public void onClick(AjaxRequestTarget target) { mainForm.add(new ExecuteChangeOptionsPanel(ID_EXECUTE_OPTIONS, executeOptionsModel, true)); } + //todo modal private void showAssignablePopup(AjaxRequestTarget target, Class type) { - ModalWindow modal = (ModalWindow) get(MODAL_ID_ASSIGNABLE); - AssignablePopupContent content = (AssignablePopupContent) modal.get(modal.getContentId()); - content.setType(type); + Modal modal = (Modal) get(MODAL_ID_ASSIGNABLE); +// AssignablePopupContent content = (AssignablePopupContent) modal.get(modal.getContentId()); +// content.setType(type); showModalWindow(MODAL_ID_ASSIGNABLE, target); } - + //todo modal private void initResourceModal() { - ModalWindow window = createModalWindow(MODAL_ID_RESOURCE, - createStringResource("pageUser.title.selectResource"), 1100, 560); - - final SimpleUserResourceProvider provider = new SimpleUserResourceProvider(this, accountsModel); - window.setContent(new ResourcesPopup(window.getContentId()) { - - @Override - public SimpleUserResourceProvider getProvider(){ - return provider; - } - - @Override - protected void addPerformed(AjaxRequestTarget target, List newResources) { - addSelectedAccountPerformed(target, newResources); - } - }); + Modal window = new Modal(MODAL_ID_RESOURCE); +// ModalWindow window = createModalWindow(MODAL_ID_RESOURCE, +// createStringResource("pageUser.title.selectResource"), 1100, 560); +// +// final SimpleUserResourceProvider provider = new SimpleUserResourceProvider(this, accountsModel); +// window.setContent(new ResourcesPopup(window.getContentId()) { +// +// @Override +// public SimpleUserResourceProvider getProvider(){ +// return provider; +// } +// +// @Override +// protected void addPerformed(AjaxRequestTarget target, List newResources) { +// addSelectedAccountPerformed(target, newResources); +// } +// }); add(window); } - + //todo modal private void initAssignableModal() { - ModalWindow window = createModalWindow(MODAL_ID_ASSIGNABLE, - createStringResource("pageUser.title.selectAssignable"), 1100, 560); - window.setContent(new AssignablePopupContent(window.getContentId()) { - - @Override - protected void addPerformed(AjaxRequestTarget target, List selected) { - addSelectedAssignablePerformed(target, selected); - } - }); + Modal window = new Modal(MODAL_ID_ASSIGNABLE); +// Modal window = createModalWindow(MODAL_ID_ASSIGNABLE, +// createStringResource("pageUser.title.selectAssignable"), 1100, 560); +// window.setContent(new AssignablePopupContent(window.getContentId()) { +// +// @Override +// protected void addPerformed(AjaxRequestTarget target, List selected) { +// addSelectedAssignablePerformed(target, selected); +// } +// }); add(window); } @@ -1591,7 +1585,7 @@ private List getSelectedAccounts() { } private List getSelectedAssignments() { - List selected = new ArrayList(); + List selected = new ArrayList<>(); List all = assignmentsModel.getObject(); for (AssignmentEditorDto wrapper : all) { @@ -1604,7 +1598,7 @@ private List getSelectedAssignments() { } private void addSelectedAccountPerformed(AjaxRequestTarget target, List newResources) { - ModalWindow window = (ModalWindow) get(MODAL_ID_RESOURCE); + Modal window = (Modal) get(MODAL_ID_RESOURCE); window.close(target); if (newResources.isEmpty()) { @@ -1680,7 +1674,7 @@ private void addSelectedResourceAssignPerformed(ResourceType resource) { } private void addSelectedAssignablePerformed(AjaxRequestTarget target, List newAssignables) { - ModalWindow window = (ModalWindow) get(MODAL_ID_ASSIGNABLE); + Modal window = (Modal) get(MODAL_ID_ASSIGNABLE); window.close(target); if (newAssignables.isEmpty()) { @@ -1773,7 +1767,7 @@ private void deleteAccountPerformed(AjaxRequestTarget target) { } private void showModalWindow(String id, AjaxRequestTarget target) { - ModalWindow window = (ModalWindow) get(id); + Modal window = (Modal) get(id); window.show(target); } diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java deleted file mode 100644 index 9e3e242687d..00000000000 --- a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.evolveum.midpoint.web; - -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.delta.ObjectDelta; -import com.evolveum.midpoint.prism.polystring.PolyString; -import com.evolveum.midpoint.web.component.prism.*; -import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; - -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; - -import java.io.File; -import java.lang.reflect.Field; - -/** - * @author lazyman - */ -@ContextConfiguration(locations = {"../../../../ctx-test.xml"}) -@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -public class ObjectWrapperTest extends BaseGuiTest { - - @Test - public void testEmptyPolyString() throws Exception { - PrismObject user = prismContext.parseObject(new File("./src/test/resources/wrapper/user.xml")); - - ObjectWrapper wrapper = new ObjectWrapper(null, null, user, null, ContainerStatus.MODIFYING, null); - //simulate change on honorific prefix - ContainerWrapper containerWrapper = null; - for (ContainerWrapper container : wrapper.getContainers()) { - if (container.isMain()) { - containerWrapper = container; - break; - } - } - - PropertyWrapper propertyWrapper = containerWrapper.findPropertyWrapper(UserType.F_HONORIFIC_SUFFIX); - ValueWrapper valueWrapper = propertyWrapper.getValues().get(0); - PolyString value = (PolyString) valueWrapper.getValue().getValue(); - - Field orig = PolyString.class.getDeclaredField("orig"); - orig.setAccessible(true); - orig.set(value, null); - orig.setAccessible(false); - - ObjectDelta delta = wrapper.getObjectDelta(); - AssertJUnit.assertNotNull(delta); - } -} diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/PageTest.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/PageTest.java deleted file mode 100644 index 4c38c2ea37c..00000000000 --- a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/PageTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.evolveum.midpoint.web; - -import org.apache.wicket.Page; -import org.apache.wicket.util.tester.WicketTester; -import org.testng.annotations.Test; - -/** - * Base class for all page tests for wicket. - * - * @author lazyman - */ -public abstract class PageTest { - - private Class page; - - public PageTest(Class page) { - this.page = page; - } - - @Test - public void testBasicRender() { - WicketTester tester = new WicketTester(); - tester.startPage(page); - tester.assertRenderedPage(page); - } -} diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/SeleniumExampleTest.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/SeleniumExampleTest.java new file mode 100644 index 00000000000..29a68ed8bff --- /dev/null +++ b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/SeleniumExampleTest.java @@ -0,0 +1,7 @@ +package com.evolveum.midpoint.web; + +/** + * @author lazyman + */ +public class SeleniumExampleTest extends BaseGuiTest { +}