@@ -4,51 +4,76 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
 public class CompletableFutureExceptionHandlingTest {
     @Test
-    public void handle() {
+    public void handleWithException() {
         CompletableFuture completableFuture = CompletableFuture
             .supplyAsync(() -> Integer.parseInt("s"))
             .handleAsync((result, e) -> {
                 if (e != null) {
                     System.out.println(e.getMessage());
                     return "Error!";
                 } else {
-                    return result;
+                    return result + 1;
                 }
             })
             .thenAcceptAsync(System.out::println);
+    }
 
-        assertThat(completableFuture.join())
-            .isNull();
+    @Test
+    public void handleWithoutExceptions() {
+        CompletableFuture completableFuture = CompletableFuture
+            .supplyAsync(() -> 1)
+            .handleAsync((result, e) -> {
+                if (e != null) {
+                    System.out.println(e.getMessage());
+                    return "Error!";
+                } else {
+                    return result + 1;
+                }
+            })
+            .thenAcceptAsync(System.out::println);
     }
 
     @Test
-    public void exceptionally() {
+    public void exceptionallyWithException() {
         CompletableFuture completableFuture = CompletableFuture
             .supplyAsync(() -> Integer.parseInt("s"))
             .exceptionallyAsync((e) -> {
                 System.out.println(e.getMessage());
-                return null;
+                return 0;
             })
             .thenAcceptAsync(System.out::println);
+    }
 
-        assertThat(completableFuture.join())
-            .isNull();
+    @Test
+    public void exceptionallyWithoutExceptions() {
+        CompletableFuture completableFuture = CompletableFuture
+            .supplyAsync(() -> 1)
+            .exceptionallyAsync((e) -> {
+                System.out.println(e.getMessage());
+                return 0;
+            })
+            .thenAcceptAsync(System.out::println);
     }
 
     @Test
-    public void whenComplete() {
+    public void whenCompleteWithException() {
         CompletableFuture completableFuture = CompletableFuture
             .supplyAsync(() -> Integer.parseInt("s"))
             .whenCompleteAsync((result, e) -> {
                 if (e != null) System.out.println(e.getMessage());
             })
             .thenAcceptAsync(System.out::println);
+    }
 
-        assertThat(completableFuture.join())
-            .isNull();
+    @Test
+    public void whenCompleteWithoutExceptions() {
+        CompletableFuture completableFuture = CompletableFuture
+            .supplyAsync(() -> 1)
+            .whenCompleteAsync((result, e) -> {
+                if (e != null) System.out.println(e.getMessage());
+            })
+            .thenAcceptAsync(System.out::println);
     }
 }