More test fixes

Author: n1v0lg

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/IndexPrivilege.java

@@ -277,11 +277,11 @@ private IndexPrivilege(Set<String> name, Automaton automaton, IndexComponentSele
      * than one selector. The caller must ensure that the names only map to privileges with the same selector.
      */
     public static IndexPrivilege getSingleSelector(Set<String> name) {
-        var single = getSplitBySelector(name);
-        if (single.size() != 1) {
-            throw new IllegalArgumentException("expected singleton");
+        final Set<IndexPrivilege> splitBySelector = getSplitBySelector(name);
+        if (splitBySelector.size() != 1) {
+            throw new IllegalArgumentException("index privilege patterns " + name + " did not map to a single selector " + splitBySelector);
         }
-        return single.iterator().next();
+        return splitBySelector.iterator().next();
     }
 
     /**
@@ -437,9 +437,10 @@ public IndexComponentSelectorPrivilege getSelectorPrivilege() {
     }
 
     public String getSingleName() {
-        if (name().size() != 1) {
-            throw new IllegalStateException("Expected a single name, but got: " + name());
+        final Set<String> names = name();
+        if (names.size() != 1) {
+            throw new IllegalStateException("expected single name for privilege but got " + names);
         }
-        return name().iterator().next();
+        return names.iterator().next();
     }
 }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/LimitedRoleTests.java

@@ -239,7 +239,6 @@ private static FieldPermissions randomFlsPermissions(String... grantedFields) {
     }
 
     private static IndexPrivilege randomIndexPrivilege() {
-        // TODO handle failure store
         return IndexPrivilege.getSingleSelector(Set.of(randomFrom(IndexPrivilege.names())));
     }
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/SimpleRoleTests.java

@@ -176,8 +176,7 @@ public void testGetRoleDescriptorsIntersectionForRemoteCluster() {
                 Set.of(randomAlphaOfLength(8)),
                 new FieldPermissions(new FieldPermissionsDefinition(new String[] { randomAlphaOfLength(5) }, null)),
                 null,
-                // TODO handle failure store
-                IndexPrivilege.getSingleSelector(Set.of(randomFrom(IndexPrivilege.names()))),
+                IndexPrivilege.getSplitBySelector(Set.of(randomFrom(IndexPrivilege.names()))),
                 randomBoolean(),
                 randomAlphaOfLength(9)
             )