Fixing account ordering (java8)

Evolveum · Oct 27, 2015 · 46f6de0 · 46f6de0
1 parent 63c839c
commit 46f6de0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/...onnectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java b/...onnectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
@@ -19,7 +19,9 @@
 import java.net.ConnectException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -28,6 +30,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.evolveum.midpoint.util.exception.SystemException;
+
 import org.apache.commons.lang.StringUtils;
 
 import com.evolveum.midpoint.util.DebugDumpable;
@@ -110,10 +113,10 @@ public class DummyResource implements DebugDumpable {
 	private static Map<String, DummyResource> instances = new HashMap<String, DummyResource>();
 
 	DummyResource() {
-		allObjects = new ConcurrentHashMap<String,DummyObject>();
-		accounts = new ConcurrentHashMap<String, DummyAccount>();
-		groups = new ConcurrentHashMap<String, DummyGroup>();
-		privileges = new ConcurrentHashMap<String, DummyPrivilege>();
+		allObjects = Collections.synchronizedMap(new LinkedHashMap<String,DummyObject>());
+		accounts = Collections.synchronizedMap(new LinkedHashMap<String, DummyAccount>());
+		groups = Collections.synchronizedMap(new LinkedHashMap<String, DummyGroup>());
+		privileges = Collections.synchronizedMap(new LinkedHashMap<String, DummyPrivilege>());
 		scriptHistory = new ArrayList<ScriptHistoryEntry>();
 		accountObjectClass = new DummyObjectClass();
 		groupObjectClass = new DummyObjectClass();

diff --git a/...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java b/...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
@@ -578,11 +578,11 @@ public void test200ReconcileDummy() throws Exception {
         display("Script history", dummyResource.getScriptHistory());
 
         ArrayList<ProvisioningScriptSpec> scripts = new ArrayList<ProvisioningScriptSpec>();
-        addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true);
-        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
-        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
         addReconScripts(scripts, ACCOUNT_HERMAN_DUMMY_USERNAME, "Herman Toothrot", false);
+        addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true);
         addReconScripts(scripts, ACCOUNT_ELAINE_DUMMY_USERNAME, "Elaine Marley", false);
+        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
+        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
         IntegrationTestTools.assertScripts(dummyResource.getScriptHistory(), scripts.toArray(new ProvisioningScriptSpec[0]));
 
         //assertReconAuditModifications(1, TASK_RECONCILE_DUMMY_OID);
@@ -728,11 +728,11 @@ public void test219ReconcileDummyFixed() throws Exception {
         display("Script history", dummyResource.getScriptHistory());
 
         ArrayList<ProvisioningScriptSpec> scripts = new ArrayList<ProvisioningScriptSpec>();
-        addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true);
-        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
-        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
         addReconScripts(scripts, ACCOUNT_HERMAN_DUMMY_USERNAME, "Herman Toothrot", false);
+        addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true);
         addReconScripts(scripts, ACCOUNT_ELAINE_DUMMY_USERNAME, "Elaine Marley", false);
+        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
+        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
         IntegrationTestTools.assertScripts(dummyResource.getScriptHistory(), scripts.toArray(new ProvisioningScriptSpec[0]));
 
         assertReconAuditModifications(1, TASK_RECONCILE_DUMMY_OID);
@@ -799,12 +799,12 @@ public void test220ReconcileDummyBrokenGuybrush() throws Exception {
 
         display("Script history", dummyResource.getScriptHistory());
         ArrayList<ProvisioningScriptSpec> scripts = new ArrayList<ProvisioningScriptSpec>();
+        addReconScripts(scripts, ACCOUNT_HERMAN_DUMMY_USERNAME, "Herman Toothrot", false);
         // Guybrush is broken.
         addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true, false);
-        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
-        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
-        addReconScripts(scripts, ACCOUNT_HERMAN_DUMMY_USERNAME, "Herman Toothrot", false);
         addReconScripts(scripts, ACCOUNT_ELAINE_DUMMY_USERNAME, "Elaine Marley", false);
+        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
+        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
         IntegrationTestTools.assertScripts(dummyResource.getScriptHistory(), scripts.toArray(new ProvisioningScriptSpec[0]));
 
         // Task result
@@ -884,11 +884,11 @@ public void test229ReconcileDummyFixed() throws Exception {
         display("Script history", dummyResource.getScriptHistory());
 
         ArrayList<ProvisioningScriptSpec> scripts = new ArrayList<ProvisioningScriptSpec>();
-        addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true);
-        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
-        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
         addReconScripts(scripts, ACCOUNT_HERMAN_DUMMY_USERNAME, "Herman Toothrot", false);
+        addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true);
         addReconScripts(scripts, ACCOUNT_ELAINE_DUMMY_USERNAME, "Elaine Marley", false);
+        addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
+        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
         IntegrationTestTools.assertScripts(dummyResource.getScriptHistory(), scripts.toArray(new ProvisioningScriptSpec[0]));
 
         assertReconAuditModifications(1, TASK_RECONCILE_DUMMY_OID);
@@ -975,10 +975,10 @@ public void test230ReconcileDummyRename() throws Exception {
 
         ArrayList<ProvisioningScriptSpec> scripts = new ArrayList<ProvisioningScriptSpec>();
         addReconScripts(scripts, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", false);
-        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
+        addReconScripts(scripts, ACCOUNT_ELAINE_DUMMY_USERNAME, "Elaine Marley", false);
         addReconScripts(scripts, USER_RAPP_USERNAME, "Rapp Scallion", false);
+        addReconScripts(scripts, ACCOUNT_STAN_NAME, ACCOUNT_STAN_FULLNAME, false);
         addReconScripts(scripts, ACCOUNT_HTM_NAME, ACCOUNT_HTM_FULL_NAME, true);
-        addReconScripts(scripts, ACCOUNT_ELAINE_DUMMY_USERNAME, "Elaine Marley", false);
         IntegrationTestTools.assertScripts(dummyResource.getScriptHistory(), scripts.toArray(new ProvisioningScriptSpec[0]));
 
         assertReconAuditModifications(2, TASK_RECONCILE_DUMMY_OID); // the second modification is unlink