Add tests

Author: acoburn

access-grant/src/main/java/com/inrupt/client/accessgrant/AccessRequest.java

@@ -221,6 +221,15 @@ public Instant getIssuedAt() {
             return issuedAt;
         }
 
+        /**
+         * Create a new {@link RequestParameters} builder.
+         *
+         * @return the new builder
+         */
+        public static Builder newBuilder() {
+            return new Builder();
+        }
+
         /**
          * A class for building access request parameters.
          */

access-grant/src/test/java/com/inrupt/client/accessgrant/AccessGrantClientTest.java

@@ -340,6 +340,40 @@ void testIssueRequest() {
         assertEquals(resources, request.getResources());
     }
 
+    @Test
+    void testIssueRequestBuilder() {
+        final Map<String, Object> claims = new HashMap<>();
+        claims.put("webid", WEBID);
+        claims.put("sub", SUB);
+        claims.put("iss", ISS);
+        claims.put("azp", AZP);
+        final String token = generateIdToken(claims);
+        final AccessGrantClient client = agClient.session(OpenIdSession.ofIdToken(token));
+
+        final URI recipient = URI.create("https://id.test/agent");
+        final Instant expiration = Instant.parse("2022-08-27T12:00:00Z");
+        final Set<String> modes = new HashSet<>(Arrays.asList("Read", "Append"));
+        final Set<URI> purposes = Collections.singleton(URI.create("https://purpose.test/Purpose1"));
+
+        final Set<URI> resources = Collections.singleton(URI.create("https://storage.test/data/"));
+        final AccessRequest.RequestParameters params = AccessRequest.RequestParameters.newBuilder()
+            .recipient(recipient)
+            .resources(resources)
+            .modes(modes)
+            .purposes(purposes)
+            .expiration(expiration)
+            .issuedAt(Instant.now()).build();
+        final AccessRequest request = client.requestAccess(params).toCompletableFuture().join();
+
+        assertTrue(request.getTypes().contains("SolidAccessRequest"));
+        assertEquals(Optional.of(recipient), request.getRecipient());
+        assertEquals(modes, request.getModes());
+        assertEquals(expiration, request.getExpiration());
+        assertEquals(baseUri, request.getIssuer());
+        assertEquals(purposes, request.getPurposes());
+        assertEquals(resources, request.getResources());
+    }
+
     @Test
     void testRequestAccessNoAuth() {
         final URI recipient = URI.create("https://id.test/agent");

access-grant/src/test/java/com/inrupt/client/accessgrant/AccessRequestTest.java

@@ -42,6 +42,65 @@ class AccessRequestTest {
 
     private static final JsonService jsonService = ServiceProvider.getJsonService();
 
+    @Test
+    void testBuilderWithNulls() {
+        final URI uri1 = URI.create("https://example.com/resource1");
+        final URI uri2 = URI.create("https://example.com/resource2");
+        final URI uri3 = URI.create("https://example.com/resource3");
+        final URI uri4 = URI.create("https://example.com/resource4");
+        final AccessRequest.RequestParameters params = AccessRequest.RequestParameters.newBuilder()
+            .resource(uri1).resource(uri2)
+            .mode("Read").mode("Append")
+            .purpose(uri3).purpose(uri4)
+            .recipient(null)
+            .modes(null)
+            .resources(null)
+            .purposes(null).build();
+
+        assertTrue(params.getPurposes().isEmpty());
+        assertTrue(params.getResources().isEmpty());
+        assertTrue(params.getModes().isEmpty());
+        assertNull(params.getRecipient());
+        assertNull(params.getExpiration());
+        assertNull(params.getIssuedAt());
+    }
+
+    @Test
+    void testBuilderWithCollections() {
+        final URI uri1 = URI.create("https://example.com/resource1");
+        final URI uri2 = URI.create("https://example.com/resource2");
+        final URI uri3 = URI.create("https://example.com/resource3");
+        final URI uri4 = URI.create("https://example.com/resource4");
+        final AccessRequest.RequestParameters params = AccessRequest.RequestParameters.newBuilder()
+            .resource(uri1)
+            .mode("Read")
+            .purpose(uri3)
+            .recipient(uri2)
+            .modes(Collections.singleton("Append"))
+            .resources(Collections.singleton(uri2))
+            .purposes(Collections.singleton(uri4)).build();
+
+        final Set<URI> expectedPurposes = new HashSet<>();
+        expectedPurposes.add(uri3);
+        expectedPurposes.add(uri4);
+        assertEquals(expectedPurposes, params.getPurposes());
+
+        final Set<URI> expectedResources = new HashSet<>();
+        expectedResources.add(uri1);
+        expectedResources.add(uri2);
+        assertEquals(expectedResources, params.getResources());
+
+        final Set<String> expectedModes = new HashSet<>();
+        expectedModes.add("Read");
+        expectedModes.add("Append");
+        assertEquals(expectedModes, params.getModes());
+
+        assertEquals(uri2, params.getRecipient());
+        assertNull(params.getExpiration());
+        assertNull(params.getIssuedAt());
+    }
+
+
     @Test
     void testReadAccessRequest() throws IOException {
         try (final InputStream resource = AccessRequestTest.class.getResourceAsStream("/access_request1.json")) {