APEX-162 Remove warnings and redundant storage agent attributes from tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/265e9088 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/265e9088 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/265e9088 Branch: refs/heads/feature-module Commit: 265e9088d2a3a4776cb8c7a1d2d1f35e561eb63b Parents: 14f5269 Author: Thomas Weise Authored: Tue Oct 13 19:05:47 2015 -0700 Committer: Thomas Weise Committed: Tue Oct 13 19:05:47 2015 -0700 ---------------------------------------------------------------------- .../test/java/com/datatorrent/stram/StramLocalClusterTest.java | 2 -- .../com/datatorrent/stram/StreamingContainerManagerTest.java | 6 ------ .../test/java/com/datatorrent/stram/engine/AutoMetricTest.java | 2 -- .../java/com/datatorrent/stram/engine/ProcessingModeTests.java | 4 ---- 4 files changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/265e9088/engine/src/test/java/com/datatorrent/stram/StramLocalClusterTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/StramLocalClusterTest.java b/engine/src/test/java/com/datatorrent/stram/StramLocalClusterTest.java index aaf92b8..53d6f31 100644 --- a/engine/src/test/java/com/datatorrent/stram/StramLocalClusterTest.java +++ b/engine/src/test/java/com/datatorrent/stram/StramLocalClusterTest.java @@ -69,8 +69,6 @@ public class StramLocalClusterTest @Test public void testLocalClusterInitShutdown() throws Exception { - dag.setAttribute(OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); - TestGeneratorInputOperator genNode = dag.addOperator("genNode", TestGeneratorInputOperator.class); genNode.setMaxTuples(2); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/265e9088/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java index b257632..295bcde 100644 --- a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java +++ b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java @@ -18,14 +18,12 @@ */ package com.datatorrent.stram; -import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; import java.util.*; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.commons.io.FileUtils; import org.apache.hadoop.io.DataInputByteBuffer; import org.apache.hadoop.io.DataOutputByteBuffer; import org.junit.Assert; @@ -35,7 +33,6 @@ import org.junit.Test; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.datatorrent.api.Context; import com.datatorrent.api.Context.OperatorContext; import com.datatorrent.api.Context.PortContext; import com.datatorrent.api.DAG.Locality; @@ -796,7 +793,6 @@ public class StreamingContainerManagerTest @Test public void testPhysicalPropertyUpdate() throws Exception { - dag.setAttribute(Context.OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); TestGeneratorInputOperator o1 = dag.addOperator("o1", TestGeneratorInputOperator.class); GenericTestOperator o2 = dag.addOperator("o2", GenericTestOperator.class); dag.addStream("o1.outport", o1.outport, o2.inport1); @@ -837,7 +833,6 @@ public class StreamingContainerManagerTest private void testAppDataSources(boolean appendQIDToTopic) throws Exception { - dag.setAttribute(OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); StramLocalCluster lc = new StramLocalCluster(dag); lc.runAsync(); StreamingContainerManager dnmgr = lc.dnmgr; @@ -910,7 +905,6 @@ public class StreamingContainerManagerTest try { server.start(); int port = server.getPort(); - dag.setAttribute(OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); TestGeneratorInputOperator o1 = dag.addOperator("o1", TestGeneratorInputOperator.class); GenericTestOperator o2 = dag.addOperator("o2", GenericTestOperator.class); dag.addStream("o1.outport", o1.outport, o2.inport1); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/265e9088/engine/src/test/java/com/datatorrent/stram/engine/AutoMetricTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/engine/AutoMetricTest.java b/engine/src/test/java/com/datatorrent/stram/engine/AutoMetricTest.java index f6451c9..28e2e51 100644 --- a/engine/src/test/java/com/datatorrent/stram/engine/AutoMetricTest.java +++ b/engine/src/test/java/com/datatorrent/stram/engine/AutoMetricTest.java @@ -194,14 +194,12 @@ public class AutoMetricTest @SuppressWarnings("SleepWhileInLoop") public void testMetricPropagation() throws Exception { - dag.setAttribute(OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); dag.getAttributes().put(LogicalPlan.STREAMING_WINDOW_SIZE_MILLIS, 300); dag.getAttributes().put(LogicalPlan.CONTAINERS_MAX_COUNT, 1); TestOperator testOper = dag.addOperator("TestOperator", TestOperator.class); TestStatsListener sl = new TestStatsListener(); dag.setAttribute(testOper, OperatorContext.STATS_LISTENERS, Lists.newArrayList((StatsListener)sl)); - //dag.setAttribute(testOper, OperatorContext.INITIAL_PARTITION_COUNT, 1); GenericTestOperator collector = dag.addOperator("Collector", new GenericTestOperator()); dag.addStream("TestTuples", testOper.outport, collector.inport1).setLocality(Locality.CONTAINER_LOCAL); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/265e9088/engine/src/test/java/com/datatorrent/stram/engine/ProcessingModeTests.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/engine/ProcessingModeTests.java b/engine/src/test/java/com/datatorrent/stram/engine/ProcessingModeTests.java index 6df4e94..fa36fec 100644 --- a/engine/src/test/java/com/datatorrent/stram/engine/ProcessingModeTests.java +++ b/engine/src/test/java/com/datatorrent/stram/engine/ProcessingModeTests.java @@ -18,7 +18,6 @@ */ package com.datatorrent.stram.engine; -import com.datatorrent.common.util.AsyncFSStorageAgent; import com.datatorrent.common.util.BaseOperator; import java.io.IOException; @@ -88,7 +87,6 @@ public class ProcessingModeTests dag.getAttributes().put(LogicalPlan.CHECKPOINT_WINDOW_COUNT, 2); dag.getAttributes().put(LogicalPlan.STREAMING_WINDOW_SIZE_MILLIS, 300); dag.getAttributes().put(LogicalPlan.CONTAINERS_MAX_COUNT, 1); - dag.setAttribute(OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); RecoverableInputOperator rip = dag.addOperator("LongGenerator", RecoverableInputOperator.class); rip.setMaximumTuples(maxTuples); rip.setSimulateFailure(true); @@ -110,7 +108,6 @@ public class ProcessingModeTests CollectorOperator.collection.clear(); CollectorOperator.duplicates.clear(); - dag.setAttribute(OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); dag.getAttributes().put(LogicalPlan.CHECKPOINT_WINDOW_COUNT, 2); dag.getAttributes().put(LogicalPlan.STREAMING_WINDOW_SIZE_MILLIS, 300); dag.getAttributes().put(LogicalPlan.CONTAINERS_MAX_COUNT, 1); @@ -134,7 +131,6 @@ public class ProcessingModeTests CollectorOperator.collection.clear(); CollectorOperator.duplicates.clear(); - dag.setAttribute(OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.getPath(), null)); dag.getAttributes().put(LogicalPlan.CHECKPOINT_WINDOW_COUNT, 2); dag.getAttributes().put(LogicalPlan.STREAMING_WINDOW_SIZE_MILLIS, 300); dag.getAttributes().put(LogicalPlan.CONTAINERS_MAX_COUNT, 1);