Make AbstractTaskTest a test instead of util

Author: misolt

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/task/AbstractTask.java

@@ -28,6 +28,7 @@
 import com.google.edwmigration.dumper.application.dumper.io.OutputHandle.WriteMode;
 import com.google.errorprone.annotations.ForOverride;
 import java.beans.PropertyDescriptor;
+import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -186,6 +187,28 @@ public OutputStream openStream() {
     }
   }
 
+  public static final class MemoryByteSink extends ByteSink {
+
+    private final ByteArrayOutputStream out;
+
+    public MemoryByteSink() {
+      this(new ByteArrayOutputStream());
+    }
+
+    private MemoryByteSink(ByteArrayOutputStream out) {
+      this.out = out;
+    }
+
+    @Override
+    public OutputStream openStream() {
+      return out;
+    }
+
+    public String getContent() {
+      return out.toString();
+    }
+  }
+
   @AutoValue
   @ParametersAreNonnullByDefault
   public abstract static class TaskOptions {

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

@@ -40,7 +40,7 @@
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
-import com.google.edwmigration.dumper.application.dumper.task.AbstractTaskTest.MemoryByteSink;
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import com.google.edwmigration.dumper.application.dumper.task.TaskRunContext;
 import java.io.IOException;
 import java.net.URISyntaxException;

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/ranger/AbstractRangerTaskTest.java

@@ -22,15 +22,15 @@
 
 import com.google.edwmigration.dumper.application.dumper.connector.ranger.RangerClient.ConnectionWrapper;
 import com.google.edwmigration.dumper.application.dumper.connector.ranger.RangerConnector.RangerClientHandle;
-import com.google.edwmigration.dumper.application.dumper.task.AbstractTaskTest;
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import java.io.IOException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
 @RunWith(JUnit4.class)
-public abstract class AbstractRangerTaskTest extends AbstractTaskTest {
+public abstract class AbstractRangerTaskTest {
 
   @Mock protected ConnectionWrapper httpClient = mock(ConnectionWrapper.class);
 

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/redshift/RedshiftClusterNodesTaskTest.java

@@ -26,7 +26,7 @@
 import com.amazonaws.services.redshift.model.Endpoint;
 import com.google.common.collect.ImmutableList;
 import com.google.edwmigration.dumper.application.dumper.handle.RedshiftHandle;
-import com.google.edwmigration.dumper.application.dumper.task.AbstractTaskTest;
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import java.util.Optional;
 import org.junit.Rule;
 import org.junit.Test;
@@ -37,7 +37,7 @@
 import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
-public class RedshiftClusterNodesTaskTest extends AbstractTaskTest {
+public class RedshiftClusterNodesTaskTest {
 
   @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
 

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/redshift/RedshiftClusterUsageMetricsTaskTest.java

@@ -34,7 +34,7 @@
 import com.google.edwmigration.dumper.application.dumper.connector.redshift.RedshiftClusterUsageMetricsTask.MetricName;
 import com.google.edwmigration.dumper.application.dumper.connector.redshift.RedshiftClusterUsageMetricsTask.MetricType;
 import com.google.edwmigration.dumper.application.dumper.handle.RedshiftHandle;
-import com.google.edwmigration.dumper.application.dumper.task.AbstractTaskTest;
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import com.google.edwmigration.dumper.plugin.lib.dumper.spi.RedshiftRawLogsDumpFormat;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -49,7 +49,7 @@
 import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
-public class RedshiftClusterUsageMetricsTaskTest extends AbstractTaskTest {
+public class RedshiftClusterUsageMetricsTaskTest {
 
   @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
 

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

@@ -16,28 +16,9 @@
  */
 package com.google.edwmigration.dumper.application.dumper.task;
 
-import com.google.common.io.ByteSink;
-import com.google.edwmigration.dumper.application.dumper.handle.Handle;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /** @author shevek */
-public abstract class AbstractTaskTest {
-
-  static final Handle HANDLE = () -> {};
-
-  public static class MemoryByteSink extends ByteSink {
-
-    private final ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-    @Override
-    public OutputStream openStream() throws IOException {
-      return out;
-    }
-
-    public String getContent() {
-      return out.toString();
-    }
-  }
-}
+@RunWith(JUnit4.class)
+public abstract class AbstractTaskTest {}

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

@@ -20,22 +20,23 @@
 import static org.mockito.Mockito.mock;
 
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** @author shevek */
 @RunWith(JUnit4.class)
-public class DumpMetadataTaskTest extends AbstractTaskTest {
+public class DumpMetadataTaskTest {
 
   final TaskRunContext mockContext = mock(TaskRunContext.class);
 
   @Test
   public void testTask() throws Exception {
     MemoryByteSink sink = new MemoryByteSink();
     ConnectorArguments arguments = new ConnectorArguments("--connector", "bigquery-logs");
-    new DumpMetadataTask(arguments, "test-format").doRun(mockContext, sink, HANDLE);
+    new DumpMetadataTask(arguments, "test-format").doRun(mockContext, sink, () -> {});
   }
 
   @Test

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

@@ -19,20 +19,21 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** @author shevek */
 @RunWith(JUnit4.class)
-public class FormatTaskTest extends AbstractTaskTest {
+public class FormatTaskTest {
 
   final TaskRunContext mockContext = mock(TaskRunContext.class);
 
   @Test
   public void testTask() throws Exception {
     MemoryByteSink sink = new MemoryByteSink();
-    new FormatTask("test-format").doRun(mockContext, sink, HANDLE);
+    new FormatTask("test-format").doRun(mockContext, sink, () -> {});
   }
 
   @Test

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

@@ -22,6 +22,7 @@
 
 import com.google.edwmigration.dumper.application.dumper.handle.JdbcHandle;
 import com.google.edwmigration.dumper.application.dumper.io.OutputHandle.WriteMode;
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.TaskOptions;
 import com.google.edwmigration.dumper.application.dumper.test.DumperTestUtils;
 import java.io.File;
@@ -38,7 +39,7 @@
 
 /** @author matt */
 @RunWith(JUnit4.class)
-public class JdbcSelectTaskTest extends AbstractTaskTest {
+public class JdbcSelectTaskTest {
 
   private static final Logger logger = LoggerFactory.getLogger(JdbcSelectTaskTest.class);
 

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

@@ -19,19 +19,20 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
+import com.google.edwmigration.dumper.application.dumper.task.AbstractTask.MemoryByteSink;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** @author shevek */
 @RunWith(JUnit4.class)
-public class VersionTaskTest extends AbstractTaskTest {
+public class VersionTaskTest {
 
   @Test
   public void testTask() throws Exception {
     MemoryByteSink sink = new MemoryByteSink();
     TaskRunContext mockContext = mock(TaskRunContext.class);
-    new VersionTask().doRun(mockContext, sink, HANDLE);
+    new VersionTask().doRun(mockContext, sink, () -> {});
   }
 
   @Test