Test merge method

Author: acoburn

acp/src/main/java/com/inrupt/client/acp/AccessControlResource.java

@@ -208,17 +208,19 @@ public void compact() {
     /**
      * Merge two or more policies into a single policies with combined matchers.
      *
+     * @param allow the modes to allow
      * @param policies the policies to merge
      * @return the merged policy
      */
-    public Policy merge(final Policy... policies) {
+    public Policy merge(final Set<URI> allow, final Policy... policies) {
         final var baseUri = getIdentifier().getScheme() + ":" + getIdentifier().getSchemeSpecificPart();
         final var policy = new Policy(asIRI(baseUri + "#" + UUID.randomUUID()), getGraph());
         for (final var p : policies) {
             policy.allOf().addAll(p.allOf());
             policy.anyOf().addAll(p.anyOf());
             policy.noneOf().addAll(p.noneOf());
         }
+        policy.allow().addAll(allow);
         return policy;
     }
 

acp/src/test/java/com/inrupt/client/acp/AccessControlResourceTest.java

@@ -354,4 +354,22 @@ void expandAcr4Async() {
             }
         }).toCompletableFuture().join();
     }
+
+    @Test
+    void testMerge() {
+        final var identifier = "https://data.example/resource";
+        final var agent = URI.create("https://id.example/agent");
+        final var client = URI.create("https://app.example/id");
+
+        final var acr = new AccessControlResource(URI.create(identifier), rdf.createDataset());
+        final var policy = acr.merge(Set.of(ACL.Read, ACL.Write), acr.agentPolicy(agent), acr.clientPolicy(client));
+
+        assertEquals(2, policy.allow().size());
+        assertTrue(policy.allow().contains(ACL.Read));
+        assertTrue(policy.allow().contains(ACL.Write));
+
+        assertEquals(2, policy.allOf().size());
+        assertEquals(0, policy.anyOf().size());
+        assertEquals(0, policy.noneOf().size());
+    }
 }