Cleanup state after future has completed - adjust tests for Java 8

Author: martinfkaeser

ocpp-common/src/test/java/eu/chargetime/ocpp/test/ClientTest.java

@@ -41,7 +41,6 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static org.hamcrest.CoreMatchers.*;
@@ -222,11 +221,11 @@ public void send_aMessage_promiseCompletesWithTimeout() throws Exception {
     // When
     CompletableFuture<Confirmation> returnedFuture = client.send(request);
     // If the client uses at least Java 9, it could use CompletableFuture::orTimeout(..) ..
-    returnedFuture.orTimeout(50, TimeUnit.MILLISECONDS);
+//    returnedFuture.orTimeout(50, TimeUnit.MILLISECONDS);
     assertThat(returnedFuture.isDone(), is(false));
     Thread.sleep(100);
     // .. alternatively, it can be implemented manually
-//    returnedFuture.completeExceptionally(new TimeoutException());
+    returnedFuture.completeExceptionally(new TimeoutException());
 
     // Then
     assertThat(returnedFuture, is(internalFuture));

ocpp-common/src/test/java/eu/chargetime/ocpp/test/ServerTest.java

@@ -16,7 +16,6 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -211,11 +210,11 @@ public void send_aMessage_promiseCompletesWithTimeout() throws Exception {
     // When
     CompletableFuture<Confirmation> returnedFuture = server.send(sessionIndex, request);
     // If the client uses at least Java 9, it could use CompletableFuture::orTimeout(..).
-    returnedFuture.orTimeout(50, TimeUnit.MILLISECONDS);
+//    returnedFuture.orTimeout(50, TimeUnit.MILLISECONDS);
     assertThat(returnedFuture.isDone(), is(false));
     Thread.sleep(100);
     // .. alternatively, it can be implemented manually
-//    returnedFuture.completeExceptionally(new TimeoutException());
+    returnedFuture.completeExceptionally(new TimeoutException());
 
     // Then
     assertThat(returnedFuture, is(internalFuture));