You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2018/05/24 06:47:46 UTC
[2/2] flink git commit: [FLINK-9415] [scala,
test] Remove ScalaStreamingMultipleProgramsTestBase
[FLINK-9415] [scala, test] Remove ScalaStreamingMultipleProgramsTestBase
This closes #6058.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/df0393af
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/df0393af
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/df0393af
Branch: refs/heads/release-1.5
Commit: df0393af32f3d19d95a8b0366d2083901442aeb0
Parents: 768a125
Author: Thomas Weise <th...@apache.org>
Authored: Wed May 23 15:42:29 2018 -0700
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Thu May 24 14:47:33 2018 +0800
----------------------------------------------------------------------
...ScalaStreamingMultipleProgramsTestBase.scala | 49 --------------------
.../api/scala/StreamingOperatorsITCase.scala | 6 +--
2 files changed, 3 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/df0393af/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/ScalaStreamingMultipleProgramsTestBase.scala
----------------------------------------------------------------------
diff --git a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/ScalaStreamingMultipleProgramsTestBase.scala b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/ScalaStreamingMultipleProgramsTestBase.scala
deleted file mode 100644
index e0c5b45..0000000
--- a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/ScalaStreamingMultipleProgramsTestBase.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.streaming.api.scala
-
-import org.apache.flink.configuration.Configuration
-import org.apache.flink.test.util.MiniClusterResource.MiniClusterResourceConfiguration
-import org.apache.flink.test.util.{MiniClusterResource, TestBaseUtils}
-import org.junit.{After, Before}
-import org.scalatest.junit.JUnitSuiteLike
-
-trait ScalaStreamingMultipleProgramsTestBase
- extends TestBaseUtils
- with JUnitSuiteLike {
-
- val parallelism = 4
- var cluster: Option[MiniClusterResource] = None
-
- @Before
- def beforeAll(): Unit = {
- val cl = new MiniClusterResource(
- new MiniClusterResourceConfiguration(new Configuration(), 1, parallelism)
- )
-
- cl.before()
-
- cluster = Some(cl)
- }
-
- @After
- def afterAll(): Unit = {
- cluster.foreach { c => c.after() }
- }
-}
http://git-wip-us.apache.org/repos/asf/flink/blob/df0393af/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingOperatorsITCase.scala
----------------------------------------------------------------------
diff --git a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingOperatorsITCase.scala b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingOperatorsITCase.scala
index 4d690c8..334633a 100644
--- a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingOperatorsITCase.scala
+++ b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingOperatorsITCase.scala
@@ -18,16 +18,16 @@
package org.apache.flink.streaming.api.scala
-import org.apache.flink.api.common.functions.{RichMapFunction, FoldFunction}
+import org.apache.flink.api.common.functions.{FoldFunction, RichMapFunction}
import org.apache.flink.core.fs.FileSystem
import org.apache.flink.streaming.api.functions.source.SourceFunction
import org.apache.flink.streaming.api.functions.source.SourceFunction.SourceContext
-import org.apache.flink.test.util.TestBaseUtils
+import org.apache.flink.test.util.{AbstractTestBase, TestBaseUtils}
import org.apache.flink.util.MathUtils
import org.junit.rules.TemporaryFolder
import org.junit.{After, Before, Rule, Test}
-class StreamingOperatorsITCase extends ScalaStreamingMultipleProgramsTestBase {
+class StreamingOperatorsITCase extends AbstractTestBase {
var resultPath1: String = _
var resultPath2: String = _