Move getContent to Oozie test

Author: misolt

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/hadoop/oozie/OozieWorkflowJobsTaskTest.java

@@ -39,6 +39,7 @@
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
+import com.google.common.io.ByteSink;
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
 import com.google.edwmigration.dumper.application.dumper.task.MemoryByteSink;
 import com.google.edwmigration.dumper.application.dumper.task.TaskRunContext;
@@ -53,6 +54,9 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Date;
+
+import javax.annotation.Nonnull;
+
 import org.apache.oozie.client.AuthOozieClient;
 import org.apache.oozie.client.WorkflowJob;
 import org.apache.oozie.client.XOozieClient;
@@ -128,7 +132,7 @@ public void doRun_requestBatchesUntilFullDateRangeFetched_ok() throws Exception
     task.doRun(context, sink, new OozieHandle(oozieClient));
 
     // Assert
-    String actual = sink.getContent();
+    String actual = getContent(sink);
     String expected = readFileAsString("/oozie/expected-jobs-all-in-range-byenddate.csv");
     assertEquals(expected, actual);
   }
@@ -188,7 +192,7 @@ public void doRun_requestBatchesFilterOnClient_ok() throws Exception {
     task.doRun(context, sink, new OozieHandle(oozieClient));
 
     // Assert
-    String actual = sink.getContent();
+    String actual = getContent(sink);
     String expected =
         readFileAsString("/oozie/expected-jobs-filtered-by-range-sorted-byenddate.csv");
     assertEquals(expected, actual);
@@ -237,7 +241,7 @@ public void doRun_requestBatchesFilterOnClient_nullDate_success() throws Excepti
     task.doRun(context, sink, new OozieHandle(oozieClient));
 
     // Assert
-    String actual = sink.getContent();
+    String actual = getContent(sink);
     String expected = readFileAsString("/oozie/expected-jobs-one-job-from-template.csv");
     assertEquals(expected, actual);
   }
@@ -329,7 +333,7 @@ private void testWithBatchSize(int batchSize) throws Exception {
     task.doRun(context, sink, new OozieHandle(oozieClient));
 
     // Assert
-    String actual = sink.getContent();
+    String actual = getContent(sink);
     String expected = readFileAsString("/oozie/expected-jobs.csv");
     assertEquals(expected, actual);
   }
@@ -440,6 +444,10 @@ private String readFileAsString(String fileName) throws IOException, URISyntaxEx
     return new String(Files.readAllBytes(Paths.get(this.getClass().getResource(fileName).toURI())));
   }
 
+  private static String getContent(@Nonnull ByteSink sink) throws IOException {
+    return sink.openStream().toString();
+  }
+
   private static String toISO(ZonedDateTime dateTime) {
     return ISO8601_UTC_FORMAT.format(dateTime.toInstant());
   }

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/task/MemoryByteSink.java

@@ -28,8 +28,4 @@ public final class MemoryByteSink extends ByteSink {
   public OutputStream openStream() {
     return out;
   }
-
-  public String getContent() {
-    return out.toString();
-  }
 }