[FLINK-1671] [tests] Rename "ExecutionMode" in MultiProgramTestBase t…

…o "TestExecutionMode" ... to avoid name clashes with the program execution mode.
VonRosenchild · Mar 17, 2015 · 4782770 · 4782770
1 parent 361c90a
commit 4782770
Show file tree

Hide file tree

Showing 69 changed files with 159 additions and 119 deletions.
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroPojoTest.java b/flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroPojoTest.java
@@ -43,7 +43,7 @@
 
 @RunWith(Parameterized.class)
 public class AvroPojoTest extends MultipleProgramsTestBase {
- public AvroPojoTest(ExecutionMode mode) {
+ public AvroPojoTest(TestExecutionMode mode) {
  super(mode);
  }
 

diff --git a/...xpressions/src/test/scala/org/apache/flink/api/scala/expressions/AggregationsITCase.scala b/...xpressions/src/test/scala/org/apache/flink/api/scala/expressions/AggregationsITCase.scala
@@ -23,14 +23,14 @@ import org.apache.flink.api.scala._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(classOf[Parameterized])
-class AggregationsITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/...ng/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/AsITCase.scala b/...ng/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/AsITCase.scala
@@ -24,7 +24,7 @@ import org.apache.flink.api.scala._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
@@ -33,7 +33,7 @@ import org.junit.runners.Parameterized
 import scala.collection.JavaConverters._
 
 @RunWith(classOf[Parameterized])
-class AsITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class AsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/...ink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/CastingITCase.scala b/...ink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/CastingITCase.scala
@@ -23,14 +23,14 @@ import org.apache.flink.api.scala._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(classOf[Parameterized])
-class CastingITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class CastingITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/...expressions/src/test/scala/org/apache/flink/api/scala/expressions/ExpressionsITCase.scala b/...expressions/src/test/scala/org/apache/flink/api/scala/expressions/ExpressionsITCase.scala
@@ -22,14 +22,14 @@ import org.apache.flink.api.expressions.ExpressionException
 import org.apache.flink.api.scala._
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(classOf[Parameterized])
-class ExpressionsITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class ExpressionsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/...link-expressions/src/test/scala/org/apache/flink/api/scala/expressions/FilterITCase.scala b/...link-expressions/src/test/scala/org/apache/flink/api/scala/expressions/FilterITCase.scala
@@ -23,15 +23,15 @@ import org.apache.flink.api.scala._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import org.junit._
 
 
 @RunWith(classOf[Parameterized])
-class FilterITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class FilterITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = null
  private val _tempFolder = new TemporaryFolder()

diff --git a/...ns/src/test/scala/org/apache/flink/api/scala/expressions/GroupedAggreagationsITCase.scala b/...ns/src/test/scala/org/apache/flink/api/scala/expressions/GroupedAggreagationsITCase.scala
@@ -23,14 +23,14 @@ import org.apache.flink.api.scala._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(classOf[Parameterized])
-class GroupedAggreagationsITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class GroupedAggreagationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/.../flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/JoinITCase.scala b/.../flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/JoinITCase.scala
@@ -24,14 +24,14 @@ import org.apache.flink.api.scala._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(classOf[Parameterized])
-class JoinITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class JoinITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/...link-expressions/src/test/scala/org/apache/flink/api/scala/expressions/SelectITCase.scala b/...link-expressions/src/test/scala/org/apache/flink/api/scala/expressions/SelectITCase.scala
@@ -23,14 +23,14 @@ import org.apache.flink.api.scala._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(classOf[Parameterized])
-class SelectITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class SelectITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/...sions/src/test/scala/org/apache/flink/api/scala/expressions/StringExpressionsITCase.scala b/...sions/src/test/scala/org/apache/flink/api/scala/expressions/StringExpressionsITCase.scala
@@ -22,14 +22,14 @@ import org.apache.flink.api.expressions.ExpressionException
 import org.apache.flink.api.scala._
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
-import org.apache.flink.test.util.MultipleProgramsTestBase.ExecutionMode
+import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
 import org.junit._
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(classOf[Parameterized])
-class StringExpressionsITCase(mode: ExecutionMode) extends MultipleProgramsTestBase(mode) {
+class StringExpressionsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) {
  private var resultPath: String = null
  private var expected: String = ""
  private val _tempFolder = new TemporaryFolder()

diff --git a/...-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/WeaklyConnectedITCase.java b/...-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/WeaklyConnectedITCase.java
@@ -32,7 +32,7 @@
 @RunWith(Parameterized.class)
 public class WeaklyConnectedITCase extends MultipleProgramsTestBase {
 
- public WeaklyConnectedITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public WeaklyConnectedITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...elly/src/test/java/org/apache/flink/graph/test/example/LabelPropagationExampleITCase.java b/...elly/src/test/java/org/apache/flink/graph/test/example/LabelPropagationExampleITCase.java
@@ -35,7 +35,7 @@
 @RunWith(Parameterized.class)
 public class LabelPropagationExampleITCase extends MultipleProgramsTestBase {
 
- public LabelPropagationExampleITCase(ExecutionMode mode){
+ public LabelPropagationExampleITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...ly/src/test/java/org/apache/flink/graph/test/example/SingleSourceShortestPathsITCase.java b/...ly/src/test/java/org/apache/flink/graph/test/example/SingleSourceShortestPathsITCase.java
@@ -47,7 +47,7 @@ public class SingleSourceShortestPathsITCase extends MultipleProgramsTestBase {
  @Rule
  public TemporaryFolder tempFolder = new TemporaryFolder();
 
- public SingleSourceShortestPathsITCase(ExecutionMode mode) {
+ public SingleSourceShortestPathsITCase(TestExecutionMode mode) {
  super(mode);
  }
 

diff --git a/...aging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/DegreesITCase.java b/...aging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/DegreesITCase.java
@@ -34,7 +34,7 @@
 @RunWith(Parameterized.class)
 public class DegreesITCase extends MultipleProgramsTestBase {
 
- public DegreesITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public DegreesITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...link-gelly/src/test/java/org/apache/flink/graph/test/operations/FromCollectionITCase.java b/...link-gelly/src/test/java/org/apache/flink/graph/test/operations/FromCollectionITCase.java
@@ -35,7 +35,7 @@
 @RunWith(Parameterized.class)
 public class FromCollectionITCase extends MultipleProgramsTestBase {
 
- public FromCollectionITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public FromCollectionITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationITCase.java b/...flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationITCase.java
@@ -40,7 +40,7 @@
 @RunWith(Parameterized.class)
 public class GraphCreationITCase extends MultipleProgramsTestBase {
 
- public GraphCreationITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public GraphCreationITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...y/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithMapperITCase.java b/...y/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithMapperITCase.java
@@ -36,7 +36,7 @@
 @RunWith(Parameterized.class)
 public class GraphCreationWithMapperITCase extends MultipleProgramsTestBase {
 
- public GraphCreationWithMapperITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public GraphCreationWithMapperITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...link-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphMutationsITCase.java b/...link-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphMutationsITCase.java
@@ -38,7 +38,7 @@
 @RunWith(Parameterized.class)
 public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
- public GraphMutationsITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public GraphMutationsITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...ink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphOperationsITCase.java b/...ink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphOperationsITCase.java
@@ -39,7 +39,7 @@
 @RunWith(Parameterized.class)
 public class GraphOperationsITCase extends MultipleProgramsTestBase {
 
- public GraphOperationsITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public GraphOperationsITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithEdgesITCase.java b/...flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithEdgesITCase.java
@@ -39,7 +39,7 @@
 @RunWith(Parameterized.class)
 public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
 
- public JoinWithEdgesITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public JoinWithEdgesITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...nk-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithVerticesITCase.java b/...nk-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithVerticesITCase.java
@@ -38,7 +38,7 @@
 @RunWith(Parameterized.class)
 public class JoinWithVerticesITCase extends MultipleProgramsTestBase {
 
- public JoinWithVerticesITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public JoinWithVerticesITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...ging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/MapEdgesITCase.java b/...ging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/MapEdgesITCase.java
@@ -39,7 +39,7 @@
 @RunWith(Parameterized.class)
 public class MapEdgesITCase extends MultipleProgramsTestBase {
 
- public MapEdgesITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public MapEdgesITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...g/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/MapVerticesITCase.java b/...g/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/MapVerticesITCase.java
@@ -39,7 +39,7 @@
 @RunWith(Parameterized.class)
 public class MapVerticesITCase extends MultipleProgramsTestBase {
 
- public MapVerticesITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public MapVerticesITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...elly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnEdgesMethodsITCase.java b/...elly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnEdgesMethodsITCase.java
@@ -40,7 +40,7 @@
 @RunWith(Parameterized.class)
 public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
- public ReduceOnEdgesMethodsITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public ReduceOnEdgesMethodsITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...y/src/test/java/org/apache/flink/graph/test/operations/ReduceOnNeighborMethodsITCase.java b/...y/src/test/java/org/apache/flink/graph/test/operations/ReduceOnNeighborMethodsITCase.java
@@ -43,7 +43,7 @@
 @RunWith(Parameterized.class)
 public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
- public ReduceOnNeighborMethodsITCase(MultipleProgramsTestBase.ExecutionMode mode){
+ public ReduceOnNeighborMethodsITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...c/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapFunctionITCase.java b/...c/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapFunctionITCase.java
@@ -41,7 +41,7 @@
 @RunWith(Parameterized.class)
 public class HadoopMapFunctionITCase extends MultipleProgramsTestBase {
 
- public HadoopMapFunctionITCase(ExecutionMode mode){
+ public HadoopMapFunctionITCase(TestExecutionMode mode){
  super(mode);
  }
 

diff --git a/...a/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceCombineFunctionITCase.java b/...a/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceCombineFunctionITCase.java
@@ -44,7 +44,7 @@
 @RunWith(Parameterized.class)
 public class HadoopReduceCombineFunctionITCase extends MultipleProgramsTestBase {
 
- public HadoopReduceCombineFunctionITCase(ExecutionMode mode){
+ public HadoopReduceCombineFunctionITCase(TestExecutionMode mode){
  super(mode);
  }
 
@@ -99,7 +99,7 @@ public void testUngroupedHadoopReducer() throws Exception {
 
  @Test
  public void testCombiner() throws Exception {
- org.junit.Assume.assumeThat(mode, new IsEqual<ExecutionMode>(ExecutionMode.CLUSTER));
+ org.junit.Assume.assumeThat(mode, new IsEqual<TestExecutionMode>(TestExecutionMode.CLUSTER));
  final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
  DataSet<Tuple2<IntWritable, IntWritable>> ds = HadoopTestData.getKVPairDataSet(env).

diff --git a/...est/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceFunctionITCase.java b/...est/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceFunctionITCase.java
@@ -42,7 +42,7 @@
 @RunWith(Parameterized.class)
 public class HadoopReduceFunctionITCase extends MultipleProgramsTestBase {
 
- public HadoopReduceFunctionITCase(ExecutionMode mode){
+ public HadoopReduceFunctionITCase(TestExecutionMode mode){
  super(mode);
  }