Repository: apex-malhar Updated Branches: refs/heads/master cb1ef764c -> 7f1abca75
http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java index 91cb2f2..6a21c16 100644 --- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java @@ -39,13 +39,15 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.helper.TestPortContext; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.FieldInfo; import com.datatorrent.lib.util.TestUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link AbstractJdbcTransactionableOutputOperator} and * {@link AbstractJdbcInputOperator} @@ -208,8 +210,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestOutputOperator outputOperator = new TestOutputOperator(); outputOperator.setBatchSize(3); @@ -242,8 +243,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestPOJOOutputOperator outputOperator = new TestPOJOOutputOperator(); outputOperator.setBatchSize(3); @@ -292,8 +292,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestPOJOOutputOperator outputOperator = new TestPOJOOutputOperator(); outputOperator.setBatchSize(3); @@ -347,8 +346,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestPOJOOutputOperator outputOperator = new TestPOJOOutputOperator(); outputOperator.setBatchSize(3); @@ -440,8 +438,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestPOJOOutputOperator outputOperator = new TestPOJOOutputOperator(); outputOperator.setBatchSize(3); @@ -488,8 +485,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestPOJOOutputOperator outputOperator = new TestPOJOOutputOperator(); outputOperator.setBatchSize(3); @@ -524,8 +520,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestPOJOOutputOperator.TestPOJONonInsertOutputOperator updateOperator = new TestPOJOOutputOperator.TestPOJONonInsertOutputOperator(); updateOperator.setBatchSize(3); @@ -579,8 +574,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); TestInputOperator inputOperator = new TestInputOperator(); inputOperator.setStore(store); @@ -606,8 +600,7 @@ public class JdbcPojoOperatorTest extends JdbcOperatorTest Attribute.AttributeMap.DefaultAttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); insertEvents(10, true, 0); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java index d90f2c1..bde22f5 100644 --- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java @@ -44,14 +44,15 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.api.Partitioner; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.helper.TestPortContext; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.FieldInfo; import com.datatorrent.lib.util.KeyValPair; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.times; @@ -119,8 +120,7 @@ public class JdbcPojoPollableOpeartorTest extends JdbcOperatorTest partitionAttributeMap.put(DAG.APPLICATION_ID, APP_ID); partitionAttributeMap.put(Context.DAGContext.APPLICATION_PATH, dir); - OperatorContextTestHelper.TestIdOperatorContext partitioningContext = new OperatorContextTestHelper.TestIdOperatorContext( - operatorId++, partitionAttributeMap); + OperatorContext partitioningContext = mockOperatorContext(operatorId++, partitionAttributeMap); JdbcPOJOPollInputOperator parition = (JdbcPOJOPollInputOperator)partition.getPartitionedInstance(); parition.outputPort.setup(tpc); @@ -197,8 +197,7 @@ public class JdbcPojoPollableOpeartorTest extends JdbcOperatorTest partitionAttributeMap.put(DAG.APPLICATION_ID, APP_ID); partitionAttributeMap.put(Context.DAGContext.APPLICATION_PATH, dir); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - operatorId, partitionAttributeMap); + OperatorContext context = mockOperatorContext(operatorId, partitionAttributeMap); JdbcPOJOPollInputOperator inputOperator = new JdbcPOJOPollInputOperator(); inputOperator.setStore(store); @@ -262,8 +261,7 @@ public class JdbcPojoPollableOpeartorTest extends JdbcOperatorTest partitionAttributeMap.put(DAG.APPLICATION_ID, APP_ID); partitionAttributeMap.put(Context.DAGContext.APPLICATION_PATH, dir); - OperatorContextTestHelper.TestIdOperatorContext partitioningContext = new OperatorContextTestHelper.TestIdOperatorContext( - operatorId++, partitionAttributeMap); + OperatorContext partitioningContext = mockOperatorContext(operatorId++, partitionAttributeMap); JdbcPOJOPollInputOperator parition = (JdbcPOJOPollInputOperator)partition.getPartitionedInstance(); parition.outputPort.setup(tpc); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java b/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java index 8fa814d..5998ce9 100644 --- a/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java +++ b/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java @@ -23,9 +23,12 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Collection; -import javax.annotation.Nonnull; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import com.datatorrent.api.Attribute; +import com.datatorrent.api.Attribute.AttributeMap; import com.datatorrent.api.Context; import com.datatorrent.api.Context.OperatorContext; @@ -44,67 +47,41 @@ public class OperatorContextTestHelper }; - public static class TestIdOperatorContext extends TestContext implements OperatorContext + public static OperatorContext mockOperatorContext(int id) { - int id; - com.datatorrent.api.Attribute.AttributeMap attributes; - - public TestIdOperatorContext(int id) - { - this.id = id; - } - - public TestIdOperatorContext(int id, @Nonnull com.datatorrent.api.Attribute.AttributeMap map) - { - this.id = id; - this.attributes = map; - } - - public com.datatorrent.api.Attribute.AttributeMap getAttributes() - { - return attributes; - } + return mockOperatorContext(id, null); + } - @Override - public int getId() - { - return id; - } - @Override - public void sendMetrics(Collection<String> metricNames) - { - throw new UnsupportedOperationException("not supported"); - } - - @Override - @SuppressWarnings("unchecked") - public <T> T getValue(Attribute<T> key) + public static OperatorContext mockOperatorContext(int id, final AttributeMap map) + { + OperatorContext context = Mockito.mock(OperatorContext.class); + Mockito.when(context.getId()).thenReturn(id); + Mockito.when(context.getAttributes()).thenReturn(map); + Mockito.doThrow(new UnsupportedOperationException("not supported")).when(context).sendMetrics(Mockito.<Collection<String>>any()); + Mockito.doThrow(new UnsupportedOperationException("not supported")).when(context).setCounters(Mockito.any()); + Mockito.when(context.getValue(Mockito.<Attribute>any())).thenAnswer(new Answer<Object>() { - T value = attributes.get(key); - if (value != null) { - return value; + @Override + public Object answer(InvocationOnMock invocation) throws Throwable + { + final Attribute key = (Attribute)invocation.getArguments()[0]; + Object value = map.get(key); + if (value != null) { + return value; + } + return key.defaultValue; } - return super.getValue(key); - } - - @Override - public void setCounters(Object counters) - { - /* intentionally no-op */ - } - - @Override - public int getWindowsFromCheckpoint() - { - return 0; - } + }); + Mockito.doNothing().when(context).setCounters(Mockito.any()); + Mockito.when(context.getWindowsFromCheckpoint()).thenReturn(0); + return context; } private static class TestContext implements Context { @Override - public com.datatorrent.api.Attribute.AttributeMap getAttributes() + public Attribute.AttributeMap getAttributes() { return null; } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java index 867d309..4650dbb 100644 --- a/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java @@ -31,10 +31,11 @@ import org.mockftpserver.fake.filesystem.UnixFakeFileSystem; import com.datatorrent.api.Attribute; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.AbstractFTPInputOperator.FTPStringInputOperator; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link FTPStringInputOperator} */ @@ -70,8 +71,7 @@ public class FTPStringInputOperatorTest ftpOperator.setPassword("test"); ftpOperator.setDirectory(homeDirectory.getPath()); - ftpOperator.setup( - new OperatorContextTestHelper.TestIdOperatorContext(11, new Attribute.AttributeMap.DefaultAttributeMap())); + ftpOperator.setup(mockOperatorContext(11, new Attribute.AttributeMap.DefaultAttributeMap())); sink = new CollectorTestSink<>(); ftpOperator.output.setSink(sink); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java b/library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java index acb3fc4..086431a 100644 --- a/library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java @@ -44,7 +44,8 @@ import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; import com.datatorrent.api.annotation.Stateless; -import com.datatorrent.lib.helper.OperatorContextTestHelper; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; /** * Tests for {@link IdempotentStorageManager} @@ -68,7 +69,7 @@ public class IdempotentStorageManagerTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, applicationPath); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); storageManager.setup(context); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java index fc92429..a5fc45d 100644 --- a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java @@ -26,7 +26,8 @@ import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.common.experimental.AppData.ConnectionInfoProvider; -import com.datatorrent.lib.helper.OperatorContextTestHelper; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class PubSubWebSocketAppDataQueryTest extends PubSubWebSocketAppDataOperatorTest { @@ -38,10 +39,10 @@ public class PubSubWebSocketAppDataQueryTest extends PubSubWebSocketAppDataOpera { Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(Context.DAGContext.GATEWAY_CONNECT_ADDRESS, GATEWAY_CONNECT_ADDRESS_STRING); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); attributes = new Attribute.AttributeMap.DefaultAttributeMap(); - emptyContext = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + emptyContext = mockOperatorContext(1, attributes); } @Override http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java b/library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java index 2fbb9e7..3003336 100644 --- a/library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java @@ -42,9 +42,10 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class FSLineReaderTest { AbstractFSBlockReader<String> getBlockReader() @@ -75,7 +76,7 @@ public class FSLineReaderTest Attribute.AttributeMap.DefaultAttributeMap readerAttr = new Attribute.AttributeMap.DefaultAttributeMap(); readerAttr.put(DAG.APPLICATION_ID, appId); readerAttr.put(Context.OperatorContext.SPIN_MILLIS, 10); - readerContext = new OperatorContextTestHelper.TestIdOperatorContext(1, readerAttr); + readerContext = mockOperatorContext(1, readerAttr); blockReader.setup(readerContext); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java b/library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java index 374617a..00c4bfd 100644 --- a/library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java @@ -39,10 +39,10 @@ import org.apache.hadoop.fs.Path; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.netlet.util.Slice; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.mockito.Mockito.when; /** @@ -79,7 +79,7 @@ public class FSSliceReaderTest Attribute.AttributeMap.DefaultAttributeMap readerAttr = new Attribute.AttributeMap.DefaultAttributeMap(); readerAttr.put(DAG.APPLICATION_ID, Long.toHexString(System.currentTimeMillis())); readerAttr.put(Context.OperatorContext.SPIN_MILLIS, 10); - readerContext = new OperatorContextTestHelper.TestIdOperatorContext(1, readerAttr); + readerContext = mockOperatorContext(1, readerAttr); blockReader.setup(readerContext); @@ -172,7 +172,7 @@ public class FSSliceReaderTest FSTestReader reader = new FSTestReader(); reader.setBasePath(testMeta.output); - reader.setup(new OperatorContextTestHelper.TestIdOperatorContext(1, readerAttr)); + reader.setup(mockOperatorContext(1, readerAttr)); Assert.assertEquals("Block Size", blockSize, (long)((ReaderContext.FixedBytesReaderContext)reader.getReaderContext()).getLength()); } } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java index d11125b..15b7a36 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java @@ -38,11 +38,12 @@ import com.google.common.collect.Sets; import com.datatorrent.api.Attribute; import com.datatorrent.api.DefaultOutputPort; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; import com.datatorrent.lib.util.TestUtils.TestInfo; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class AbstractFileInputOperatorFailureHandlingTest { @Rule @@ -124,8 +125,7 @@ public class AbstractFileInputOperatorFailureHandlingTest oper.setDirectory(testMeta.getDir()); oper.getScanner().setFilePatternRegexp(".*file[\\d]"); - oper.setup( - new OperatorContextTestHelper.TestIdOperatorContext(1, new Attribute.AttributeMap.DefaultAttributeMap())); + oper.setup(mockOperatorContext(1, new Attribute.AttributeMap.DefaultAttributeMap())); for (long wid = 0; wid < 1000; wid++) { oper.beginWindow(wid); oper.emitTuples(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java index 5ceac01..b9cdd67 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java @@ -60,12 +60,13 @@ import com.datatorrent.api.DefaultPartition; import com.datatorrent.api.Partitioner.Partition; import com.datatorrent.api.StatsListener; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.fs.AbstractFileInputOperator.DirectoryScanner; import com.datatorrent.lib.partitioner.StatelessPartitionerTest.PartitioningContextImpl; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class AbstractFileInputOperatorTest { public static class TestMeta extends TestWatcher @@ -82,7 +83,7 @@ public class AbstractFileInputOperatorTest this.dir = "target/" + className + "/" + methodName; Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(Context.DAGContext.APPLICATION_PATH, dir); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); } @Override http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java index 38319e5..472aa93 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java @@ -63,16 +63,18 @@ import com.google.common.io.LimitInputStream; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.api.LocalMode; import com.datatorrent.api.StreamingApplication; import com.datatorrent.api.annotation.Stateless; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.RandomWordGenerator; import com.datatorrent.lib.util.TestUtils; import com.datatorrent.lib.util.TestUtils.TestInfo; import com.datatorrent.netlet.util.DTThrowable; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class AbstractFileOutputOperatorTest { private static final Logger LOG = LoggerFactory.getLogger(AbstractFileOutputOperatorTest.class); @@ -87,7 +89,7 @@ public class AbstractFileOutputOperatorTest public static class FSTestWatcher extends TestInfo { public boolean writeToTmp = false; - public OperatorContextTestHelper.TestIdOperatorContext testOperatorContext; + public OperatorContext testOperatorContext; @Override protected void starting(Description description) @@ -100,7 +102,7 @@ public class AbstractFileOutputOperatorTest attributeMap.put(Context.DAGContext.CHECKPOINT_WINDOW_COUNT, 60); attributeMap.put(Context.OperatorContext.SPIN_MILLIS, 500); - testOperatorContext = new OperatorContextTestHelper.TestIdOperatorContext(0, attributeMap); + testOperatorContext = mockOperatorContext(0, attributeMap); } catch (IOException e) { throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java index 17febf6..23bf8b0 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java @@ -32,10 +32,12 @@ import org.apache.hadoop.fs.FileSystem; import com.google.common.collect.Maps; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.lib.io.fs.AbstractFileOutputOperatorTest.FSTestWatcher; import com.datatorrent.lib.util.TestUtils.TestInfo; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class AbstractSingleFileOutputOperatorTest { private static final String SINGLE_FILE = "single.txt"; @@ -43,8 +45,7 @@ public class AbstractSingleFileOutputOperatorTest @Rule public TestInfo testMeta = new PrivateTestWatcher(); - public static OperatorContextTestHelper.TestIdOperatorContext testOperatorContext = - new OperatorContextTestHelper.TestIdOperatorContext(0); + public static OperatorContext testOperatorContext = mockOperatorContext(0); private static SimpleFileOutputOperator writer; http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java index daebecb..d27f27a 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java @@ -22,11 +22,13 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.Description; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.annotation.Stateless; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.fs.AbstractFileOutputOperatorTest.FSTestWatcher; import com.datatorrent.lib.util.TestUtils.TestInfo; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Functional Test for {@link AbstractWindowFileOutputOperator} */ @@ -51,8 +53,7 @@ public class AbstractWindowFileOutputOperatorTest } - public static OperatorContextTestHelper.TestIdOperatorContext testOperatorContext = - new OperatorContextTestHelper.TestIdOperatorContext(0); + public static OperatorContext testOperatorContext = mockOperatorContext(0); public static class WindowFileOutputOperatorString extends AbstractWindowFileOutputOperator<String> { http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java index 3efb0c3..440abf7 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java @@ -38,11 +38,12 @@ import com.google.common.collect.Maps; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.AbstractBlockReader.ReaderRecord; import com.datatorrent.lib.io.block.BlockWriter; import com.datatorrent.netlet.util.Slice; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Unit tests for {@link BlockWriter} */ @@ -79,7 +80,7 @@ public class BlockWriterTest Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.DAGContext.APPLICATION_ID, "PartitionWriterTest"); attributes.put(DAG.DAGContext.APPLICATION_PATH, appDirectory); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); underTest.setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java index d869074..f31e3d1 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java @@ -43,7 +43,6 @@ import com.datatorrent.api.Attribute; import com.datatorrent.api.Context.DAGContext; import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.BlockMetadata.FileBlockMetadata; import com.datatorrent.lib.io.block.BlockWriter; import com.datatorrent.lib.io.fs.FileStitcher.BlockNotFoundException; @@ -51,6 +50,7 @@ import com.datatorrent.lib.io.fs.Synchronizer.OutputFileMetadata; import com.datatorrent.lib.io.fs.Synchronizer.StitchBlock; import com.datatorrent.lib.io.fs.Synchronizer.StitchBlockMetaData; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.junit.Assert.fail; import static org.mockito.Mockito.when; @@ -97,7 +97,7 @@ public class FileMergerTest Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.DAGContext.APPLICATION_ID, description.getMethodName()); attributes.put(DAGContext.APPLICATION_PATH, baseDir); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); try { FileContext.getLocalFSFileContext().delete(new Path(new File(baseDir).getAbsolutePath()), true); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java index 58cf0a5..c982ee4 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java @@ -46,11 +46,12 @@ import com.datatorrent.api.StatsListener; import com.datatorrent.api.StreamingApplication; import com.datatorrent.api.annotation.ApplicationAnnotation; import com.datatorrent.common.util.BaseOperator; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.BlockMetadata; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link FileSplitterBase} */ @@ -86,7 +87,7 @@ public class FileSplitterBaseTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(Context.OperatorContext.SPIN_MILLIS, 500); - context = new OperatorContextTestHelper.TestIdOperatorContext(0, attributes); + context = mockOperatorContext(0, attributes); fileMetadataSink = new CollectorTestSink<>(); TestUtils.setSink(fileSplitter.filesMetadataOutput, fileMetadataSink); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java index df45778..2a48605 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java @@ -45,12 +45,13 @@ import org.apache.hadoop.fs.Path; import com.google.common.collect.Sets; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.BlockMetadata; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.KryoCloneUtils; import com.datatorrent.lib.util.TestUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link FileSplitterInput} */ @@ -111,7 +112,7 @@ public class FileSplitterInputTest attributes.put(Context.DAGContext.APPLICATION_PATH, "target/" + className + "/" + methodName + "/" + Long.toHexString(System.currentTimeMillis())); - context = new OperatorContextTestHelper.TestIdOperatorContext(0, attributes); + context = mockOperatorContext(0, attributes); fileMetadataSink = new CollectorTestSink<>(); blockMetadataSink = new CollectorTestSink<>(); resetSinks(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java index 63a726d..5c90ff2 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java @@ -45,11 +45,12 @@ import com.google.common.collect.Sets; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.BlockMetadata; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class FileSplitterTest { @@ -114,7 +115,7 @@ public class FileSplitterTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(Context.DAGContext.APPLICATION_PATH, dataDirectory); - context = new OperatorContextTestHelper.TestIdOperatorContext(0, attributes); + context = mockOperatorContext(0, attributes); fileSplitter.setup(context); fileMetadataSink = new CollectorTestSink<>(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java index 4833db2..0744774 100644 --- a/library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java @@ -38,7 +38,6 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.BlockMetadata.FileBlockMetadata; import com.datatorrent.lib.io.block.BlockWriter; import com.datatorrent.lib.io.fs.AbstractFileSplitter.FileMetadata; @@ -46,6 +45,8 @@ import com.datatorrent.lib.io.fs.Synchronizer.OutputFileMetadata; import com.datatorrent.lib.io.fs.Synchronizer.StitchBlock; import com.datatorrent.lib.io.fs.Synchronizer.StitchBlockMetaData; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Unit tests for {@link FileStitcher} */ @@ -78,7 +79,7 @@ public class FileStitcherTest Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.DAGContext.APPLICATION_ID, description.getClassName()); attributes.put(DAG.DAGContext.APPLICATION_PATH, appDirectory); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); oper.setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java index 2a760ca..680368b 100644 --- a/library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java @@ -34,11 +34,12 @@ import org.slf4j.LoggerFactory; import org.apache.commons.io.FileUtils; import com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; -import com.datatorrent.lib.helper.OperatorContextTestHelper.TestIdOperatorContext; import com.datatorrent.lib.util.ActiveMQMultiTypeMessageListener; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Test to verify JMS output operator adapter. */ @@ -52,7 +53,7 @@ public class JMSMultiPortOutputOperatorTest extends JMSTestBase public static final String APP_ID = "appId"; public static final int OPERATOR_ID = 1; public JMSMultiPortOutputOperator outputOperator; - public static OperatorContextTestHelper.TestIdOperatorContext testOperatorContext; + public static OperatorContext testOperatorContext; public static final int HALF_BATCH_SIZE = 5; public static final int BATCH_SIZE = HALF_BATCH_SIZE * 2; public final Random random = new Random(); @@ -65,7 +66,7 @@ public class JMSMultiPortOutputOperatorTest extends JMSTestBase logger.debug("Starting test {}", description.getMethodName()); DefaultAttributeMap attributes = new DefaultAttributeMap(); attributes.put(DAG.APPLICATION_ID, APP_ID); - testOperatorContext = new TestIdOperatorContext(OPERATOR_ID, attributes); + testOperatorContext = mockOperatorContext(OPERATOR_ID, attributes); try { FileUtils.deleteDirectory(new File(FSPsuedoTransactionableStore.DEFAULT_RECOVERY_DIRECTORY)); @@ -74,6 +75,8 @@ public class JMSMultiPortOutputOperatorTest extends JMSTestBase } } + + @Override protected void finished(org.junit.runner.Description description) { http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java index e4967ca..dd3ce9b 100644 --- a/library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java @@ -44,10 +44,13 @@ import org.apache.commons.io.FileUtils; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import com.datatorrent.api.Context.OperatorContext; + import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.netlet.util.DTThrowable; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class JMSObjectInputOperatorTest { @@ -56,7 +59,7 @@ public class JMSObjectInputOperatorTest String baseDir; JMSObjectInputOperator operator; CollectorTestSink<Object> sink; - Context.OperatorContext context; + OperatorContext context; JMSTestBase testBase; MessageProducer producer; Session session; @@ -79,7 +82,7 @@ public class JMSObjectInputOperatorTest attributeMap.put(Context.OperatorContext.SPIN_MILLIS, 500); attributeMap.put(Context.DAGContext.APPLICATION_PATH, baseDir); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + context = mockOperatorContext(1, attributeMap); operator = new JMSObjectInputOperator(); operator.setSubject("TEST.FOO"); operator.getConnectionFactoryProperties().put(JMSTestBase.AMQ_BROKER_URL, "vm://localhost"); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java index 6f28b19..d5ec13a 100644 --- a/library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java @@ -39,10 +39,10 @@ import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.api.DefaultInputPort; import com.datatorrent.api.Operator.ProcessingMode; -import com.datatorrent.lib.helper.OperatorContextTestHelper; -import com.datatorrent.lib.helper.OperatorContextTestHelper.TestIdOperatorContext; import com.datatorrent.lib.util.ActiveMQMultiTypeMessageListener; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Test to verify JMS output operator adapter. */ @@ -56,8 +56,8 @@ public class JMSOutputOperatorTest extends JMSTestBase public static final String APP_ID = "appId"; public static final int OPERATOR_ID = 1; public static JMSStringSinglePortOutputOperator outputOperator; - public static OperatorContextTestHelper.TestIdOperatorContext testOperatorContext; - public static OperatorContextTestHelper.TestIdOperatorContext testOperatorContextAMO; + public static OperatorContext testOperatorContext; + public static OperatorContext testOperatorContextAMO; public static final int HALF_BATCH_SIZE = 5; public static final int BATCH_SIZE = HALF_BATCH_SIZE * 2; public static final Random random = new Random(); @@ -70,11 +70,11 @@ public class JMSOutputOperatorTest extends JMSTestBase logger.debug("Starting test {}", description.getMethodName()); DefaultAttributeMap attributes = new DefaultAttributeMap(); attributes.put(DAG.APPLICATION_ID, APP_ID); - testOperatorContext = new TestIdOperatorContext(OPERATOR_ID, attributes); + testOperatorContext = mockOperatorContext(OPERATOR_ID, attributes); attributes = new DefaultAttributeMap(); attributes.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_MOST_ONCE); - testOperatorContextAMO = new TestIdOperatorContext(OPERATOR_ID, attributes); + testOperatorContextAMO = mockOperatorContext(OPERATOR_ID, attributes); try { FileUtils.deleteDirectory(new File(FSPsuedoTransactionableStore.DEFAULT_RECOVERY_DIRECTORY)); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java index f0b44e6..2fdddbb 100644 --- a/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java @@ -40,9 +40,10 @@ import org.apache.commons.io.FileUtils; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link JMSStringInputOperator} */ @@ -73,7 +74,7 @@ public class JMSStringInputOperatorTest attributeMap.put(Context.OperatorContext.SPIN_MILLIS, 500); attributeMap.put(Context.DAGContext.APPLICATION_PATH, baseDir); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + context = mockOperatorContext(1, attributeMap); operator = new JMSStringInputOperator(); operator.setSubject("TEST.FOO"); operator.getConnectionFactoryProperties().put(JMSTestBase.AMQ_BROKER_URL, "vm://localhost"); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java b/library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java index 2064080..32fc442 100644 --- a/library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java +++ b/library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java @@ -30,11 +30,13 @@ import org.junit.rules.TestWatcher; import org.apache.commons.io.FileUtils; import com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper.TestIdOperatorContext; import com.datatorrent.lib.io.jms.JMSOutputOperatorTest.JMSStringSinglePortOutputOperator; import com.datatorrent.lib.util.ActiveMQMultiTypeMessageListener; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Base testing class for testing transactionable store implementations. */ @@ -48,7 +50,7 @@ public class JMSTransactionableStoreTestBase extends JMSTestBase public static JMSStringSinglePortOutputOperator outputOperator; public static Class<? extends JMSBaseTransactionableStore> storeClass; - public static TestIdOperatorContext testOperatorContext; + public static OperatorContext testOperatorContext; public static class TestMeta extends TestWatcher { @@ -58,7 +60,7 @@ public class JMSTransactionableStoreTestBase extends JMSTestBase //Create fresh operator context DefaultAttributeMap attributes = new DefaultAttributeMap(); attributes.put(DAG.APPLICATION_ID, APP_ID); - testOperatorContext = new TestIdOperatorContext(OPERATOR_ID, attributes); + testOperatorContext = mockOperatorContext(OPERATOR_ID, attributes); FileUtils.deleteQuietly(new File(FSPsuedoTransactionableStore.DEFAULT_RECOVERY_DIRECTORY)); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java index 9b7083d..4eb0b80 100644 --- a/library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java @@ -39,9 +39,10 @@ import com.amazonaws.regions.Region; import com.amazonaws.regions.Regions; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link JMSStringInputOperator} for AMZ SQS. * Note: for SQS we should use AckMode as "AUTO_ACKNOWLEDGE" and @@ -98,7 +99,7 @@ public class SQSStringInputOperatorTest attributeMap.put(Context.OperatorContext.SPIN_MILLIS, 500); attributeMap.put(Context.DAGContext.APPLICATION_PATH, baseDir); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + context = mockOperatorContext(1, attributeMap); operator = new JMSStringInputOperator(); operator.setConnectionFactoryBuilder(new JMSBase.ConnectionFactoryBuilder() { http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java b/library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java index 3672200..f6a2b2f 100644 --- a/library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java +++ b/library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java @@ -31,17 +31,18 @@ import org.junit.Test; import com.google.common.collect.Maps; import com.datatorrent.api.Attribute; -import com.datatorrent.api.Context; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class MapTimeBasedJoinOperator { @Rule public final TestUtils.TestInfo testInfo = new TestUtils.TestInfo(); private static Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); - public static final Context.OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + public static final OperatorContext context = mockOperatorContext(1, attributes); @Test public void testJoinOperator() throws IOException, InterruptedException http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java b/library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java index d6965f7..31632b3 100644 --- a/library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java +++ b/library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java @@ -26,7 +26,8 @@ import org.junit.Test; import com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap; import com.datatorrent.api.Context.DAGContext; import com.datatorrent.api.Context.OperatorContext; -import com.datatorrent.lib.helper.OperatorContextTestHelper.TestIdOperatorContext; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class WindowUtilsTest { @@ -108,6 +109,6 @@ public class WindowUtilsTest attributeMap.put(DAGContext.STREAMING_WINDOW_SIZE_MILLIS, streamingWindowMillis); attributeMap.put(OperatorContext.APPLICATION_WINDOW_COUNT, appWindowCount); - return new TestIdOperatorContext(1, attributeMap); + return mockOperatorContext(1, attributeMap); } } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperBoundedPOJOImplTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperBoundedPOJOImplTest.java b/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperBoundedPOJOImplTest.java index 448e76f..a1fb71b 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperBoundedPOJOImplTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperBoundedPOJOImplTest.java @@ -38,6 +38,8 @@ import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; import com.datatorrent.stram.engine.PortContext; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class DeduperBoundedPOJOImplTest { private static String applicationPath; @@ -64,7 +66,7 @@ public class DeduperBoundedPOJOImplTest attributes.put(DAG.APPLICATION_ID, APP_ID); attributes.put(DAG.APPLICATION_PATH, applicationPath); attributes.put(DAG.InputPortMeta.TUPLE_CLASS, TestPojo.class); - OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributes); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributes); deduper.setup(context); deduper.input.setup(new PortContext(attributes, context)); deduper.activate(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperTimeBasedPOJOImplTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperTimeBasedPOJOImplTest.java b/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperTimeBasedPOJOImplTest.java index f73413b..3878e2c 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperTimeBasedPOJOImplTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperTimeBasedPOJOImplTest.java @@ -39,6 +39,8 @@ import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; import com.datatorrent.stram.engine.PortContext; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class DeduperTimeBasedPOJOImplTest { private static String applicationPath; @@ -69,7 +71,7 @@ public class DeduperTimeBasedPOJOImplTest attributes.put(DAG.APPLICATION_ID, APP_ID); attributes.put(DAG.APPLICATION_PATH, applicationPath); attributes.put(DAG.InputPortMeta.TUPLE_CLASS, TestPojo.class); - OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributes); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributes); deduper.setup(context); deduper.input.setup(new PortContext(attributes, context)); deduper.activate(context); @@ -110,7 +112,7 @@ public class DeduperTimeBasedPOJOImplTest attributes.put(DAG.APPLICATION_ID, APP_ID); attributes.put(DAG.APPLICATION_PATH, applicationPath); attributes.put(DAG.InputPortMeta.TUPLE_CLASS, TestPojo.class); - OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributes); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributes); deduper.setup(context); deduper.input.setup(new PortContext(attributes, context)); deduper.activate(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/fs/FSRecordCompactionOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/fs/FSRecordCompactionOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/fs/FSRecordCompactionOperatorTest.java index 43a8f6c..56ac07c 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/fs/FSRecordCompactionOperatorTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/fs/FSRecordCompactionOperatorTest.java @@ -34,9 +34,10 @@ import org.apache.hadoop.fs.Path; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class FSRecordCompactionOperatorTest { @@ -55,7 +56,7 @@ public class FSRecordCompactionOperatorTest Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.DAGContext.APPLICATION_ID, description.getClassName()); attributes.put(DAG.DAGContext.APPLICATION_PATH, outputPath); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); underTest = new FSRecordCompactionOperator<byte[]>(); underTest.setConverter(new GenericFileOutputOperator.NoOpConverter()); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3DelimitedRecordReaderTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3DelimitedRecordReaderTest.java b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3DelimitedRecordReaderTest.java index a85e2c8..a861d9f 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3DelimitedRecordReaderTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3DelimitedRecordReaderTest.java @@ -50,12 +50,13 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.AbstractFSBlockReader; import com.datatorrent.lib.io.block.BlockMetadata; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.netlet.util.Slice; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + @Ignore public class S3DelimitedRecordReaderTest { @@ -107,7 +108,7 @@ public class S3DelimitedRecordReaderTest Attribute.AttributeMap.DefaultAttributeMap readerAttr = new Attribute.AttributeMap.DefaultAttributeMap(); readerAttr.put(DAG.APPLICATION_ID, appId); readerAttr.put(Context.OperatorContext.SPIN_MILLIS, 10); - readerContext = new OperatorContextTestHelper.TestIdOperatorContext(1, readerAttr); + readerContext = mockOperatorContext(1, readerAttr); blockReader.setup(readerContext); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3FixedWidthRecordReaderTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3FixedWidthRecordReaderTest.java b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3FixedWidthRecordReaderTest.java index 0584973..f69b018 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3FixedWidthRecordReaderTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3FixedWidthRecordReaderTest.java @@ -50,12 +50,13 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.block.AbstractFSBlockReader; import com.datatorrent.lib.io.block.BlockMetadata; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.netlet.util.Slice; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + @Ignore public class S3FixedWidthRecordReaderTest { @@ -107,7 +108,7 @@ public class S3FixedWidthRecordReaderTest Attribute.AttributeMap.DefaultAttributeMap readerAttr = new Attribute.AttributeMap.DefaultAttributeMap(); readerAttr.put(DAG.APPLICATION_ID, appId); readerAttr.put(Context.OperatorContext.SPIN_MILLIS, 10); - readerContext = new OperatorContextTestHelper.TestIdOperatorContext(1, readerAttr); + readerContext = mockOperatorContext(1, readerAttr); blockReader.setup(readerContext); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3InitiateFileUploadOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3InitiateFileUploadOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3InitiateFileUploadOperatorTest.java index a077fb9..e9111b8 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3InitiateFileUploadOperatorTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3InitiateFileUploadOperatorTest.java @@ -42,6 +42,7 @@ import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.io.fs.AbstractFileSplitter; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; @@ -76,7 +77,7 @@ public class S3InitiateFileUploadOperatorTest applicationPath = OperatorContextTestHelper.getUniqueApplicationPath(APPLICATION_PATH_PREFIX); attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, applicationPath); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); } @After http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3ReconcilerTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3ReconcilerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3ReconcilerTest.java index f1acb9b..c276df7 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3ReconcilerTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/fs/s3/S3ReconcilerTest.java @@ -41,8 +41,8 @@ import com.amazonaws.services.s3.model.PutObjectRequest; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; @@ -69,7 +69,7 @@ public class S3ReconcilerTest Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.DAGContext.APPLICATION_ID, description.getClassName()); attributes.put(DAG.DAGContext.APPLICATION_PATH, outputPath); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); underTest = new S3Reconciler(); underTest.setAccessKey(""); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/join/POJOInnerJoinOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/join/POJOInnerJoinOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/join/POJOInnerJoinOperatorTest.java index 2064c45..857db6d 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/join/POJOInnerJoinOperatorTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/join/POJOInnerJoinOperatorTest.java @@ -38,6 +38,8 @@ import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.TestUtils; import com.datatorrent.stram.engine.PortContext; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + @Ignore public class POJOInnerJoinOperatorTest { @@ -129,7 +131,7 @@ public class POJOInnerJoinOperatorTest applicationPath = OperatorContextTestHelper.getUniqueApplicationPath(APPLICATION_PATH_PREFIX); attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, applicationPath); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + context = mockOperatorContext(1, attributes); } @After http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedStateTestUtils.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedStateTestUtils.java b/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedStateTestUtils.java index 86f8430..393a3a8 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedStateTestUtils.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedStateTestUtils.java @@ -36,13 +36,14 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; import com.datatorrent.api.Attribute; -import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.lib.fileaccess.FileAccess; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.comparator.SliceComparator; import com.datatorrent.netlet.util.Slice; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class ManagedStateTestUtils { /** @@ -112,17 +113,17 @@ public class ManagedStateTestUtils return bucketData; } - public static Context.OperatorContext getOperatorContext(int operatorId, String applicationPath) + public static OperatorContext getOperatorContext(int operatorId, String applicationPath) { Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, applicationPath); - return new OperatorContextTestHelper.TestIdOperatorContext(operatorId, attributes); + return mockOperatorContext(operatorId, attributes); } - public static Context.OperatorContext getOperatorContext(int operatorId) + public static OperatorContext getOperatorContext(int operatorId) { Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); - return new OperatorContextTestHelper.TestIdOperatorContext(operatorId, attributes); + return mockOperatorContext(operatorId, attributes); } private static final transient Logger LOG = LoggerFactory.getLogger(ManagedStateTestUtils.class); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedTimeStateImplTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedTimeStateImplTest.java b/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedTimeStateImplTest.java index d713100..ed53f08 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedTimeStateImplTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/state/managed/ManagedTimeStateImplTest.java @@ -32,13 +32,15 @@ import org.junit.runner.Description; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.lib.fileaccess.FileAccessFSImpl; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.KryoCloneUtils; import com.datatorrent.lib.util.TestUtils; import com.datatorrent.netlet.util.Slice; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class ManagedTimeStateImplTest { class TestMeta extends TestWatcher @@ -142,7 +144,7 @@ public class ManagedTimeStateImplTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, testMeta.applicationPath); attributes.put(Context.OperatorContext.ACTIVATION_WINDOW_ID, 0L); - Context.OperatorContext operatorContext = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes); + OperatorContext operatorContext = mockOperatorContext(1, attributes); testMeta.managedState.setup(operatorContext); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListImplTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListImplTest.java b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListImplTest.java index 5dd6404..225fd23 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListImplTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListImplTest.java @@ -29,10 +29,12 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.KryoCloneUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class SpillableArrayListImplTest { public static final byte[] ID1 = new byte[]{(byte)0}; @@ -558,8 +560,7 @@ public class SpillableArrayListImplTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, testMeta.applicationPath); attributes.put(Context.OperatorContext.ACTIVATION_WINDOW_ID, activationWindow); - Context.OperatorContext context = - new OperatorContextTestHelper.TestIdOperatorContext(testMeta.operatorContext.getId(), attributes); + OperatorContext context = mockOperatorContext(testMeta.operatorContext.getId(), attributes); list = clonedList; store = clonedList.getStore(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListMultimapImplTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListMultimapImplTest.java b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListMultimapImplTest.java index d21bf50..a10cc68 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListMultimapImplTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableArrayListMultimapImplTest.java @@ -36,11 +36,13 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.KryoCloneUtils; import com.datatorrent.netlet.util.Slice; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class SpillableArrayListMultimapImplTest { public static final byte[] ID1 = new byte[]{(byte)0}; @@ -316,8 +318,7 @@ public class SpillableArrayListMultimapImplTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, testMeta.applicationPath); attributes.put(Context.OperatorContext.ACTIVATION_WINDOW_ID, activationWindow); - Context.OperatorContext context = - new OperatorContextTestHelper.TestIdOperatorContext(testMeta.operatorContext.getId(), attributes); + OperatorContext context = mockOperatorContext(testMeta.operatorContext.getId(), attributes); store.setup(context); map.setup(context); @@ -358,8 +359,7 @@ public class SpillableArrayListMultimapImplTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, testMeta.applicationPath); - Context.OperatorContext context = - new OperatorContextTestHelper.TestIdOperatorContext(testMeta.operatorContext.getId(), attributes); + OperatorContext context = mockOperatorContext(testMeta.operatorContext.getId(), attributes); store.setup(context); multimap.setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableMapImplTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableMapImplTest.java b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableMapImplTest.java index ce51a03..26d0900 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableMapImplTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableMapImplTest.java @@ -34,13 +34,15 @@ import com.google.common.base.Preconditions; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.KryoCloneUtils; import junitparams.JUnitParamsRunner; import junitparams.Parameters; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + @RunWith(JUnitParamsRunner.class) public class SpillableMapImplTest { @@ -439,8 +441,7 @@ public class SpillableMapImplTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, testMeta.applicationPath); attributes.put(Context.OperatorContext.ACTIVATION_WINDOW_ID, 1L); - Context.OperatorContext context = - new OperatorContextTestHelper.TestIdOperatorContext(testMeta.operatorContext.getId(), attributes); + OperatorContext context = mockOperatorContext(testMeta.operatorContext.getId(), attributes); map1 = clonedMap1; map1.getStore().setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableSetMultimapImplTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableSetMultimapImplTest.java b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableSetMultimapImplTest.java index bc1783c..c1f9ad9 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableSetMultimapImplTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/state/spillable/SpillableSetMultimapImplTest.java @@ -36,10 +36,12 @@ import com.google.common.collect.Sets; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.KryoCloneUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class SpillableSetMultimapImplTest { public static final byte[] ID1 = new byte[]{(byte)0}; @@ -260,8 +262,7 @@ public class SpillableSetMultimapImplTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, testMeta.applicationPath); attributes.put(Context.OperatorContext.ACTIVATION_WINDOW_ID, activationWindow); - Context.OperatorContext context = - new OperatorContextTestHelper.TestIdOperatorContext(testMeta.operatorContext.getId(), attributes); + OperatorContext context = mockOperatorContext(testMeta.operatorContext.getId(), attributes); store.setup(context); map.setup(context); @@ -297,8 +298,7 @@ public class SpillableSetMultimapImplTest Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, testMeta.applicationPath); - Context.OperatorContext context = - new OperatorContextTestHelper.TestIdOperatorContext(testMeta.operatorContext.getId(), attributes); + OperatorContext context = mockOperatorContext(testMeta.operatorContext.getId(), attributes); store.setup(context); multimap.setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/org/apache/apex/malhar/lib/wal/FSWindowDataManagerTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/wal/FSWindowDataManagerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/wal/FSWindowDataManagerTest.java index bef1ae4..beff458 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/wal/FSWindowDataManagerTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/wal/FSWindowDataManagerTest.java @@ -34,12 +34,14 @@ import com.google.common.collect.Sets; import com.datatorrent.api.Attribute; import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.api.annotation.Stateless; import com.datatorrent.common.util.Pair; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.TestUtils; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link WindowDataManager} */ @@ -320,8 +322,7 @@ public class FSWindowDataManagerTest private Pair<Context.OperatorContext, FSWindowDataManager> createManagerAndContextFor(int operatorId) { FSWindowDataManager dataManager = new FSWindowDataManager(); - Context.OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(operatorId, - testMeta.attributes); + OperatorContext context = mockOperatorContext(operatorId, testMeta.attributes); return new Pair<>(context, dataManager); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9cc611a..9660982 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ <configuration> <argLine>${surefire.args}</argLine> </configuration> - </plugin> + </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -220,6 +220,18 @@ <version>${apex.core.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.8.5</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </project>
