Add tests for find and compaction

Author: acoburn

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

@@ -32,6 +32,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
 import org.apache.commons.rdf.api.Dataset;
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
@@ -43,7 +44,7 @@
  */
 public class AccessControlResource extends RDFSource {
 
-    private static final URI SOLID_ACCESS_GRANT = URI.create("http://www.w3.org/ns/solid/vc#SolidAccessGrant");
+    public static final URI SOLID_ACCESS_GRANT = URI.create("http://www.w3.org/ns/solid/vc#SolidAccessGrant");
 
     /**
      *  Create a new Access Control Resource.
@@ -85,28 +86,24 @@ public void compact() {
         final var accessControls = stream(null, null, asIRI(RDF.type), asIRI(ACP.AccessControl))
             .map(Quad::getSubject).toList();
         for (final var accessControl : accessControls) {
-            if (!contains(null, null, null, accessControl)) {
-                for (final var quad : stream(null, accessControl, null, null).toList()) {
-                    remove(quad);
-                }
-            }
+            removeUnusedStatements(accessControl);
         }
 
         final var policies = stream(null, null, asIRI(RDF.type), asIRI(ACP.Policy)).map(Quad::getSubject).toList();
         for (final var policy : policies) {
-            if (!contains(null, null, null, policy)) {
-                for (final var quad : stream(null, policy, null, null).toList()) {
-                    remove(quad);
-                }
-            }
+            removeUnusedStatements(policy);
         }
 
         final var matchers = stream(null, null, asIRI(RDF.type), asIRI(ACP.Matcher)).map(Quad::getSubject).toList();
         for (final var matcher : matchers) {
-            if (!contains(null, null, null, matcher)) {
-                for (final var quad : stream(null, matcher, null, null).toList()) {
-                    remove(quad);
-                }
+            removeUnusedStatements(matcher);
+        }
+    }
+
+    <T extends BlankNodeOrIRI> void removeUnusedStatements(final T resource) {
+        if (!contains(null, null, null, resource)) {
+            for (final var quad : stream(null, resource, null, null).toList()) {
+                remove(quad);
             }
         }
     }

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

@@ -29,6 +29,7 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.Set;
 
 import org.apache.commons.rdf.api.RDF;
 import org.junit.jupiter.api.AfterAll;
@@ -179,6 +180,47 @@ void buildAcr() {
         assertEquals(10, acr.size());
     }
 
+    @Test
+    void testAcrFindPolicies() {
+        final var uri = mockHttpServer.acr2();
+        try (final AccessControlResource acr = client.read(uri, AccessControlResource.class)) {
+            assertEquals(1, acr.find(AccessControlResource.MatcherType.VC,
+                    AccessControlResource.SOLID_ACCESS_GRANT, Set.of(ACL.Read)).size());
+
+            assertEquals(0, acr.find(AccessControlResource.MatcherType.VC,
+                    AccessControlResource.SOLID_ACCESS_GRANT, Set.of(ACL.Read, ACL.Write)).size());
+
+            assertEquals(0, acr.find(AccessControlResource.MatcherType.AGENT,
+                    URI.create("https://bot.example/id"), Set.of(ACL.Read, ACL.Write)).size());
+
+            assertEquals(1, acr.find(AccessControlResource.MatcherType.AGENT,
+                    URI.create("https://bot.example/id"), Set.of(ACL.Read)).size());
+        }
+    }
+
+    @Test
+    void testAcr1RemoveAccessControl() {
+        final var uri = mockHttpServer.acr2();
+        try (final AccessControlResource acr = client.read(uri, AccessControlResource.class)) {
+            assertEquals(2, acr.accessControl().size());
+            assertEquals(3, acr.memberAccessControl().size());
+
+            // Check dataset size
+            assertEquals(29, acr.size());
+
+            acr.accessControl().stream().findFirst().ifPresent(acr.accessControl()::remove);
+
+            // Check dataset size
+            assertEquals(28, acr.size());
+            acr.compact();
+            assertEquals(28, acr.size());
+
+            assertEquals(1, acr.accessControl().size());
+            assertEquals(3, acr.memberAccessControl().size());
+
+        }
+    }
+
     @Test
     void testAcr1RemoveValues() {
         final var uri = mockHttpServer.acr2();