Fix test robustness after AnalyzerGuru list growth

Author: idodeclare

opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexAnalysisSettingsUpgraderTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018-2019, Chris Fraire <[email protected]>.
+ * Copyright (c) 2018-2020, Chris Fraire <[email protected]>.
  */
 
 package org.opengrok.indexer.index;
@@ -30,6 +30,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Test;
@@ -74,23 +75,22 @@ public void shouldHandleLatest() throws IOException,
                 (long)vLatest.getAnalyzerGuruVersion());
         assertEquals("should have expected analyzer versions",
                 vLatest.getAnalyzersVersions().size(), actAnalyzersVersionNos.size());
-        /*
-         * Smelly but I know the underlying Map implementations are the same;
-         * otherwise the following tests might not work.
-         */
+
+        Object[] expectedVersionKeys = actAnalyzersVersionNos.keySet().stream().sorted().toArray();
         assertArrayEquals("analyzer versions keysets should be equal",
-                actAnalyzersVersionNos.keySet().toArray(),
-                vLatest.getAnalyzersVersions().keySet().toArray());
+                expectedVersionKeys,
+                vLatest.getAnalyzersVersions().keySet().stream().sorted().toArray());
         assertArrayEquals("analyzer versions values should be equal",
-                actAnalyzersVersionNos.values().toArray(),
-                vLatest.getAnalyzersVersions().values().toArray());
+                getMapValues(actAnalyzersVersionNos, expectedVersionKeys),
+                getMapValues(vLatest.getAnalyzersVersions(), expectedVersionKeys));
 
+        Object[] expectedSymlinkKeys = TEST_MAPPED_SYMLINKS.keySet().stream().sorted().toArray();
         assertArrayEquals("index symlinks keysets should be equal",
-                TEST_MAPPED_SYMLINKS.keySet().toArray(),
-                vLatest.getIndexedSymlinks().keySet().toArray());
+                expectedSymlinkKeys,
+                vLatest.getIndexedSymlinks().keySet().stream().sorted().toArray());
         assertArrayEquals("index symlinks values should be equal",
-                TEST_MAPPED_SYMLINKS.values().toArray(),
-                vLatest.getIndexedSymlinks().values().toArray());
+                getMapValues(TEST_MAPPED_SYMLINKS, expectedSymlinkKeys),
+                getMapValues(vLatest.getIndexedSymlinks(), expectedSymlinkKeys));
     }
 
     @Test
@@ -148,4 +148,13 @@ public void shouldThrowIfTooOldVersion() throws ClassNotFoundException {
         }
         assertTrue("should have thrown on too-old version", passed);
     }
+
+    private static <K, V> Object[] getMapValues(Map<K, V> map, Object[] keys) {
+        Object[] values = new Object[keys.length];
+        for (int i = 0; i < keys.length; ++i) {
+            //noinspection SuspiciousMethodCalls
+            values[i] = map.get(keys[i]);
+        }
+        return values;
+    }
 }