Fixed tests after merging master

Author: bbakerman

src/test/java/org/dataloader/DataLoaderFactoryTest.java

@@ -14,7 +14,7 @@ class DataLoaderFactoryTest {
     @Test
     void can_create_via_builder() {
         BatchLoaderWithContext<String, String> loader = (keys, environment) -> CompletableFuture.completedFuture(keys);
-        DataLoaderOptions options = DataLoaderOptions.newOptionsBuilder().setBatchingEnabled(true).build();
+        DataLoaderOptions options = DataLoaderOptions.newOptions().setBatchingEnabled(true).build();
 
         DataLoader<String, String> dl = DataLoaderFactory.<String, String>builder()
                 .name("x").batchLoader(loader).options(options).build();

src/test/java/org/dataloader/DataLoaderTest.java

@@ -101,7 +101,7 @@ public void should_Build_a_really_really_simple_data_loader() {
     @Test
     public void should_Build_a_named_data_loader() {
         BatchLoader<Integer, Integer> loadFunction = CompletableFuture::completedFuture;
-        DataLoader<Integer, Integer> dl = newDataLoader("name", loadFunction, DataLoaderOptions.newOptions());
+        DataLoader<Integer, Integer> dl = newDataLoader("name", loadFunction, DataLoaderOptions.newDefaultOptions());
 
         assertNotNull(dl.getName());
         assertThat(dl.getName(), equalTo("name"));

src/test/java/org/dataloader/DelegatingDataLoaderTest.java

@@ -66,7 +66,7 @@ public CompletableFuture<String> load(@NonNull String key, @Nullable Object keyC
 
     @Test
     void can_delegate_simple_properties() {
-        DataLoaderOptions options = DataLoaderOptions.newOptions();
+        DataLoaderOptions options = DataLoaderOptions.newOptions().build();
         BatchLoader<String, String> loadFunction = CompletableFuture::completedFuture;
 
         DataLoader<String, String> rawLoader = DataLoaderFactory.newDataLoader("name", loadFunction, options);

src/test/java/org/dataloader/instrumentation/DataLoaderRegistryInstrumentationTest.java

@@ -120,9 +120,9 @@ void wontDoAnyThingIfThereIsNoRegistryInstrumentation() {
 
     @Test
     void wontDoAnyThingIfThereTheyAreTheSameInstrumentationAlready() {
-        DataLoader<String, String> newX = dlX.transform(builder -> builder.options(dlX.getOptions().setInstrumentation(instrA)));
-        DataLoader<String, String> newY = dlY.transform(builder ->  builder.options(dlY.getOptions().setInstrumentation(instrA)));
-        DataLoader<String, String> newZ = dlZ.transform(builder ->  builder.options(dlZ.getOptions().setInstrumentation(instrA)));
+        DataLoader<String, String> newX = dlX.transform(builder -> builder.options(dlX.getOptions().transform(b-> b.setInstrumentation(instrA))));
+        DataLoader<String, String> newY = dlY.transform(builder ->  builder.options(dlY.getOptions().transform(b-> b.setInstrumentation(instrA))));
+        DataLoader<String, String> newZ = dlZ.transform(builder ->  builder.options(dlZ.getOptions().transform(b-> b.setInstrumentation(instrA))));
         DataLoaderRegistry registry = DataLoaderRegistry.newRegistry()
                 .instrumentation(instrA)
                 .register("X", newX)