http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/state/ManualWindowSpeedITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/ManualWindowSpeedITCase.java b/flink-tests/src/test/java/org/apache/flink/test/state/ManualWindowSpeedITCase.java index eddc0a8..d65c323 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/state/ManualWindowSpeedITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/state/ManualWindowSpeedITCase.java @@ -28,7 +28,7 @@ import org.apache.flink.streaming.api.TimeCharacteristic; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.ParallelSourceFunction; import org.apache.flink.streaming.api.windowing.time.Time; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.junit.Ignore; import org.junit.Rule; @@ -49,7 +49,7 @@ import java.util.Random; * been processed in each window. This gives an estimate of the throughput. */ @Ignore -public class ManualWindowSpeedITCase extends StreamingMultipleProgramsTestBase { +public class ManualWindowSpeedITCase extends AbstractTestBase { @Rule public TemporaryFolder tempFolder = new TemporaryFolder();
http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/api/StreamingOperatorsITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/api/StreamingOperatorsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/api/StreamingOperatorsITCase.java index 8a910d9..1858689 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/api/StreamingOperatorsITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/api/StreamingOperatorsITCase.java @@ -34,7 +34,7 @@ import org.apache.flink.streaming.api.functions.async.ResultFuture; import org.apache.flink.streaming.api.functions.async.RichAsyncFunction; import org.apache.flink.streaming.api.functions.sink.SinkFunction; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.apache.flink.util.MathUtils; @@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit; /** * Integration tests for streaming operators. */ -public class StreamingOperatorsITCase extends StreamingMultipleProgramsTestBase { +public class StreamingOperatorsITCase extends AbstractTestBase { /** * Tests the proper functioning of the streaming fold operator. For this purpose, a stream http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/ChainedRuntimeContextITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/ChainedRuntimeContextITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/ChainedRuntimeContextITCase.java index 92ec748..73e8a03 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/ChainedRuntimeContextITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/ChainedRuntimeContextITCase.java @@ -23,7 +23,7 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.sink.DiscardingSink; import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotEquals; * Test creation of context for chained streaming operators. */ @SuppressWarnings("serial") -public class ChainedRuntimeContextITCase extends StreamingMultipleProgramsTestBase { +public class ChainedRuntimeContextITCase extends AbstractTestBase { private static RuntimeContext srcContext; private static RuntimeContext mapContext; http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoGroupJoinITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoGroupJoinITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoGroupJoinITCase.java index 74f84c4..dd0c59a 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoGroupJoinITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoGroupJoinITCase.java @@ -37,7 +37,7 @@ import org.apache.flink.streaming.api.windowing.assigners.TumblingEventTimeWindo import org.apache.flink.streaming.api.windowing.time.Time; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.junit.Assert; @@ -53,7 +53,7 @@ import java.util.concurrent.TimeUnit; * Integration tests for windowed join / coGroup operators. */ @SuppressWarnings("serial") -public class CoGroupJoinITCase extends StreamingMultipleProgramsTestBase { +public class CoGroupJoinITCase extends AbstractTestBase { private static List<String> testResults; http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoStreamITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoStreamITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoStreamITCase.java index 178363d..1359fb4 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoStreamITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/CoStreamITCase.java @@ -24,8 +24,8 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.co.CoFlatMapFunction; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.test.streaming.runtime.util.TestListResultSink; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; * Integration tests for co-streams. */ @SuppressWarnings("serial") -public class CoStreamITCase extends StreamingMultipleProgramsTestBase { +public class CoStreamITCase extends AbstractTestBase { @Test public void test() throws Exception { http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DataStreamPojoITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DataStreamPojoITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DataStreamPojoITCase.java index 8a18ff3..748e906 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DataStreamPojoITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DataStreamPojoITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.junit.Test; @@ -34,7 +34,7 @@ import java.util.List; * * <p>See FLINK-3697 */ -public class DataStreamPojoITCase extends StreamingMultipleProgramsTestBase { +public class DataStreamPojoITCase extends AbstractTestBase { static List<Data> elements = new ArrayList<>(); static { elements.add(new Data(0, 0, 0)); http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DirectedOutputITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DirectedOutputITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DirectedOutputITCase.java index 15901da..c50e708 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DirectedOutputITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/DirectedOutputITCase.java @@ -20,8 +20,8 @@ package org.apache.flink.test.streaming.runtime; import org.apache.flink.streaming.api.collector.selector.OutputSelector; import org.apache.flink.streaming.api.datastream.SplitStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.test.streaming.runtime.util.TestListResultSink; +import org.apache.flink.test.util.AbstractTestBase; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; /** * Integration tests for a streaming {@link OutputSelector}. */ -public class DirectedOutputITCase extends StreamingMultipleProgramsTestBase { +public class DirectedOutputITCase extends AbstractTestBase { private static final String TEN = "ten"; private static final String ODD = "odd"; http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IterateITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IterateITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IterateITCase.java index 0f6b2bc..8edbe73 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IterateITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IterateITCase.java @@ -42,10 +42,10 @@ import org.apache.flink.streaming.runtime.partitioner.BroadcastPartitioner; import org.apache.flink.streaming.runtime.partitioner.ForwardPartitioner; import org.apache.flink.streaming.runtime.partitioner.RebalancePartitioner; import org.apache.flink.streaming.runtime.partitioner.ShufflePartitioner; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.test.streaming.runtime.util.EvenOddOutputSelector; import org.apache.flink.test.streaming.runtime.util.NoOpIntMap; import org.apache.flink.test.streaming.runtime.util.ReceiveCheckNoOpSink; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.apache.flink.util.MathUtils; @@ -66,12 +66,14 @@ import static org.junit.Assert.fail; * Tests for streaming iterations. */ @SuppressWarnings({ "unchecked", "unused", "serial" }) -public class IterateITCase extends StreamingMultipleProgramsTestBase { +public class IterateITCase extends AbstractTestBase { private static final Logger LOG = LoggerFactory.getLogger(IterateITCase.class); private static boolean[] iterated; + private int parallelism = miniClusterResource.getNumberSlots(); + @Test(expected = UnsupportedOperationException.class) public void testIncorrectParallelism() throws Exception { @@ -109,7 +111,7 @@ public class IterateITCase extends StreamingMultipleProgramsTestBase { IterativeStream<Integer> iter1 = source.iterate(); - iter1.closeWith(iter1.map(noOpIntMap).setParallelism(DEFAULT_PARALLELISM / 2)); + iter1.closeWith(iter1.map(noOpIntMap).setParallelism(parallelism / 2)); } @@ -124,7 +126,7 @@ public class IterateITCase extends StreamingMultipleProgramsTestBase { ConnectedIterativeStreams<Integer, Integer> coIter = source.iterate().withFeedbackType( Integer.class); - coIter.closeWith(coIter.map(noOpIntCoMap).setParallelism(DEFAULT_PARALLELISM / 2)); + coIter.closeWith(coIter.map(noOpIntCoMap).setParallelism(parallelism / 2)); } @@ -213,9 +215,9 @@ public class IterateITCase extends StreamingMultipleProgramsTestBase { IterativeStream<Integer> iter1 = source1.union(source2).iterate(); - DataStream<Integer> head1 = iter1.map(noOpIntMap).name("IterRebalanceMap").setParallelism(DEFAULT_PARALLELISM / 2); + DataStream<Integer> head1 = iter1.map(noOpIntMap).name("IterRebalanceMap").setParallelism(parallelism / 2); DataStream<Integer> head2 = iter1.map(noOpIntMap).name("IterForwardMap"); - DataStreamSink<Integer> head3 = iter1.map(noOpIntMap).setParallelism(DEFAULT_PARALLELISM / 2).addSink(new ReceiveCheckNoOpSink<Integer>()); + DataStreamSink<Integer> head3 = iter1.map(noOpIntMap).setParallelism(parallelism / 2).addSink(new ReceiveCheckNoOpSink<Integer>()); DataStreamSink<Integer> head4 = iter1.map(noOpIntMap).addSink(new ReceiveCheckNoOpSink<Integer>()); SplitStream<Integer> source3 = env.fromElements(1, 2, 3, 4, 5) @@ -296,9 +298,9 @@ public class IterateITCase extends StreamingMultipleProgramsTestBase { DataStream<Integer> head1 = iter1.map(noOpIntMap).name("map1"); DataStream<Integer> head2 = iter1.map(noOpIntMap) - .setParallelism(DEFAULT_PARALLELISM / 2) + .setParallelism(parallelism / 2) .name("shuffle").rebalance(); - DataStreamSink<Integer> head3 = iter1.map(noOpIntMap).setParallelism(DEFAULT_PARALLELISM / 2) + DataStreamSink<Integer> head3 = iter1.map(noOpIntMap).setParallelism(parallelism / 2) .addSink(new ReceiveCheckNoOpSink<Integer>()); DataStreamSink<Integer> head4 = iter1.map(noOpIntMap).addSink(new ReceiveCheckNoOpSink<Integer>()); @@ -376,9 +378,9 @@ public class IterateITCase extends StreamingMultipleProgramsTestBase { for (int numRetry = 0; numRetry < numRetries; numRetry++) { try { StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); - iterated = new boolean[DEFAULT_PARALLELISM]; + iterated = new boolean[parallelism]; - DataStream<Boolean> source = env.fromCollection(Collections.nCopies(DEFAULT_PARALLELISM * 2, false)) + DataStream<Boolean> source = env.fromCollection(Collections.nCopies(parallelism * 2, false)) .map(noOpBoolMap).name("ParallelizeMap"); IterativeStream<Boolean> iteration = source.iterate(3000 * timeoutScale); @@ -517,7 +519,7 @@ public class IterateITCase extends StreamingMultipleProgramsTestBase { for (int numRetry = 0; numRetry < numRetries; numRetry++) { try { StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); - env.setParallelism(DEFAULT_PARALLELISM - 1); + env.setParallelism(parallelism - 1); env.getConfig().setMaxParallelism(env.getParallelism()); KeySelector<Integer, Integer> key = new KeySelector<Integer, Integer>() { @@ -586,7 +588,7 @@ public class IterateITCase extends StreamingMultipleProgramsTestBase { env.enableCheckpointing(); - DataStream<Boolean> source = env.fromCollection(Collections.nCopies(DEFAULT_PARALLELISM * 2, false)) + DataStream<Boolean> source = env.fromCollection(Collections.nCopies(parallelism * 2, false)) .map(noOpBoolMap).name("ParallelizeMap"); IterativeStream<Boolean> iteration = source.iterate(3000 * timeoutScale); http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/OutputSplitterITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/OutputSplitterITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/OutputSplitterITCase.java index 988e721..0a509b9 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/OutputSplitterITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/OutputSplitterITCase.java @@ -20,8 +20,8 @@ package org.apache.flink.test.streaming.runtime; import org.apache.flink.streaming.api.collector.selector.OutputSelector; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.test.streaming.runtime.util.TestListResultSink; +import org.apache.flink.test.util.AbstractTestBase; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; /** * Integration tests for a streaming {@link OutputSelector}. */ -public class OutputSplitterITCase extends StreamingMultipleProgramsTestBase { +public class OutputSplitterITCase extends AbstractTestBase { private static ArrayList<Integer> expectedSplitterResult = new ArrayList<Integer>(); http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java index 92d268e..23fc2eb 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java @@ -26,9 +26,9 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.Configuration; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.test.streaming.runtime.util.NoOpIntMap; import org.apache.flink.test.streaming.runtime.util.TestListResultSink; +import org.apache.flink.test.util.AbstractTestBase; import org.junit.Test; @@ -45,7 +45,7 @@ import static org.junit.Assert.fail; * IT case that tests the different stream partitioning schemes. */ @SuppressWarnings("serial") -public class PartitionerITCase extends StreamingMultipleProgramsTestBase { +public class PartitionerITCase extends AbstractTestBase { @Test(expected = UnsupportedOperationException.class) public void testForwardFailsLowToHighParallelism() throws Exception { http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SelfConnectionITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SelfConnectionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SelfConnectionITCase.java index 1a49aef..b302513 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SelfConnectionITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SelfConnectionITCase.java @@ -23,8 +23,8 @@ import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.co.CoMapFunction; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.test.streaming.runtime.util.TestListResultSink; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; /** * Integration tests for connected streams. */ -public class SelfConnectionITCase extends StreamingMultipleProgramsTestBase { +public class SelfConnectionITCase extends AbstractTestBase { /** * We connect two different data streams in a chain to a CoMap. http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SideOutputITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SideOutputITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SideOutputITCase.java index 1b07dbd..29f2c8c 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SideOutputITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SideOutputITCase.java @@ -39,8 +39,8 @@ import org.apache.flink.streaming.api.watermark.Watermark; import org.apache.flink.streaming.api.windowing.time.Time; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; import org.apache.flink.test.streaming.runtime.util.TestListResultSink; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.apache.flink.util.OutputTag; @@ -61,7 +61,7 @@ import static org.junit.Assert.assertEquals; /** * Integration test for streaming programs using side outputs. */ -public class SideOutputITCase extends StreamingMultipleProgramsTestBase implements Serializable { +public class SideOutputITCase extends AbstractTestBase implements Serializable { @Rule public transient ExpectedException expectedException = ExpectedException.none(); http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StateBackendITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StateBackendITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StateBackendITCase.java index f5c769d..ad0968a 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StateBackendITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StateBackendITCase.java @@ -34,7 +34,7 @@ import org.apache.flink.runtime.state.CheckpointStreamFactory; import org.apache.flink.runtime.state.KeyGroupRange; import org.apache.flink.runtime.state.OperatorStateBackend; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.junit.Assert.fail; /** * Integration tests for {@link OperatorStateBackend}. */ -public class StateBackendITCase extends StreamingMultipleProgramsTestBase { +public class StateBackendITCase extends AbstractTestBase { /** * Verify that the user-specified state backend is used even if checkpointing is disabled. http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StreamTaskTimerITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StreamTaskTimerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StreamTaskTimerITCase.java index cb31f2b..b87f486 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StreamTaskTimerITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/StreamTaskTimerITCase.java @@ -32,7 +32,7 @@ import org.apache.flink.streaming.api.watermark.Watermark; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.streaming.runtime.tasks.ProcessingTimeCallback; import org.apache.flink.streaming.runtime.tasks.TimerException; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.junit.Assert; import org.junit.Test; @@ -50,7 +50,7 @@ import java.util.concurrent.Semaphore; * the task thread and that operator methods are not invoked concurrently. */ @RunWith(Parameterized.class) -public class StreamTaskTimerITCase extends StreamingMultipleProgramsTestBase { +public class StreamTaskTimerITCase extends AbstractTestBase { private final TimeCharacteristic timeCharacteristic; http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/WindowFoldITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/WindowFoldITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/WindowFoldITCase.java index b347c16..52ee73d 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/WindowFoldITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/WindowFoldITCase.java @@ -33,7 +33,7 @@ import org.apache.flink.streaming.api.watermark.Watermark; import org.apache.flink.streaming.api.windowing.assigners.TumblingEventTimeWindows; import org.apache.flink.streaming.api.windowing.time.Time; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.junit.Assert; @@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit; * work for windows, because FoldWindowFunction is OutputTypeConfigurable. */ @SuppressWarnings("serial") -public class WindowFoldITCase extends StreamingMultipleProgramsTestBase { +public class WindowFoldITCase extends AbstractTestBase { private static List<String> testResults; http://git-wip-us.apache.org/repos/asf/flink/blob/b90210e3/flink-tests/src/test/java/org/apache/flink/test/windowing/sessionwindows/SessionWindowITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/windowing/sessionwindows/SessionWindowITCase.java b/flink-tests/src/test/java/org/apache/flink/test/windowing/sessionwindows/SessionWindowITCase.java index 494b8d6..dd94334 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/windowing/sessionwindows/SessionWindowITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/windowing/sessionwindows/SessionWindowITCase.java @@ -32,7 +32,7 @@ import org.apache.flink.streaming.api.windowing.time.Time; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.PurgingTrigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; +import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.junit.Assert; @@ -47,7 +47,7 @@ import java.util.Set; /** * ITCase for Session Windows. */ -public class SessionWindowITCase extends StreamingMultipleProgramsTestBase { +public class SessionWindowITCase extends AbstractTestBase { // seed for the pseudo random engine of this test private static final long RANDOM_SEED = 1234567;
