Added more tests

Author: aschrijver

src/test/java/io/engagingspaces/vertx/dataloader/DataLoaderTest.java

@@ -18,6 +18,7 @@
 
 import io.vertx.core.CompositeFuture;
 import io.vertx.core.Future;
+import io.vertx.core.json.JsonObject;
 import io.vertx.ext.unit.junit.RunTestOnContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import org.junit.Before;
@@ -54,7 +55,7 @@ public class DataLoaderTest {
 
     @Before
     public void setUp() {
-        identityLoader = idLoader(new DataLoaderOptions<>(), new ArrayList<>());
+        identityLoader = idLoader(new DataLoaderOptions(), new ArrayList<>());
     }
 
     @Test
@@ -108,7 +109,7 @@ public void should_Resolve_to_empty_list_when_no_keys_supplied() {
     @Test
     public void should_Batch_multiple_requests() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         Future<Integer> future1 = identityLoader.load(1);
         Future<Integer> future2 = identityLoader.load(2);
@@ -123,7 +124,7 @@ public void should_Batch_multiple_requests() {
     @Test
     public void should_Coalesce_identical_requests() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         Future<Integer> future1a = identityLoader.load(1);
         Future<Integer> future1b = identityLoader.load(1);
@@ -139,7 +140,7 @@ public void should_Coalesce_identical_requests() {
     @Test
     public void should_Cache_repeated_requests() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         Future<String> future1 = identityLoader.load("A");
         Future<String> future2 = identityLoader.load("B");
@@ -174,7 +175,7 @@ public void should_Cache_repeated_requests() {
     @Test
     public void should_Clear_single_value_in_loader() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         Future<String> future1 = identityLoader.load("A");
         Future<String> future2 = identityLoader.load("B");
@@ -200,7 +201,7 @@ public void should_Clear_single_value_in_loader() {
     @Test
     public void should_Clear_all_values_in_loader() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         Future<String> future1 = identityLoader.load("A");
         Future<String> future2 = identityLoader.load("B");
@@ -226,7 +227,7 @@ public void should_Clear_all_values_in_loader() {
     @Test
     public void should_Allow_priming_the_cache() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         identityLoader.prime("A", "A");
 
@@ -243,7 +244,7 @@ public void should_Allow_priming_the_cache() {
     @Test
     public void should_Not_prime_keys_that_already_exist() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         identityLoader.prime("A", "X");
 
@@ -271,7 +272,7 @@ public void should_Not_prime_keys_that_already_exist() {
     @Test
     public void should_Allow_to_forcefully_prime_the_cache() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         identityLoader.prime("A", "X");
 
@@ -299,7 +300,7 @@ public void should_Allow_to_forcefully_prime_the_cache() {
     @Test
     public void should_Resolve_to_error_to_indicate_failure() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> evenLoader = idLoaderWithErrors(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> evenLoader = idLoaderWithErrors(new DataLoaderOptions(), loadCalls);
 
         Future<Integer> future1 = evenLoader.load(1);
         evenLoader.dispatch();
@@ -319,7 +320,7 @@ public void should_Resolve_to_error_to_indicate_failure() {
     @Test
     public void should_Represent_failures_and_successes_simultaneously() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> evenLoader = idLoaderWithErrors(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> evenLoader = idLoaderWithErrors(new DataLoaderOptions(), loadCalls);
 
         Future<Integer> future1 = evenLoader.load(1);
         Future<Integer> future2 = evenLoader.load(2);
@@ -337,7 +338,7 @@ public void should_Represent_failures_and_successes_simultaneously() {
     @Test
     public void should_Cache_failed_fetches() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> errorLoader = idLoaderAllErrors(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> errorLoader = idLoaderAllErrors(new DataLoaderOptions(), loadCalls);
 
         Future<Integer> future1 = errorLoader.load(1);
         errorLoader.dispatch();
@@ -358,7 +359,7 @@ public void should_Cache_failed_fetches() {
     @Test
     public void should_Handle_priming_the_cache_with_an_error() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         identityLoader.prime(1, new IllegalStateException("Error"));
 
@@ -374,7 +375,7 @@ public void should_Handle_priming_the_cache_with_an_error() {
     @Test
     public void should_Clear_values_from_cache_after_errors() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> errorLoader = idLoaderAllErrors(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> errorLoader = idLoaderAllErrors(new DataLoaderOptions(), loadCalls);
 
         Future<Integer> future1 = errorLoader.load(1);
         future1.setHandler(rh -> {
@@ -407,7 +408,7 @@ public void should_Clear_values_from_cache_after_errors() {
     @Test
     public void should_Propagate_error_to_all_loads() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Integer, Integer> errorLoader = idLoaderAllErrors(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Integer, Integer> errorLoader = idLoaderAllErrors(new DataLoaderOptions(), loadCalls);
 
         Future<Integer> future1 = errorLoader.load(1);
         Future<Integer> future2 = errorLoader.load(2);
@@ -430,7 +431,7 @@ public void should_Propagate_error_to_all_loads() {
     @Test
     public void should_Accept_objects_as_keys() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoader<Object, Object> identityLoader = idLoader(new DataLoaderOptions<>(), loadCalls);
+        DataLoader<Object, Object> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
         Object keyA = new Object();
         Object keyB = new Object();
@@ -475,8 +476,8 @@ public void should_Accept_objects_as_keys() {
     @Test
     public void should_Disable_caching() {
         ArrayList<Collection> loadCalls = new ArrayList<>();
-        DataLoaderOptions<String, String> options = new DataLoaderOptions<>();
-        DataLoader<String, String> identityLoader = idLoader(options.setCachingEnabled(false), loadCalls);
+        DataLoader<String, String> identityLoader =
+                idLoader(DataLoaderOptions.create().setCachingEnabled(false), loadCalls);
 
         Future<String> future1 = identityLoader.load("A");
         Future<String> future2 = identityLoader.load("B");
@@ -513,11 +514,32 @@ public void should_Disable_caching() {
 
     @Test
     public void should_Accept_objects_with_a_complex_key() {
+        ArrayList<Collection> loadCalls = new ArrayList<>();
+        DataLoaderOptions options = DataLoaderOptions.create().setCacheKeyFunction(getJsonObjectCacheMapFn());
+        DataLoader<JsonObject, Integer> identityLoader = idLoader(options, loadCalls);
+
+        JsonObject key1 = new JsonObject().put("id", 123);
+        JsonObject key2 = new JsonObject().put("id", 123);
+
+        Future<Integer> future1 = identityLoader.load(key1);
+        Future<Integer> future2 = identityLoader.load(key2);
+        identityLoader.dispatch();
+
+        await().until(() -> future1.isComplete() && future2.isComplete());
+        assertThat(loadCalls, equalTo(Collections.singletonList(Collections.singletonList(key1))));
+        assertThat(future1.result(), equalTo(key1));
+        assertThat(future2.result(), equalTo(key1));
+    }
 
+    private static CacheKey<JsonObject> getJsonObjectCacheMapFn() {
+        return key -> key.stream()
+                .sorted()
+                .map(entry -> entry.getKey() + ":" + entry.getValue())
+                .collect(Collectors.joining());
     }
 
     @SuppressWarnings("unchecked")
-    private static <K, V> DataLoader<K, V> idLoader(DataLoaderOptions<K, V> options, List<Collection> loadCalls) {
+    private static <K, V> DataLoader<K, V> idLoader(DataLoaderOptions options, List<Collection> loadCalls) {
         return new DataLoader<>(keys -> {
             loadCalls.add(new ArrayList(keys));
             List<Future> futures = keys.stream().map(Future::succeededFuture).collect(Collectors.toList());
@@ -527,7 +549,7 @@ private static <K, V> DataLoader<K, V> idLoader(DataLoaderOptions<K, V> options,
 
     @SuppressWarnings("unchecked")
     private static <K, V> DataLoader<K, V> idLoaderAllErrors(
-            DataLoaderOptions<K, V> options, List<Collection> loadCalls) {
+            DataLoaderOptions options, List<Collection> loadCalls) {
         return new DataLoader<>(keys -> {
             loadCalls.add(new ArrayList(keys));
             List<Future> futures = keys.stream()
@@ -539,7 +561,7 @@ private static <K, V> DataLoader<K, V> idLoaderAllErrors(
 
     @SuppressWarnings("unchecked")
     private static DataLoader<Integer, Integer> idLoaderWithErrors(
-            DataLoaderOptions<Integer, Integer> options, List<Collection> loadCalls) {
+            DataLoaderOptions options, List<Collection> loadCalls) {
         return new DataLoader<>(keys -> {
             loadCalls.add(new ArrayList(keys));
             List<Future> futures = keys.stream()