APEXMALHAR-2306 Tests should allow for additions to OperatorContext interface
Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/7f1abca7 Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/7f1abca7 Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/7f1abca7 Branch: refs/heads/master Commit: 7f1abca75017649eff1bb365d9048045eebaf088 Parents: cb1ef76 Author: Vlad Rozov <[email protected]> Authored: Mon Mar 13 15:18:14 2017 -0700 Committer: Vlad Rozov <[email protected]> Committed: Mon Mar 13 16:56:28 2017 -0700 ---------------------------------------------------------------------- .../memsql/MemsqlInputBenchmarkTest.java | 5 +- .../accumulo/AccumuloOutputOperatorTest.java | 8 +- .../aerospike/AerospikeOperatorTest.java | 7 +- .../contrib/aerospike/AerospikeTestUtils.java | 8 +- .../contrib/avro/AvroFileInputOperatorTest.java | 11 ++- .../AbstractUpsertOutputOperatorCodecsTest.java | 8 +- ...ractUpsertOutputOperatorCompositePKTest.java | 8 +- ...bstractUpsertOutputOperatorCountersTest.java | 8 +- .../CassandraLookupCacheBackedOperatorTest.java | 7 +- .../cassandra/CassandraOperatorTest.java | 10 ++- .../couchbase/CouchBaseOutputOperatorTest.java | 7 +- .../contrib/couchbase/CouchBasePOJOTest.java | 6 +- .../couchdb/CouchDBInputOperatorTest.java | 5 +- .../couchdb/CouchDBOutputOperatorTest.java | 6 +- .../couchdb/CouchDBPOJOInputOperatorTest.java | 5 +- .../couchdb/PagedCouchDBInputOperatorTest.java | 5 +- .../hbase/HBaseCsvMappingPutOperatorTest.java | 8 +- .../hbase/HBaseNameValueCsvPutOperatorTest.java | 8 +- .../hbase/HBasePOJOInputOperatorTest.java | 5 +- .../contrib/hbase/HBasePOJOPutOperatorTest.java | 5 +- .../contrib/kafka/KafkaInputOperatorTest.java | 8 +- .../kinesis/KinesisInputOperatorTest.java | 5 +- .../memsql/AbstractMemsqlInputOperatorTest.java | 8 +- .../AbstractMemsqlOutputOperatorTest.java | 6 +- .../mongodb/MongoDBInputOperatorTest.java | 5 +- .../mongodb/MongoDBOutputOperatorTest.java | 10 +-- .../nifi/NiFiSinglePortInputOperatorTest.java | 5 +- .../nifi/NiFiSinglePortOutputOperatorTest.java | 5 +- .../parquet/ParquetFilePOJOReaderTest.java | 5 +- .../rabbitmq/RabbitMQInputOperatorTest.java | 5 +- .../contrib/redis/RedisInputOperatorTest.java | 5 +- .../contrib/redis/RedisPOJOOperatorTest.java | 5 +- .../contrib/splunk/SplunkInputOperatorTest.java | 7 +- .../DistributedDistinctTest.java | 8 +- .../datatorrent/contrib/hive/HiveMockTest.java | 15 ++-- .../malhar/kafka/KafkaOutputOperatorTest.java | 6 +- library/pom.xml | 16 +--- .../lib/bandwidth/BandwidthManagerTest.java | 5 +- .../lib/db/KeyValueStoreOperatorTest.java | 5 +- ...ransactionableKeyValueStoreOperatorTest.java | 4 +- .../jdbc/JDBCLookupCacheBackedOperatorTest.java | 7 +- ...NonTransactionalBatchOutputOperatorTest.java | 13 ++-- .../JdbcNonTransactionalOutputOperatorTest.java | 7 +- .../lib/db/jdbc/JdbcPojoOperatorTest.java | 31 +++----- .../db/jdbc/JdbcPojoPollableOpeartorTest.java | 12 ++- .../lib/helper/OperatorContextTestHelper.java | 81 +++++++------------- .../lib/io/FTPStringInputOperatorTest.java | 6 +- .../lib/io/IdempotentStorageManagerTest.java | 5 +- .../lib/io/PubSubWebSocketAppDataQueryTest.java | 7 +- .../lib/io/block/FSLineReaderTest.java | 5 +- .../lib/io/block/FSSliceReaderTest.java | 6 +- ...actFileInputOperatorFailureHandlingTest.java | 6 +- .../io/fs/AbstractFileInputOperatorTest.java | 5 +- .../io/fs/AbstractFileOutputOperatorTest.java | 8 +- .../AbstractSingleFileOutputOperatorTest.java | 7 +- .../AbstractWindowFileOutputOperatorTest.java | 7 +- .../datatorrent/lib/io/fs/BlockWriterTest.java | 5 +- .../datatorrent/lib/io/fs/FileMergerTest.java | 4 +- .../lib/io/fs/FileSplitterBaseTest.java | 5 +- .../lib/io/fs/FileSplitterInputTest.java | 5 +- .../datatorrent/lib/io/fs/FileSplitterTest.java | 5 +- .../datatorrent/lib/io/fs/FileStitcherTest.java | 5 +- .../io/jms/JMSMultiPortOutputOperatorTest.java | 11 ++- .../lib/io/jms/JMSObjectInputOperatorTest.java | 9 ++- .../lib/io/jms/JMSOutputOperatorTest.java | 12 +-- .../lib/io/jms/JMSStringInputOperatorTest.java | 5 +- .../io/jms/JMSTransactionableStoreTestBase.java | 8 +- .../lib/io/jms/SQSStringInputOperatorTest.java | 5 +- .../lib/join/MapTimeBasedJoinOperator.java | 7 +- .../lib/util/time/WindowUtilsTest.java | 5 +- .../lib/dedup/DeduperBoundedPOJOImplTest.java | 4 +- .../lib/dedup/DeduperTimeBasedPOJOImplTest.java | 6 +- .../lib/fs/FSRecordCompactionOperatorTest.java | 5 +- .../lib/fs/s3/S3DelimitedRecordReaderTest.java | 5 +- .../lib/fs/s3/S3FixedWidthRecordReaderTest.java | 5 +- .../fs/s3/S3InitiateFileUploadOperatorTest.java | 3 +- .../apex/malhar/lib/fs/s3/S3ReconcilerTest.java | 4 +- .../lib/join/POJOInnerJoinOperatorTest.java | 4 +- .../state/managed/ManagedStateTestUtils.java | 13 ++-- .../state/managed/ManagedTimeStateImplTest.java | 6 +- .../spillable/SpillableArrayListImplTest.java | 7 +- .../SpillableArrayListMultimapImplTest.java | 10 +-- .../state/spillable/SpillableMapImplTest.java | 7 +- .../spillable/SpillableSetMultimapImplTest.java | 10 +-- .../malhar/lib/wal/FSWindowDataManagerTest.java | 7 +- pom.xml | 14 +++- 86 files changed, 358 insertions(+), 334 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java ---------------------------------------------------------------------- diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java b/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java index fa98a18..a596903 100644 --- a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java +++ b/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java @@ -38,12 +38,12 @@ import com.datatorrent.api.Operator.ProcessingMode; import com.datatorrent.contrib.memsql.AbstractMemsqlOutputOperatorTest; import com.datatorrent.contrib.memsql.MemsqlPOJOOutputOperator; import com.datatorrent.contrib.memsql.MemsqlStore; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.netlet.util.DTThrowable; import static com.datatorrent.contrib.memsql.AbstractMemsqlOutputOperatorTest.BATCH_SIZE; import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.APP_ID; import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.OPERATOR_ID; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class MemsqlInputBenchmarkTest { @@ -77,8 +77,7 @@ public class MemsqlInputBenchmarkTest attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = - new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); long seedSize = conf.getLong("dt.seedSize", SEED_SIZE); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java index a74294e..0ffa472 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java @@ -25,11 +25,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datatorrent.api.Attribute; -import com.datatorrent.api.Attribute.AttributeMap; -import com.datatorrent.api.Context.OperatorContext; - -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class AccumuloOutputOperatorTest { private static final Logger logger = LoggerFactory @@ -48,7 +44,7 @@ public class AccumuloOutputOperatorTest { atleastOper.getStore().setUserName("root"); atleastOper.getStore().setPassword("pass"); - atleastOper.setup(new OperatorContextTestHelper.TestIdOperatorContext(0)); + atleastOper.setup(mockOperatorContext(0)); atleastOper.beginWindow(0); AccumuloTuple a=new AccumuloTuple(); a.setRow("john");a.setColFamily("colfam0");a.setColName("street");a.setColValue("patrick"); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java index 25ac39b..fba82cd 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java @@ -24,7 +24,6 @@ import com.aerospike.client.Bin; import com.aerospike.client.Key; import com.aerospike.client.Record; import com.aerospike.client.query.Statement; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import org.junit.Assert; import org.junit.Test; @@ -32,6 +31,8 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; +import com.datatorrent.api.Context.OperatorContext; + import static com.datatorrent.contrib.aerospike.AerospikeTestUtils.NAMESPACE; import static com.datatorrent.contrib.aerospike.AerospikeTestUtils.NODE; import static com.datatorrent.contrib.aerospike.AerospikeTestUtils.NUM_TUPLES; @@ -127,7 +128,7 @@ public class AerospikeOperatorTest { public void TestAerospikeOutputOperator() { AerospikeTransactionalStore transactionalStore = getTransactionalStore(); - OperatorContextTestHelper.TestIdOperatorContext context = getOperatorContext(APP_ID); + OperatorContext context = getOperatorContext(APP_ID); TestOutputOperator outputOperator = new TestOutputOperator(); outputOperator.setStore(transactionalStore); @@ -151,7 +152,7 @@ public class AerospikeOperatorTest { public void TestAerospikeInputOperator() { AerospikeStore store = getStore(); - OperatorContextTestHelper.TestIdOperatorContext context = getOperatorContext(APP_ID); + OperatorContext context = getOperatorContext(APP_ID); TestInputOperator inputOperator = new TestInputOperator(); inputOperator.setStore(store); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java b/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java index c434ae2..9498562 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java +++ b/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java @@ -29,12 +29,14 @@ import com.aerospike.client.Record; import com.aerospike.client.query.RecordSet; import com.aerospike.client.query.Statement; import com.datatorrent.api.Attribute.AttributeMap; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import java.util.ArrayList; import java.util.List; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Utility class encapsulating code used by several tests */ @@ -143,11 +145,11 @@ public class AerospikeTestUtils { return result; } - static OperatorContextTestHelper.TestIdOperatorContext getOperatorContext(final String app_id) + static OperatorContext getOperatorContext(final String app_id) { AttributeMap.DefaultAttributeMap attributeMap = new AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, app_id); - return new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + return mockOperatorContext(OPERATOR_ID, attributeMap); } static ArrayList<String> getExpressions() http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java index 813f189..09507e6 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java @@ -48,15 +48,18 @@ 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.Context.PortContext; import com.datatorrent.api.DAG; import com.datatorrent.api.DAG.Locality; import com.datatorrent.api.LocalMode; import com.datatorrent.api.StreamingApplication; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.helper.TestPortContext; import com.datatorrent.lib.io.ConsoleOutputOperator; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * <p> * In this class the emitTuples method is called twice to process the first @@ -89,8 +92,8 @@ public class AvroFileInputOperatorTest public static class TestMeta extends TestWatcher { public String dir = null; - Context.OperatorContext context; - Context.PortContext portContext; + OperatorContext context; + PortContext portContext; @Override protected void starting(org.junit.runner.Description description) @@ -100,7 +103,7 @@ public class AvroFileInputOperatorTest 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); Attribute.AttributeMap portAttributes = new Attribute.AttributeMap.DefaultAttributeMap(); portAttributes.put(Context.PortContext.TUPLE_CLASS, SimpleOrder.class); portContext = new TestPortContext(portAttributes); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java b/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java index faf32a4..eb3a300 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java @@ -31,10 +31,11 @@ import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; 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 static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -94,7 +95,7 @@ public class AbstractUpsertOutputOperatorCodecsTest UserUpsertOperator userUpsertOperator = null; - OperatorContextTestHelper.TestIdOperatorContext contextForUserUpsertOperator; + OperatorContext contextForUserUpsertOperator; TestPortContext testPortContextForUserUpserts; @@ -103,8 +104,7 @@ public class AbstractUpsertOutputOperatorCodecsTest { Attribute.AttributeMap.DefaultAttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - contextForUserUpsertOperator = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID_FOR_USER_UPSERTS, - attributeMap); + contextForUserUpsertOperator = mockOperatorContext(OPERATOR_ID_FOR_USER_UPSERTS, attributeMap); userUpsertOperator = new UserUpsertOperator(); Attribute.AttributeMap.DefaultAttributeMap portAttributes = new Attribute.AttributeMap.DefaultAttributeMap(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java b/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java index b0863e0..7769c8d 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java @@ -26,10 +26,11 @@ import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; 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 static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.junit.Assert.assertEquals; /** @@ -43,7 +44,7 @@ public class AbstractUpsertOutputOperatorCompositePKTest public static final int OPERATOR_ID_FOR_COMPOSITE_PRIMARY_KEYS = 2; CompositePrimaryKeyUpdateOperator compositePrimaryKeysOperator = null; - OperatorContextTestHelper.TestIdOperatorContext contextForCompositePrimaryKeysOperator; + OperatorContext contextForCompositePrimaryKeysOperator; TestPortContext testPortContextForCompositePrimaryKeys; @Before @@ -52,8 +53,7 @@ public class AbstractUpsertOutputOperatorCompositePKTest Attribute.AttributeMap.DefaultAttributeMap attributeMapForCompositePrimaryKey = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMapForCompositePrimaryKey.put(DAG.APPLICATION_ID, APP_ID); - contextForCompositePrimaryKeysOperator = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID_FOR_COMPOSITE_PRIMARY_KEYS, + contextForCompositePrimaryKeysOperator = mockOperatorContext(OPERATOR_ID_FOR_COMPOSITE_PRIMARY_KEYS, attributeMapForCompositePrimaryKey); Attribute.AttributeMap.DefaultAttributeMap portAttributesForCompositePrimaryKeys = http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java b/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java index b32dc43..ccfb9d5 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java @@ -26,10 +26,11 @@ import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; 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 static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.junit.Assert.assertEquals; /** @@ -42,7 +43,7 @@ public class AbstractUpsertOutputOperatorCountersTest public static final int OPERATOR_ID_FOR_COUNTER_COLUMNS = 1; CounterColumnUpdatesOperator counterUpdatesOperator = null; - OperatorContextTestHelper.TestIdOperatorContext contextForCountersOperator; + OperatorContext contextForCountersOperator; TestPortContext testPortContextForCounters; @Before @@ -51,8 +52,7 @@ public class AbstractUpsertOutputOperatorCountersTest Attribute.AttributeMap.DefaultAttributeMap attributeMapForCounters = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMapForCounters.put(DAG.APPLICATION_ID, APP_ID); - contextForCountersOperator = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID_FOR_COUNTER_COLUMNS, - attributeMapForCounters); + contextForCountersOperator = mockOperatorContext(OPERATOR_ID_FOR_COUNTER_COLUMNS, attributeMapForCounters); Attribute.AttributeMap.DefaultAttributeMap portAttributesForCounters = new Attribute.AttributeMap.DefaultAttributeMap(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java index 81b13a2..fc9ed1e 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java @@ -30,10 +30,11 @@ import java.util.TimeZone; import org.junit.AfterClass; import org.junit.BeforeClass; -import com.datatorrent.api.Context; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.lib.db.jdbc.JDBCLookupCacheBackedOperatorTest; -import com.datatorrent.lib.helper.OperatorContextTestHelper; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; /** * Tests for Cassandra backed lookup cache. @@ -93,7 +94,7 @@ public class CassandraLookupCacheBackedOperatorTest extends JDBCLookupCacheBacke lookupCacheBackedOperator.output.setSink(sink); - Context.OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(7); + OperatorContext context = mockOperatorContext(7); lookupCacheBackedOperator.setup(context); } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java index 4a1f883..c3a66d8 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java @@ -50,13 +50,15 @@ import com.google.common.collect.Lists; import com.datatorrent.api.Attribute; import com.datatorrent.api.Attribute.AttributeMap; 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.netlet.util.DTThrowable; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Tests for {@link AbstractCassandraTransactionableOutputOperator} and {@link AbstractCassandraInputOperator} */ @@ -71,7 +73,7 @@ public class CassandraOperatorTest private static final int OPERATOR_ID = 0; private static Cluster cluster = null; private static Session session = null; - private OperatorContextTestHelper.TestIdOperatorContext context; + private OperatorContext context; private TestPortContext tpc; @SuppressWarnings("unused") @@ -131,7 +133,7 @@ public class CassandraOperatorTest { AttributeMap.DefaultAttributeMap attributeMap = new AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + context = mockOperatorContext(OPERATOR_ID, attributeMap); Attribute.AttributeMap.DefaultAttributeMap portAttributes = new Attribute.AttributeMap.DefaultAttributeMap(); portAttributes.put(Context.PortContext.TUPLE_CLASS, TestPojo.class); @@ -403,7 +405,7 @@ public class CassandraOperatorTest AttributeMap.DefaultAttributeMap attributeMap = new 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); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java index b840a70..1e7285d 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java @@ -29,9 +29,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datatorrent.lib.helper.OperatorContextTestHelper; - import com.datatorrent.api.Attribute.AttributeMap; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.netlet.util.DTThrowable; @@ -41,6 +40,8 @@ import org.couchbase.mock.Bucket.BucketType; import org.couchbase.mock.BucketConfiguration; import org.couchbase.mock.CouchbaseMock; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class CouchBaseOutputOperatorTest { @@ -167,7 +168,7 @@ public class CouchBaseOutputOperatorTest CouchbasePOJOSetOperator outputOperator = new CouchbasePOJOSetOperator(); AttributeMap.DefaultAttributeMap attributeMap = new AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); outputOperator.setStore(store); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java b/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java index 63253b7..7ed9831 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java @@ -30,14 +30,16 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.api.Attribute.AttributeMap; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.netlet.util.DTThrowable; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class CouchBasePOJOTest { private static final Logger logger = LoggerFactory.getLogger(CouchBaseInputOperatorTest.class); @@ -69,7 +71,7 @@ public class CouchBasePOJOTest AttributeMap.DefaultAttributeMap attributeMap = new 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); inputOperator.setOutputClass("com.datatorrent.contrib.couchbase.TestComplexPojoInput"); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java index 407534a..96e07cc 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java @@ -18,7 +18,6 @@ */ package com.datatorrent.contrib.couchdb; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import com.google.common.collect.Maps; @@ -33,6 +32,8 @@ import org.slf4j.LoggerFactory; import java.util.Map; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * @since 0.3.5 */ @@ -67,7 +68,7 @@ public class CouchDBInputOperatorTest CollectorTestSink sink = new CollectorTestSink(); operatorTest.outputPort.setSink(sink); - operatorTest.setup(new OperatorContextTestHelper.TestIdOperatorContext(2)); + operatorTest.setup(mockOperatorContext(2)); operatorTest.beginWindow(0); operatorTest.emitTuples(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java index 96c7e5c..0d5c0a6 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java @@ -29,7 +29,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; /** * Test for {@link MapBasedCouchDbOutputOperator} @@ -52,7 +52,7 @@ public class CouchDBOutputOperatorTest store.setDbName(CouchDBTestHelper.TEST_DB); dbOutputOper.setStore(store); - dbOutputOper.setup(new OperatorContextTestHelper.TestIdOperatorContext(1)); + dbOutputOper.setup(mockOperatorContext(1)); dbOutputOper.beginWindow(0); dbOutputOper.input.process(tuple); dbOutputOper.endWindow(); @@ -93,7 +93,7 @@ public class CouchDBOutputOperatorTest dbOutputOper.setStore(store); String expression = "getId()"; dbOutputOper.setExpressionForDocId(expression); - dbOutputOper.setup(new OperatorContextTestHelper.TestIdOperatorContext(1)); + dbOutputOper.setup(mockOperatorContext(1)); dbOutputOper.beginWindow(0); dbOutputOper.input.process(tuple); dbOutputOper.endWindow(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java index 66d4a80..4b45e4f 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java @@ -26,9 +26,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class CouchDBPOJOInputOperatorTest { @@ -86,7 +87,7 @@ public class CouchDBPOJOInputOperatorTest operatorTest.setViewName(CouchDBTestHelper.TEST_VIEW); operatorTest.setStartKey(testDocumentId1); operatorTest.outputPort.setSink(sink); - operatorTest.setup(new OperatorContextTestHelper.TestIdOperatorContext(2)); + operatorTest.setup(mockOperatorContext(2)); operatorTest.beginWindow(0); operatorTest.emitTuples(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java index 1c1be55..2e0c797 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java @@ -31,9 +31,10 @@ import org.junit.Test; import com.google.common.collect.Maps; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Test for {@link PagedCouchDBInputOperatorTest} * @@ -88,7 +89,7 @@ public class PagedCouchDBInputOperatorTest CollectorTestSink sink = new CollectorTestSink(); operatorTest.outputPort.setSink(sink); operatorTest.setPageSize(5); - operatorTest.setup(new OperatorContextTestHelper.TestIdOperatorContext(3)); + operatorTest.setup(mockOperatorContext(3)); int totalDocsInDb = CouchDBTestHelper.getTotalDocuments(); int rounds = (totalDocsInDb % 5 == 0 ? 0 : 1) + (totalDocsInDb / 5); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java index c49b99e..9dfa80a 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java @@ -25,11 +25,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datatorrent.api.Attribute; -import com.datatorrent.api.Attribute.AttributeMap; -import com.datatorrent.api.Context.OperatorContext; - -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class HBaseCsvMappingPutOperatorTest { private static final Logger logger = LoggerFactory @@ -49,7 +45,7 @@ public class HBaseCsvMappingPutOperatorTest { String s1 = "gillett,santaclara,cali,milindas"; String s2= "aventferry,raleigh,nc,milind"; csvMappingPutOperator.setMappingString("colfam0.street,colfam0.city,colfam0.state,row"); - csvMappingPutOperator.setup(new OperatorContextTestHelper.TestIdOperatorContext(0)); + csvMappingPutOperator.setup(mockOperatorContext(0)); csvMappingPutOperator.beginWindow(0); csvMappingPutOperator.input.process(s); csvMappingPutOperator.input.process(s1); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java index 6aafc11..f615f80 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java @@ -26,11 +26,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datatorrent.api.Attribute; -import com.datatorrent.api.Attribute.AttributeMap; -import com.datatorrent.api.Context.OperatorContext; - -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class HBaseNameValueCsvPutOperatorTest { @@ -50,7 +46,7 @@ public class HBaseNameValueCsvPutOperatorTest String s = "name=milind,st=patrick,ct=fremont,sa=cali"; String s1 = "st=tasman,ct=sancla,name=milinda,sa=cali"; propPutOperator.setMapping("name=row,st=colfam0.street,ct=colfam0.city,sa=colfam0.state"); - propPutOperator.setup(new OperatorContextTestHelper.TestIdOperatorContext(0)); + propPutOperator.setup(mockOperatorContext(0)); propPutOperator.beginWindow(0); propPutOperator.input.process(s); propPutOperator.input.process(s1); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java index 6a2f891..6630e09 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java @@ -19,6 +19,7 @@ package com.datatorrent.contrib.hbase; import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.OPERATOR_ID; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import java.util.ArrayList; import java.util.List; @@ -41,7 +42,6 @@ import com.datatorrent.api.StreamingApplication; import com.datatorrent.contrib.util.TestPOJO; import com.datatorrent.contrib.util.TupleCacheOutputOperator; import com.datatorrent.contrib.util.TupleGenerateCacheOperator; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.FieldInfo.SupportType; import com.datatorrent.lib.util.TableInfo; @@ -198,8 +198,7 @@ public class HBasePOJOInputOperatorTest hbaseInputOperator.setStore(store); hbaseOutputOperator.setStore(store); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, new AttributeMap.DefaultAttributeMap()); + OperatorContext context = mockOperatorContext(OPERATOR_ID, new AttributeMap.DefaultAttributeMap()); hbaseInputOperator.setup(context); hbaseOutputOperator.setup(context); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java index 8c81560..a237201 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java @@ -33,7 +33,6 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.*; import org.apache.hadoop.hbase.util.Bytes; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.FieldInfo.SupportType; import com.datatorrent.lib.util.TableInfo; import com.datatorrent.contrib.util.TestPOJO; @@ -45,6 +44,7 @@ import com.datatorrent.api.Operator.ProcessingMode; import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.APP_ID; import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.OPERATOR_ID; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class HBasePOJOPutOperatorTest @@ -168,8 +168,7 @@ public class HBasePOJOPutOperatorTest attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); operator.setup(context); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java index 02a01a9..c2ebf85 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java @@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory; 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.DAG.Locality; import com.datatorrent.api.DefaultInputPort; @@ -50,11 +51,12 @@ import com.datatorrent.api.Operator; import com.datatorrent.api.Partitioner; import com.datatorrent.common.util.FSStorageAgent; import com.datatorrent.common.util.BaseOperator; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.partitioner.StatelessPartitionerTest; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.stram.StramLocalCluster; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class KafkaInputOperatorTest extends KafkaOperatorTestBase { @@ -381,7 +383,7 @@ public class KafkaInputOperatorTest extends KafkaOperatorTestBase attributeMap.put(Context.DAGContext.APPLICATION_PATH, testMeta.baseDir); - testMeta.context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + testMeta.context = mockOperatorContext(1, attributeMap); testMeta.operator = new KafkaSinglePortStringInputOperator(); KafkaConsumer consumer = new SimpleKafkaConsumer(); @@ -438,7 +440,7 @@ public class KafkaInputOperatorTest extends KafkaOperatorTestBase Attribute.AttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(Context.DAGContext.APPLICATION_PATH, testMeta.baseDir); - Context.OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + OperatorContext context = mockOperatorContext(1, attributeMap); KafkaSinglePortStringInputOperator operator = new KafkaSinglePortStringInputOperator(); KafkaConsumer consumer = new SimpleKafkaConsumer(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java index 63bda70..faffbda 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java @@ -42,9 +42,10 @@ import com.datatorrent.api.DAG.Locality; import com.datatorrent.api.DefaultInputPort; import com.datatorrent.api.LocalMode; import com.datatorrent.common.util.BaseOperator; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class KinesisInputOperatorTest extends KinesisOperatorTestBase { static final org.slf4j.Logger logger = LoggerFactory.getLogger(KinesisInputOperatorTest.class); @@ -233,7 +234,7 @@ public class KinesisInputOperatorTest extends KinesisOperatorTestBase attributeMap.put(Context.OperatorContext.SPIN_MILLIS, 500); attributeMap.put(Context.DAGContext.APPLICATION_PATH, testMeta.baseDir); - testMeta.context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + testMeta.context = mockOperatorContext(1, attributeMap); testMeta.operator = new KinesisStringInputOperator(); KinesisUtil.getInstance().setClient(client); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java index 54c8d93..8ecfda9 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java @@ -19,11 +19,9 @@ package com.datatorrent.contrib.memsql; import com.datatorrent.api.Attribute; -import com.datatorrent.api.Attribute.AttributeMap; import com.datatorrent.api.Context; -import com.datatorrent.api.DAG; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.lib.db.jdbc.JdbcTransactionalStore; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -34,6 +32,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class AbstractMemsqlInputOperatorTest { private static final Logger LOG = LoggerFactory.getLogger(AbstractMemsqlInputOperatorTest.class); @@ -181,7 +181,7 @@ public class AbstractMemsqlInputOperatorTest populateDatabase(createStore(null, true)); Attribute.AttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(Context.OperatorContext.SPIN_MILLIS, 500); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); MemsqlPOJOInputOperator inputOperator = new MemsqlPOJOInputOperator(); createStore((MemsqlStore)inputOperator.getStore(), true); inputOperator.setBatchSize(10); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java index f7d896f..f00ea5d 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java @@ -22,10 +22,12 @@ import com.datatorrent.api.Attribute.AttributeMap; import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.api.Operator.ProcessingMode; + import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.APP_ID; import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.OPERATOR_ID; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + import com.datatorrent.lib.db.jdbc.JdbcTransactionalStore; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -143,7 +145,7 @@ public class AbstractMemsqlOutputOperatorTest attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); outputOperator.setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java index 2d9e2bd..0a7f39e 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java @@ -23,10 +23,11 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import com.mongodb.DBCursor; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * */ @@ -63,7 +64,7 @@ public class MongoDBInputOperatorTest // AttributeMap<DAGContext> attrmap = new DefaultAttributeMap<DAGContext>(); // attrmap.attr(DAG.STRAM_APP_ID).set("myMongoDBInputOperatorAppId"); - oper.setup(new OperatorContextTestHelper.TestIdOperatorContext(1)); + oper.setup(mockOperatorContext(1)); oper.beginWindow(0); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java index 57c1bd8..469fe22 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java @@ -32,10 +32,10 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.datatorrent.lib.helper.OperatorContextTestHelper; - import com.datatorrent.api.DAG; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class MongoDBOutputOperatorTest { private static final Logger logger = LoggerFactory.getLogger(MongoDBOutputOperatorTest.class); @@ -139,7 +139,7 @@ public class MongoDBOutputOperatorTest oper.setQueryFunction(1); oper.setColumnMapping(hashMapping1); - oper.setup(new OperatorContextTestHelper.TestIdOperatorContext(1)); + oper.setup(mockOperatorContext(1)); for (Object o: oper.getTableList()) { String table = (String)o; @@ -178,7 +178,7 @@ public class MongoDBOutputOperatorTest oper.setQueryFunction(1); oper.setColumnMapping(arrayMapping1); - oper.setup(new OperatorContextTestHelper.TestIdOperatorContext(2)); + oper.setup(mockOperatorContext(2)); for (Object o: oper.getTableList()) { String table = (String)o; oper.db.getCollection(table).drop(); @@ -246,7 +246,7 @@ public class MongoDBOutputOperatorTest expressions.add("getAddress().getCity()"); expressions.add("getAddress().getHousenumber()"); oper.setExpressions(expressions); - oper.setup(new OperatorContextTestHelper.TestIdOperatorContext(2)); + oper.setup(mockOperatorContext(2)); for (String table: oper.getTableList()) { logger.debug("table in test is {}", table); oper.db.getCollection(table).drop(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java index a1a26ab..f4e9782 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java @@ -44,9 +44,10 @@ import com.datatorrent.api.Context; import com.datatorrent.api.DAG; import com.datatorrent.contrib.nifi.mock.MockDataPacket; import com.datatorrent.contrib.nifi.mock.MockSiteToSiteClient; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class NiFiSinglePortInputOperatorTest { @@ -68,7 +69,7 @@ public class NiFiSinglePortInputOperatorTest Attribute.AttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_PATH, windowDataDir); - context = new OperatorContextTestHelper.TestIdOperatorContext(12345, attributeMap); + context = mockOperatorContext(12345, attributeMap); sink = new CollectorTestSink<>(); builder = new MockSiteToSiteClient.Builder(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java index 14b1493..461d90f 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java @@ -41,7 +41,8 @@ import com.datatorrent.api.Context; import com.datatorrent.api.DAG; import com.datatorrent.contrib.nifi.mock.MockSiteToSiteClient; import com.datatorrent.contrib.nifi.mock.MockTransaction; -import com.datatorrent.lib.helper.OperatorContextTestHelper; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class NiFiSinglePortOutputOperatorTest { @@ -64,7 +65,7 @@ public class NiFiSinglePortOutputOperatorTest Attribute.AttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap(); attributeMap.put(DAG.APPLICATION_PATH, windowDataDir); - context = new OperatorContextTestHelper.TestIdOperatorContext(12345, attributeMap); + context = mockOperatorContext(12345, attributeMap); windowDataManager = new FSWindowDataManager(); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java b/contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java index 25f76e0..89a9839 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java @@ -49,7 +49,6 @@ import com.datatorrent.api.Context; import com.datatorrent.api.DAG; import com.datatorrent.api.LocalMode; import com.datatorrent.api.StreamingApplication; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.helper.TestPortContext; import com.datatorrent.lib.io.ConsoleOutputOperator; import com.datatorrent.lib.testbench.CollectorTestSink; @@ -66,6 +65,8 @@ import parquet.io.api.RecordConsumer; import parquet.schema.MessageType; import parquet.schema.MessageTypeParser; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class ParquetFilePOJOReaderTest { @@ -92,7 +93,7 @@ public class ParquetFilePOJOReaderTest operAttributes.put(Context.DAGContext.APPLICATION_PATH, dir); Attribute.AttributeMap portAttributes = new Attribute.AttributeMap.DefaultAttributeMap(); portAttributes.put(Context.PortContext.TUPLE_CLASS, EventRecord.class); - context = new OperatorContextTestHelper.TestIdOperatorContext(1, operAttributes); + context = mockOperatorContext(1, operAttributes); portContext = new TestPortContext(portAttributes); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java index ebe4a90..ff8fe24 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java @@ -42,10 +42,11 @@ import com.datatorrent.api.Attribute; import com.datatorrent.api.DAG; import com.datatorrent.api.DAG.Locality; import com.datatorrent.api.LocalMode; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.netlet.util.DTThrowable; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * */ @@ -198,7 +199,7 @@ public class RabbitMQInputOperatorTest CollectorTestSink<Object> sink = new CollectorTestSink<Object>(); operator.outputPort.setSink(sink); - OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + OperatorContext context = mockOperatorContext(1, attributeMap); operator.setup(context); operator.activate(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java index 6dcdfbe..b01bdb7 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java @@ -35,10 +35,11 @@ import com.datatorrent.api.DAG; import com.datatorrent.api.DefaultInputPort; import com.datatorrent.api.LocalMode; import com.datatorrent.common.util.BaseOperator; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.testbench.CollectorTestSink; import com.datatorrent.lib.util.KeyValPair; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class RedisInputOperatorTest { private RedisStore operatorStore; @@ -143,7 +144,7 @@ public class RedisInputOperatorTest CollectorTestSink<Object> sink = new CollectorTestSink<Object>(); operator.outputPort.setSink(sink); - OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap); + OperatorContext context = mockOperatorContext(1, attributeMap); try { operator.setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java index 0957513..708e397 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java @@ -33,11 +33,12 @@ import com.datatorrent.api.DefaultInputPort; import com.datatorrent.api.LocalMode; import com.datatorrent.common.util.BaseOperator; import com.datatorrent.contrib.redis.RedisInputOperatorTest.CollectorModule; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.lib.util.FieldInfo; import com.datatorrent.lib.util.FieldInfo.SupportType; import com.datatorrent.lib.util.KeyValPair; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + public class RedisPOJOOperatorTest { private RedisStore operatorStore; @@ -105,7 +106,7 @@ public class RedisPOJOOperatorTest attributes.put(DAG.APPLICATION_ID, appId); outputOperator.setStore(operatorStore); - outputOperator.setup(new OperatorContextTestHelper.TestIdOperatorContext(operatorId, attributes)); + outputOperator.setup(mockOperatorContext(operatorId, attributes)); outputOperator.beginWindow(101); KeyValPair<String, Object> keyVal = new KeyValPair<String, Object>("test_abc1", new TestClass(1, "abc")); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java index 32a4f39..6d66e9e 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java @@ -21,10 +21,13 @@ package com.datatorrent.contrib.splunk; import com.datatorrent.api.Attribute.AttributeMap; import org.junit.Assert; import org.junit.Test; + +import com.datatorrent.api.Context.OperatorContext; 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; + /** * * Unit test for splunk input operator. The test, queries splunk server for 100 rows and checks @@ -71,7 +74,7 @@ public class SplunkInputOperatorTest AttributeMap.DefaultAttributeMap attributeMap = new 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); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/examples/distributedistinct/src/test/java/org/apache/apex/examples/distributeddistinct/DistributedDistinctTest.java ---------------------------------------------------------------------- diff --git a/examples/distributedistinct/src/test/java/org/apache/apex/examples/distributeddistinct/DistributedDistinctTest.java b/examples/distributedistinct/src/test/java/org/apache/apex/examples/distributeddistinct/DistributedDistinctTest.java index 3ba39d6..5b3cd37 100644 --- a/examples/distributedistinct/src/test/java/org/apache/apex/examples/distributeddistinct/DistributedDistinctTest.java +++ b/examples/distributedistinct/src/test/java/org/apache/apex/examples/distributeddistinct/DistributedDistinctTest.java @@ -38,8 +38,8 @@ import org.slf4j.LoggerFactory; import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.lib.algo.UniqueValueCount.InternalCountOutput; -import com.datatorrent.lib.helper.OperatorContextTestHelper; -import com.datatorrent.lib.helper.OperatorContextTestHelper.TestIdOperatorContext; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; /** * Test for {@link IntegerUniqueValueCountAppender} and {@link UniqueValueCountAppender} @@ -156,7 +156,7 @@ public class DistributedDistinctTest attributes.put(DAG.APPLICATION_PATH, applicationPath); attributes.put(OperatorContext.ACTIVATION_WINDOW_ID, 2L); - valueCounter.setup(new OperatorContextTestHelper.TestIdOperatorContext(0, attributes)); + valueCounter.setup(mockOperatorContext(0, attributes)); ResultSet resultSet = stmt.executeQuery("SELECT col2 FROM " + TABLE_NAME + " WHERE col1 = 2"); ArrayList<Integer> answersAfterClear = new ArrayList<Integer>(); @@ -194,7 +194,7 @@ public class DistributedDistinctTest valueCounter.setTableName(TABLE_NAME); valueCounter.getStore().setDatabaseDriver(INMEM_DB_DRIVER); valueCounter.getStore().setDatabaseUrl(INMEM_DB_URL); - TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributes); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributes); valueCounter.setup(context); } } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java ---------------------------------------------------------------------- diff --git a/hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java b/hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java index 4ec92c9..2e0c5cf 100755 --- a/hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java +++ b/hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java @@ -48,7 +48,8 @@ import com.datatorrent.api.DAG; import com.datatorrent.api.Operator.ProcessingMode; import com.datatorrent.contrib.hive.AbstractFSRollingOutputOperator.FilePartitionMapping; import com.datatorrent.contrib.hive.FSPojoToHiveOperator.FIELD_TYPE; -import com.datatorrent.lib.helper.OperatorContextTestHelper; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; public class HiveMockTest extends HiveTestService { @@ -222,8 +223,7 @@ public class HiveMockTest extends HiveTestService attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); fsRolling.setup(context); hiveOperator.setup(context); @@ -327,8 +327,7 @@ public class HiveMockTest extends HiveTestService attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); fsRolling.setup(context); hiveOperator.setup(context); @@ -417,8 +416,7 @@ public class HiveMockTest extends HiveTestService attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); fsRolling.setup(context); hiveOperator.setup(context); @@ -496,8 +494,7 @@ public class HiveMockTest extends HiveTestService attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); fsRolling.setup(context); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/kafka/src/test/java/org/apache/apex/malhar/kafka/KafkaOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/kafka/src/test/java/org/apache/apex/malhar/kafka/KafkaOutputOperatorTest.java b/kafka/src/test/java/org/apache/apex/malhar/kafka/KafkaOutputOperatorTest.java index 7abf0f8..9a67024 100644 --- a/kafka/src/test/java/org/apache/apex/malhar/kafka/KafkaOutputOperatorTest.java +++ b/kafka/src/test/java/org/apache/apex/malhar/kafka/KafkaOutputOperatorTest.java @@ -37,13 +37,14 @@ import org.apache.kafka.clients.producer.ProducerConfig; 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.DefaultInputPort; import com.datatorrent.api.LocalMode; import com.datatorrent.api.Operator; import com.datatorrent.common.util.BaseOperator; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG; @@ -159,8 +160,7 @@ public class KafkaOutputOperatorTest extends KafkaOperatorTestBase attributeMap.put(Context.DAGContext.APPLICATION_NAME, "MyKafkaApp"); attributeMap.put(DAG.APPLICATION_PATH, APPLICATION_PATH); - OperatorContextTestHelper.TestIdOperatorContext operatorContext = - new OperatorContextTestHelper.TestIdOperatorContext(2, attributeMap); + OperatorContext operatorContext = mockOperatorContext(2, attributeMap); cleanUp(operatorContext); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/pom.xml ---------------------------------------------------------------------- diff --git a/library/pom.xml b/library/pom.xml index c07603f..def0a6e 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -308,18 +308,6 @@ <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> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> <version>${jetty.version}</version> @@ -366,7 +354,7 @@ <artifactId>jackson-databind</artifactId> <version>2.5.4</version> </dependency> - <dependency> + <dependency> <groupId>com.amazonaws</groupId> <artifactId>amazon-sqs-java-messaging-lib</artifactId> <version>1.0.0</version> @@ -376,7 +364,7 @@ <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-sqs</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java b/library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java index 743a8e2..507914e 100644 --- a/library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java +++ b/library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java @@ -41,7 +41,8 @@ import org.apache.commons.io.FileUtils; 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; public class BandwidthManagerTest { @@ -172,7 +173,7 @@ public class BandwidthManagerTest applicationPath = "target/" + description.getClassName() + "/" + description.getMethodName(); Attribute.AttributeMap.DefaultAttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_PATH, applicationPath); - 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/db/KeyValueStoreOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/KeyValueStoreOperatorTest.java b/library/src/test/java/com/datatorrent/lib/db/KeyValueStoreOperatorTest.java index 90e67d6..846519f 100644 --- a/library/src/test/java/com/datatorrent/lib/db/KeyValueStoreOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/KeyValueStoreOperatorTest.java @@ -28,7 +28,8 @@ import com.datatorrent.api.DAG; import com.datatorrent.api.DefaultInputPort; import com.datatorrent.api.LocalMode; import com.datatorrent.common.util.BaseOperator; -import com.datatorrent.lib.helper.OperatorContextTestHelper; + +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; /** * @param <S> @@ -124,7 +125,7 @@ public class KeyValueStoreOperatorTest<S extends KeyValueStore> com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributes = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap(); attributes.put(DAG.APPLICATION_ID, "test_appid"); outputOperator.setStore(operatorStore); - outputOperator.setup(new OperatorContextTestHelper.TestIdOperatorContext(0, attributes)); + outputOperator.setup(mockOperatorContext(0, attributes)); outputOperator.beginWindow(100); Map<String, String> m = new HashMap<String, String>(); m.put("test_abc", "123"); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java b/library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java index d37863d..c2e961a 100644 --- a/library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java @@ -26,7 +26,7 @@ import org.junit.Assert; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; /** * @param <S> @@ -63,7 +63,7 @@ public class TransactionableKeyValueStoreOperatorTest<S extends TransactionableK try { testStore.connect(); outputOperator.setStore(operatorStore); - outputOperator.setup(new OperatorContextTestHelper.TestIdOperatorContext(operatorId, attributes)); + outputOperator.setup(mockOperatorContext(operatorId, attributes)); outputOperator.beginWindow(100); Map<String, String> m = new HashMap<String, String>(); m.put("test_abc", "123"); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java index 46f49e2..0a65f30 100644 --- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java @@ -40,10 +40,11 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Maps; -import com.datatorrent.api.Context; -import com.datatorrent.lib.helper.OperatorContextTestHelper; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.lib.testbench.CollectorTestSink; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Test for {@link JDBCLookupCacheBackedOperator} */ @@ -194,7 +195,7 @@ public class JDBCLookupCacheBackedOperatorTest lookupCacheBackedOperator.output.setSink(sink); - Context.OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(7); + OperatorContext context = mockOperatorContext(7); lookupCacheBackedOperator.setup(context); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java index 63c75ef..5e1a2b8 100644 --- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java @@ -37,7 +37,6 @@ import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; import com.datatorrent.api.Operator.ProcessingMode; import com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.TestEvent; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.netlet.util.DTThrowable; import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.APP_ID; @@ -45,6 +44,7 @@ import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.TABLE_NAME; import static com.datatorrent.lib.db.jdbc.JdbcOperatorTest.DB_DRIVER; import static com.datatorrent.lib.db.jdbc.JdbcOperatorTest.URL; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; /** * Test for {@link AbstractJdbcNonTransactionableBatchOutputOperator} @@ -128,7 +128,7 @@ public class JdbcNonTransactionalBatchOutputOperatorTest attributeMap.put(OperatorContext.PROCESSING_MODE, processingMode); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, -1L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); outputOperator.setStore(store); outputOperator.setBatchSize(BATCH_SIZE); @@ -222,7 +222,7 @@ public class JdbcNonTransactionalBatchOutputOperatorTest attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, 0L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); outputOperator.setup(context); Assert.assertEquals("Commit window id ", 0, outputOperator.getStore().getCommittedWindowId(APP_ID, OPERATOR_ID)); @@ -292,8 +292,7 @@ public class JdbcNonTransactionalBatchOutputOperatorTest attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_LEAST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, 0L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext( - OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); outputOperator.setup(context); @@ -363,7 +362,7 @@ public class JdbcNonTransactionalBatchOutputOperatorTest attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_MOST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, 0L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); outputOperator.setup(context); outputOperator.beginWindow(2); @@ -417,7 +416,7 @@ public class JdbcNonTransactionalBatchOutputOperatorTest attributeMap.put(OperatorContext.PROCESSING_MODE, ProcessingMode.AT_MOST_ONCE); attributeMap.put(OperatorContext.ACTIVATION_WINDOW_ID, 0L); attributeMap.put(DAG.APPLICATION_ID, APP_ID); - OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap); + OperatorContext context = mockOperatorContext(OPERATOR_ID, attributeMap); outputOperator.setup(context); Assert.assertEquals("Commit window id ", 0, outputOperator.getStore().getCommittedWindowId(APP_ID, OPERATOR_ID)); http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/7f1abca7/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java index 3ad6c08..f41698c 100644 --- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java @@ -32,10 +32,12 @@ import org.junit.Test; import com.google.common.collect.Lists; +import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.DAG; -import com.datatorrent.lib.helper.OperatorContextTestHelper; import com.datatorrent.netlet.util.DTThrowable; +import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext; + /** * Test for {@link AbstractJdbcNonTransactionableOutputOperator Operator} */ @@ -138,8 +140,7 @@ public class JdbcNonTransactionalOutputOperatorTest 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); outputOperator.setStore(store); outputOperator.setup(context);
