use better assertion

Author: rjernst

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java

@@ -23,8 +23,8 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -55,7 +55,7 @@ public String toString() {
     }
 
     static List<ExclusivePath> buildExclusivePathList(List<ExclusiveFileEntitlement> exclusiveFileEntitlements, PathLookup pathLookup) {
-        Map<String, ExclusivePath> exclusivePaths = new LinkedHashMap<>();
+        Map<String, ExclusivePath> exclusivePaths = new HashMap<>();
         for (ExclusiveFileEntitlement efe : exclusiveFileEntitlements) {
             for (FilesEntitlement.FileData fd : efe.filesEntitlement().filesData()) {
                 if (fd.exclusive()) {

libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java

@@ -39,6 +39,8 @@
 import static org.elasticsearch.entitlement.runtime.policy.PolicyManager.ALL_UNNAMED;
 import static org.elasticsearch.entitlement.runtime.policy.PolicyManager.SERVER_COMPONENT_NAME;
 import static org.hamcrest.Matchers.aMapWithSize;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.sameInstance;
@@ -449,45 +451,41 @@ public void testFilesEntitlementsWithExclusive() {
         var baseTestPath = Path.of("/base").toAbsolutePath();
         var testPath1 = Path.of("/base/test").toAbsolutePath();
         var testPath2 = Path.of("/base/test/foo").toAbsolutePath();
-        var plugins = new LinkedHashMap<String, Policy>();
-        plugins.put(
-            "plugin1",
-            new Policy(
-                "test",
-                List.of(
-                    new Scope(
-                        "test.module1",
+        var iae = expectThrows(
+            IllegalArgumentException.class,
+            () -> new PolicyManager(
+                createEmptyTestServerPolicy(),
+                List.of(),
+                Map.of(
+                    "plugin1",
+                    new Policy(
+                        "test",
                         List.of(
-                            new FilesEntitlement(
-                                List.of(FilesEntitlement.FileData.ofPath(testPath1, FilesEntitlement.Mode.READ).withExclusive(true))
+                            new Scope(
+                                "test.module1",
+                                List.of(
+                                    new FilesEntitlement(
+                                        List.of(FilesEntitlement.FileData.ofPath(testPath1, FilesEntitlement.Mode.READ).withExclusive(true))
+                                    )
+                                )
                             )
                         )
-                    )
-                )
-            )
-        );
-        plugins.put(
-            "plugin2",
-            new Policy(
-                "test",
-                List.of(
-                    new Scope(
-                        "test.module2",
+                    ),
+                    "plugin2",
+                    new Policy(
+                        "test",
                         List.of(
-                            new FilesEntitlement(
-                                List.of(FilesEntitlement.FileData.ofPath(testPath1, FilesEntitlement.Mode.READ).withExclusive(true))
+                            new Scope(
+                                "test.module2",
+                                List.of(
+                                    new FilesEntitlement(
+                                        List.of(FilesEntitlement.FileData.ofPath(testPath1, FilesEntitlement.Mode.READ).withExclusive(true))
+                                    )
+                                )
                             )
                         )
                     )
-                )
-            )
-        );
-        var iae = expectThrows(
-            IllegalArgumentException.class,
-            () -> new PolicyManager(
-                createEmptyTestServerPolicy(),
-                List.of(),
-                plugins,
+                ),
                 c -> "",
                 Map.of("plugin1", Path.of("modules", "plugin1"), "plugin2", Path.of("modules", "plugin2")),
                 TEST_AGENTS_PACKAGE_NAME,
@@ -498,9 +496,11 @@ public void testFilesEntitlementsWithExclusive() {
         );
         assertThat(
             iae.getMessage(),
-            equalTo(
-                "Path [/base/test] is already exclusive to [plugin1][test.module1],"
-                    + " cannot add exclusive access for [plugin2][test.module2]"
+            allOf(
+                containsString("Path [/base/test] is already exclusive"),
+                containsString("[plugin1][test.module1]"),
+                containsString("[plugin2][test.module2]"),
+                containsString("cannot add exclusive access")
             )
         );