Repository: flink Updated Branches: refs/heads/master e93e0cb86 -> 7167218fe
Quick fix to fix compile error due to change class name of MultipleProgramsTestBase.TextExecutionMode in GroupCombineITCase. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7167218f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7167218f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7167218f Branch: refs/heads/master Commit: 7167218fee020bd8d426feb676a65b88412b560f Parents: e93e0cb Author: Henry Saputra <[email protected]> Authored: Wed Mar 18 13:22:43 2015 -0700 Committer: Henry Saputra <[email protected]> Committed: Wed Mar 18 13:26:52 2015 -0700 ---------------------------------------------------------------------- .../flink/test/javaApiOperators/GroupCombineITCase.java | 6 ++---- .../apache/flink/api/scala/operators/GroupCombineITCase.scala | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7167218f/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupCombineITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupCombineITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupCombineITCase.java index 0808389..494f354 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupCombineITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupCombineITCase.java @@ -43,8 +43,6 @@ import org.junit.runners.Parameterized; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; -import java.util.List; @SuppressWarnings("serial") @@ -58,7 +56,7 @@ import java.util.List; */ public class GroupCombineITCase extends MultipleProgramsTestBase { - public GroupCombineITCase(ExecutionMode mode) { + public GroupCombineITCase(TestExecutionMode mode) { super(mode); } @@ -276,7 +274,7 @@ public class GroupCombineITCase extends MultipleProgramsTestBase { // check if no shuffle is being executed public void testCheckPartitionShuffleGroupBy() throws Exception { - org.junit.Assume.assumeTrue(mode != ExecutionMode.COLLECTION); + org.junit.Assume.assumeTrue(mode != TestExecutionMode.COLLECTION); final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment(); http://git-wip-us.apache.org/repos/asf/flink/blob/7167218f/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/GroupCombineITCase.scala ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/GroupCombineITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/GroupCombineITCase.scala index 05346ba..0aa361c 100644 --- a/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/GroupCombineITCase.scala +++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/GroupCombineITCase.scala @@ -22,11 +22,10 @@ import org.apache.flink.api.java.io.DiscardingOutputFormat import org.apache.flink.api.scala.ExecutionEnvironment import org.apache.flink.api.scala.util.CollectionDataSets import org.apache.flink.test.javaApiOperators.GroupCombineITCase -import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode -import org.apache.flink.test.util.{MultipleProgramsTestBase} +import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode +import org.apache.flink.test.util.MultipleProgramsTestBase import org.apache.flink.util.Collector import org.junit._ -import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith import org.junit.runners.Parameterized import org.apache.flink.api.scala._ @@ -35,7 +34,7 @@ import org.apache.flink.api.scala._ * Java interoperability tests. Main tests are in GroupCombineITCase Java. */ @RunWith(classOf[Parameterized]) -class GroupCombineITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) { +class GroupCombineITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) { @Test def testApi(): Unit = {
