Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Nov 27, 2015 · 26bd286 · 26bd286
2 parents 5483770 + f944e1f
commit 26bd286
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -961,7 +961,7 @@ private void prepareActivation(ResourceActivationDefinitionType activation){
             existence.getInbound().addAll(newInbounds);
 
             List<MappingType> outbounds = existence.getOutbound();
-            List<MappingType> newOutbounds = existence.getOutbound();
+            List<MappingType> newOutbounds = new ArrayList<>();
 
             for(MappingType outbound: outbounds){
                 if(!WizardUtil.isEmptyMapping(outbound)){

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
@@ -73,6 +73,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.query_3.QueryType;
 import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -319,6 +320,7 @@ public void onClick(AjaxRequestTarget target) {
 						objectEditPerformed(target, object.getOid(), type);
 					}
 				};
+                panel.add(new AttributeModifier("style", "min-width: 100%"));
 				cellItem.add(panel);
 
 			}

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
@@ -1,6 +1,6 @@
 package com.evolveum.midpoint.testing.story;
 /*
- * Copyright (c) 2013 Evolveum
+ * Copyright (c) 2013-2015 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -186,8 +186,8 @@ public void test000Sanity() throws Exception {
 	}
 
 	@Test
-	public void test100jackAssignRoleStatistics() throws Exception {
-		final String TEST_NAME = "test100jackAssignRoleStatistics";
+	public void test100JackAssignRoleStatistics() throws Exception {
+		final String TEST_NAME = "test100JackAssignRoleStatistics";
 		TestUtil.displayTestTile(this, TEST_NAME);
 		Task task = taskManager.createTaskInstance(TestScience.class.getName() + "." + TEST_NAME);
 
@@ -229,8 +229,8 @@ public void test100jackAssignRoleStatistics() throws Exception {
 	}
 
 	@Test
-	public void test101unassignRoleStats() throws Exception{
-		final String TEST_NAME = "test101unassignRoleStats";
+	public void test101UnassignRoleStats() throws Exception{
+		final String TEST_NAME = "test101UnassignRoleStats";
 		TestUtil.displayTestTile(this, TEST_NAME);
 		Task task = taskManager.createTaskInstance(TestScience.class.getName() + "." + TEST_NAME);
 
@@ -279,8 +279,8 @@ public void test101unassignRoleStats() throws Exception{
 	}
 
 	@Test
-	public void test102assignRoleStats() throws Exception{
-		final String TEST_NAME = "test102assignRoleStats";
+	public void test102AssignRoleStats() throws Exception{
+		final String TEST_NAME = "test102AssignRoleStats";
 		TestUtil.displayTestTile(this, TEST_NAME);
 		Task task = taskManager.createTaskInstance(TestScience.class.getName() + "." + TEST_NAME);
 
@@ -327,15 +327,17 @@ public void test102assignRoleStats() throws Exception{
 
 
 	@Test
-	public void test200delteUserJack() throws Exception {
-		final String TEST_NAME = "test200delteUserJack";
+	public void test200DelteUserJack() throws Exception {
+		final String TEST_NAME = "test200DelteUserJack";
 		TestUtil.displayTestTile(this, TEST_NAME);
 		Task task = taskManager.createTaskInstance(TestScience.class.getName() + "." + TEST_NAME);
 
 		OperationResult result = task.getResult();
 
+		// WHEN
 		deleteObject(UserType.class, USER_JACK_OID, task, result);
 
+		// THEN
 		result.computeStatus();
 
 		IntegrationTestTools.display("Result: ", result);
@@ -344,16 +346,8 @@ public void test200delteUserJack() throws Exception {
 			AssertJUnit.fail("Expected success or handled error, but got "+result.getStatus());
 		}
 
-		try {
-			repositoryService.getObject(UserType.class, USER_JACK_OID, null, result);
-			AssertJUnit.fail("Unexpected user jack. It must not exist.");
-		} catch (ObjectNotFoundException ex){
-			//this is OK
-		}
-
+		assertNoObject(UserType.class, USER_JACK_OID, task, result);
 
-	}
-
-
+	}		
 
 }
diff --git a/testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml b/testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2014 Evolveum
+  ~ Copyright (c) 2010-2015 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -264,6 +264,10 @@
       </objectType>
    </schemaHandling>
 
+   <consistency>
+		<avoidDuplicateValues>true</avoidDuplicateValues>
+	</consistency>
+
    <synchronization>
       <objectSynchronization>
          <enabled>true</enabled>