Merge pull request #2 from bbakerman/ci-test

bbakerman · web-flow · commit 52bd96c7e2d3 · 2017-07-04T22:00:07.000+10:00
a push for CI reasons again
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # java-dataloader
 
-[![Build Status](https://travis-ci.org/bbakerman/java-dataloader.svg?branch=master)](https://travis-ci.org/bbakerman/java-dataloader/)&nbsp;&nbsp;
+[![Build Status](https://travis-ci.org/bbakerman/java-dataloader.svg?branch=master)](https://travis-ci.org/bbakerman/java-dataloader.svg?branch=master)&nbsp;&nbsp;
 [![Apache licensed](https://img.shields.io/hexpm/l/plug.svg?maxAge=2592000)](https://github.com/bbakerman/java-dataloader/blob/master/LICENSE)&nbsp;&nbsp;
 [![Download](https://api.bintray.com/packages/bbakerman/java-dataloader/java-dataloader/images/download.svg) ](https://bintray.com/bbakerman/java-dataloader/java-dataloader/_latestVersion)
 
diff --git a/src/test/java/org/dataloader/DataLoaderTest.java b/src/test/java/org/dataloader/DataLoaderTest.java
@@ -844,9 +844,8 @@ public void should_Batch_loads_occurring_within_futures() {
             });
         });
 
-        CompletableFuture<List<String>> composite = identityLoader.dispatch();
+        identityLoader.dispatchAndJoin();
 
-        await().until(composite::isDone);
         assertThat(loadCalls, equalTo(
                 singletonList(asList("a", "b", "c", "d"))));
     }

Original file line number	Diff line number	Diff line change
`@@ -844,9 +844,8 @@ public void should_Batch_loads_occurring_within_futures() {`
`844`	`844`	`});`
`845`	`845`	`});`
`846`	`846`
`847`		`- CompletableFuture<List<String>> composite = identityLoader.dispatch();`
	`847`	`+ identityLoader.dispatchAndJoin();`
`848`	`848`
`849`		`- await().until(composite::isDone);`
`850`	`849`	`assertThat(loadCalls, equalTo(`
`851`	`850`	`singletonList(asList("a", "b", "c", "d"))));`
`852`	`851`	`}`