Minor test cleanup

Author: ajs6f

impl/src/test/java/edu/si/trellis/CassandraBinaryServiceIT.java

@@ -34,25 +34,25 @@ class CassandraBinaryServiceIT extends CassandraServiceIT {
     private static final Logger log = getLogger(CassandraBinaryServiceIT.class);
 
     @Test
-    void setAndGetSmallContent() throws Exception {
+    void setAndGetSmallContent() throws IOException {
         IRI id = createIRI();
         log.debug("Using identifier: {} for testSetAndGetSmallContent", id);
         String content = "This is only a short test, but it has meaning";
         try (InputStream testInput = IOUtils.toInputStream(content, UTF_8)) {
-            connection.binaryService.setContent(builder(id).build(), testInput).get();
+            connection.binaryService.setContent(builder(id).build(), testInput).join();
         }
 
-        try (InputStream got = connection.binaryService.get(id).get().getContent()) {
+        try (InputStream got = connection.binaryService.get(id).join().getContent()) {
             String reply = IOUtils.toString(got, UTF_8);
             assertEquals(content, reply);
         }
 
-        try (InputStream got = connection.binaryService.get(id).get().getContent(5, 11)) {
+        try (InputStream got = connection.binaryService.get(id).join().getContent(5, 11)) {
             String reply = IOUtils.toString(got, UTF_8);
             assertEquals(content.subSequence(5, 12), reply);
         }
 
-        connection.binaryService.purgeContent(id).get();
+        connection.binaryService.purgeContent(id).join();
 
         try {
             connection.binaryService.get(id).get();
@@ -65,15 +65,15 @@ void setAndGetSmallContent() throws Exception {
     }
 
     @Test
-    void setAndGetMultiChunkContent() throws Exception {
+    void setAndGetMultiChunkContent() throws IOException {
         IRI id = createIRI();
         final String md5sum = "89c4b71c69f59cde963ce8aa9dbe1617";
         try (FileInputStream testData = new FileInputStream("src/test/resources/test.jpg")) {
-            connection.binaryService.setContent(builder(id).build(), testData).get();
+            connection.binaryService.setContent(builder(id).build(), testData).join();
         }
 
         CompletableFuture<Binary> got = connection.binaryService.get(id);
-        Binary binary = got.get();
+        Binary binary = got.join();
         assertTrue(got.isDone());
 
         try (InputStream testData = new FileInputStream("src/test/resources/test.jpg");

impl/src/test/java/edu/si/trellis/CassandraMementoServiceIT.java

@@ -5,8 +5,6 @@
 
 import java.time.Instant;
 import java.util.SortedSet;
-import java.util.concurrent.ExecutionException;
-
 import org.apache.commons.rdf.api.Dataset;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.Quad;
@@ -16,7 +14,7 @@
 class CassandraMementoServiceIT extends CassandraServiceIT {
 
     @Test
-    void mementos() throws InterruptedException, ExecutionException {
+    void mementos() {
         IRI id = createIRI("http://example.com/id/foo2");
         IRI ixnModel = createIRI("http://example.com/ixnModel2");
         @SuppressWarnings("resource")
@@ -26,18 +24,18 @@ void mementos() throws InterruptedException, ExecutionException {
 
         // build resource
         Metadata meta = builder(id).interactionModel(ixnModel).build();
-        connection.resourceService.create(meta, quads).toCompletableFuture().get();
-        connection.mementoService.put(connection.resourceService, id).toCompletableFuture().get();
+        connection.resourceService.create(meta, quads).toCompletableFuture().join();
+        connection.mementoService.put(connection.resourceService, id).toCompletableFuture().join();
 
-        SortedSet<Instant> mementos = connection.mementoService.mementos(id).toCompletableFuture().get();
+        SortedSet<Instant> mementos = connection.mementoService.mementos(id).toCompletableFuture().join();
         assertEquals(1, mementos.size());
         waitTwoSeconds();
 
         // again
-        connection.resourceService.replace(meta, quads).toCompletableFuture().get();
-        connection.mementoService.put(connection.resourceService, id).toCompletableFuture().get();
+        connection.resourceService.replace(meta, quads).toCompletableFuture().join();
+        connection.mementoService.put(connection.resourceService, id).toCompletableFuture().join();
 
-        mementos = connection.mementoService.mementos(id).toCompletableFuture().get();
+        mementos = connection.mementoService.mementos(id).toCompletableFuture().join();
         assertEquals(2, mementos.size());
     }
 }

impl/src/test/java/edu/si/trellis/CassandraResourceServiceIT.java

@@ -5,8 +5,6 @@
 import static org.trellisldp.api.Metadata.builder;
 
 import java.time.Instant;
-import java.util.concurrent.ExecutionException;
-
 import org.apache.commons.rdf.api.Dataset;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.Quad;
@@ -19,7 +17,7 @@
 class CassandraResourceServiceIT extends CassandraServiceIT implements ResourceServiceTests {
 
     @Test
-    void basicActions() throws InterruptedException, ExecutionException {
+    void basicActions() {
         IRI id = createIRI("http://example.com/id/foo");
         IRI container = createIRI("http://example.com/id");
         IRI ixnModel = createIRI("http://example.com/ixnModel");
@@ -30,13 +28,13 @@ void basicActions() throws InterruptedException, ExecutionException {
 
         // build container
         Metadata meta = builder(container).interactionModel(ixnModel).container(null).build();
-        connection.resourceService.create(meta, null).toCompletableFuture().get();
+        connection.resourceService.create(meta, null).toCompletableFuture().join();
 
         // build resource
         meta = builder(id).interactionModel(ixnModel).container(container).build();
-        connection.resourceService.create(meta, quads).toCompletableFuture().get();
+        connection.resourceService.create(meta, quads).toCompletableFuture().join();
 
-        Resource resource = connection.resourceService.get(id).toCompletableFuture().get();
+        Resource resource = connection.resourceService.get(id).toCompletableFuture().join();
         assertEquals(id, resource.getIdentifier());
         assertEquals(ixnModel, resource.getInteractionModel());
         assertEquals(container,
@@ -46,10 +44,10 @@ void basicActions() throws InterruptedException, ExecutionException {
         assertEquals(quad, firstQuad);
 
         // touch container
-        Instant modified = connection.resourceService.get(container).toCompletableFuture().get().getModified();
+        Instant modified = connection.resourceService.get(container).toCompletableFuture().join().getModified();
         waitTwoSeconds();
-        connection.resourceService.touch(container).toCompletableFuture().get();
-        Instant newModified = connection.resourceService.get(container).toCompletableFuture().get().getModified();
+        connection.resourceService.touch(container).toCompletableFuture().join();
+        Instant newModified = connection.resourceService.get(container).toCompletableFuture().join().getModified();
         assertTrue(modified.compareTo(newModified) < 0);
     }