lombokify, fix injection for tests

Author: eschultink

java/src/test/java/com/google/appengine/tools/mapreduce/EndToEndTestCase.java

@@ -14,12 +14,15 @@
 import com.google.appengine.tools.development.testing.LocalModulesServiceTestConfig;
 import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
 import com.google.appengine.tools.development.testing.LocalTaskQueueTestConfig;
+import com.google.appengine.tools.mapreduce.di.DaggerDefaultMapReduceContainer;
 import com.google.appengine.tools.mapreduce.impl.shardedjob.ShardedJobHandler;
 import com.google.appengine.tools.mapreduce.impl.shardedjob.ShardedJobService;
 import com.google.appengine.tools.mapreduce.impl.shardedjob.ShardedJobServiceFactory;
+import com.google.appengine.tools.mapreduce.impl.util.RequestUtils;
 import com.google.appengine.tools.pipeline.PipelineService;
 import com.google.appengine.tools.pipeline.impl.servlets.PipelineServlet;
 import com.google.appengine.tools.pipeline.impl.servlets.TaskHandler;
+import com.google.appengine.tools.pipeline.impl.util.DIUtil;
 import com.google.cloud.datastore.Datastore;
 import com.google.common.base.CharMatcher;
 
@@ -88,6 +91,12 @@ public void setUp() throws Exception {
     // Creating files is not allowed in some test execution environments, so don't.
     storageTestHelper = new CloudStorageIntegrationTestHelper();
     storageTestHelper.setUp();
+
+    // still using default module, which builds pipeline options with defualts, which is not good
+
+    //TODO: fix this with RequestUtils that returns the datastore instance
+    DIUtil.overrideComponentInstanceForTests(DaggerDefaultMapReduceContainer.class, DaggerDefaultMapReduceContainer.create());
+    DIUtil.inject(mrServlet);
   }
 
   @AfterEach
@@ -145,6 +154,9 @@ protected void executeTask(String queueName, QueueStateInfo.TaskStateInfo taskSt
     expect(request.getParameterNames()).andReturn(Collections.enumeration(parameters.keySet()))
         .anyTimes();
 
+    expect(request.getParameter(RequestUtils.PARAM_NAMESPACE))
+      .andReturn(null).anyTimes();
+
     replay(request, response);
 
     if (taskStateInfo.getMethod().equals("POST")) {

java/src/test/java/com/google/appengine/tools/mapreduce/impl/GoogleCloudStorageMapOutputTest.java

@@ -6,7 +6,7 @@
 
 import com.google.appengine.tools.mapreduce.inputs.GoogleCloudStorageLineInput;
 import com.google.appengine.tools.mapreduce.outputs.GoogleCloudStorageFileOutput;
-import junit.framework.TestCase;
+import lombok.AllArgsConstructor;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -99,21 +99,12 @@ private List<KeyValue<Long, String>> createRandomValues(int maxValues, int maxVa
     return values;
   }
 
+  @AllArgsConstructor(staticName = "of")
   private static class SliceData {
 
     private final int slices;
     private final int maxValuesPerSlice;
     private final int maxValueSize;
-
-    private SliceData(int slices, int maxValuesPerSlice, int maxValueSize) {
-      this.slices = slices;
-      this.maxValuesPerSlice = maxValuesPerSlice;
-      this.maxValueSize = maxValueSize;
-    }
-
-    public static SliceData of(int slices, int maxValuesPerSlice, int maxValueSize) {
-      return new SliceData(slices, maxValuesPerSlice, maxValueSize);
-    }
   }
 
   private void writeAndVerifyContent(SliceData... sliceData) throws IOException  {

java/src/test/java/com/google/appengine/tools/mapreduce/impl/shardedjob/EndToEndTest.java

@@ -9,6 +9,8 @@
 
 
 import com.google.appengine.tools.mapreduce.EndToEndTestCase;
+import com.google.appengine.tools.mapreduce.di.DaggerDefaultMapReduceContainer;
+import com.google.appengine.tools.pipeline.impl.util.DIUtil;
 import com.google.cloud.datastore.*;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;

java/src/test/java/com/google/appengine/tools/mapreduce/impl/shardedjob/ShardedJobStorageTest.java

@@ -9,7 +9,6 @@
 import com.google.cloud.datastore.*;
 import org.junit.jupiter.api.Test;
 import java.util.Iterator;
-import java.util.Map;
 
 /**
  * Tests the format in which ShardedJobs are written to the datastore.