This is an automated email from the ASF dual-hosted git repository. trohrmann pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 3be812dfaf3d56bfc24d68dd5a541f2d0b3455fc Author: Till Rohrmann <[email protected]> AuthorDate: Tue May 26 14:22:48 2020 +0200 [hotfix] Rename org.apache.flink.yarn.util.YarnTestUtils into o.a.f.y.u.TestUtils Renamed o.a.f.y.u.YarnTestUtils into o.a.f.y.u.TestUtils in order to avoid a naming conflict with o.a.f.y.YarnTestUtils from the flink-yarn module. --- .../test/java/org/apache/flink/yarn/CliFrontendRunWithYarnTest.java | 2 +- .../src/test/java/org/apache/flink/yarn/YARNApplicationITCase.java | 2 +- .../test/java/org/apache/flink/yarn/YARNFileReplicationITCase.java | 4 ++-- .../test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java | 4 ++-- flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNITCase.java | 4 ++-- .../org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java | 2 +- .../src/test/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java | 2 +- .../src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java | 2 +- .../org/apache/flink/yarn/util/{YarnTestUtils.java => TestUtils.java} | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/CliFrontendRunWithYarnTest.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/CliFrontendRunWithYarnTest.java index 7e14ac7..82ead7e 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/CliFrontendRunWithYarnTest.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/CliFrontendRunWithYarnTest.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import static org.apache.flink.client.cli.CliFrontendRunTest.verifyCliFrontend; -import static org.apache.flink.yarn.util.YarnTestUtils.getTestJarPath; +import static org.apache.flink.yarn.util.TestUtils.getTestJarPath; /** * Tests for the RUN command using a {@link FlinkYarnSessionCli} inside the {@link CliFrontend}. diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNApplicationITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNApplicationITCase.java index 13e59c5..5aa5203 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNApplicationITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNApplicationITCase.java @@ -41,7 +41,7 @@ import java.time.Duration; import java.util.Collections; import static org.apache.flink.yarn.configuration.YarnConfigOptions.CLASSPATH_INCLUDE_USER_JAR; -import static org.apache.flink.yarn.util.YarnTestUtils.getTestJarPath; +import static org.apache.flink.yarn.util.TestUtils.getTestJarPath; /** * Test cases for the deployment of Yarn Flink application clusters. diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNFileReplicationITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNFileReplicationITCase.java index b2d6da5..3b0ea5b 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNFileReplicationITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNFileReplicationITCase.java @@ -30,7 +30,7 @@ import org.apache.flink.runtime.jobmaster.JobResult; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.sink.DiscardingSink; import org.apache.flink.yarn.configuration.YarnConfigOptions; -import org.apache.flink.yarn.util.YarnTestUtils; +import org.apache.flink.yarn.util.TestUtils; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -91,7 +91,7 @@ public class YARNFileReplicationITCase extends YarnTestBase { .setSlotsPerTaskManager(1) .createClusterSpecification(); - File testingJar = YarnTestBase.findFile("..", new YarnTestUtils.TestJarFinder("flink-yarn-tests")); + File testingJar = YarnTestBase.findFile("..", new TestUtils.TestJarFinder("flink-yarn-tests")); jobGraph.addJar(new org.apache.flink.core.fs.Path(testingJar.toURI())); try (ClusterClient<ApplicationId> clusterClient = yarnClusterDescriptor diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java index b3a9269..934df92 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java @@ -43,7 +43,7 @@ import org.apache.flink.util.OperatingSystem; import org.apache.flink.yarn.configuration.YarnConfigOptions; import org.apache.flink.yarn.entrypoint.YarnSessionClusterEntrypoint; import org.apache.flink.yarn.testjob.YarnTestJob; -import org.apache.flink.yarn.util.YarnTestUtils; +import org.apache.flink.yarn.util.TestUtils; import org.apache.flink.shaded.guava18.com.google.common.collect.Iterables; @@ -140,7 +140,7 @@ public class YARNHighAvailabilityITCase extends YarnTestBase { stopJobSignal = YarnTestJob.StopJobSignal.usingMarkerFile(FOLDER.newFile().toPath()); job = YarnTestJob.stoppableJob(stopJobSignal); final File testingJar = - YarnTestBase.findFile("..", new YarnTestUtils.TestJarFinder("flink-yarn-tests")); + YarnTestBase.findFile("..", new TestUtils.TestJarFinder("flink-yarn-tests")); assertThat(testingJar, notNullValue()); diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNITCase.java index aa1f0a7..47e523c 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNITCase.java @@ -31,7 +31,7 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.sink.DiscardingSink; import org.apache.flink.yarn.configuration.YarnConfigOptions; import org.apache.flink.yarn.testjob.YarnTestCacheJob; -import org.apache.flink.yarn.util.YarnTestUtils; +import org.apache.flink.yarn.util.TestUtils; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -116,7 +116,7 @@ public class YARNITCase extends YarnTestBase { .setSlotsPerTaskManager(1) .createClusterSpecification(); - File testingJar = YarnTestBase.findFile("..", new YarnTestUtils.TestJarFinder("flink-yarn-tests")); + File testingJar = YarnTestBase.findFile("..", new TestUtils.TestJarFinder("flink-yarn-tests")); jobGraph.addJar(new org.apache.flink.core.fs.Path(testingJar.toURI())); try (ClusterClient<ApplicationId> clusterClient = yarnClusterDescriptor diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java index fe1e62a..4145425 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java @@ -84,7 +84,7 @@ import java.util.stream.Collectors; import static junit.framework.TestCase.assertTrue; import static org.apache.flink.util.Preconditions.checkState; -import static org.apache.flink.yarn.util.YarnTestUtils.getTestJarPath; +import static org.apache.flink.yarn.util.TestUtils.getTestJarPath; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasItem; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java index bb1d98b..fafc06e 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java @@ -51,7 +51,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.apache.flink.yarn.util.YarnTestUtils.getTestJarPath; +import static org.apache.flink.yarn.util.TestUtils.getTestJarPath; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasItem; import static org.junit.Assert.assertThat; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java index cceb3a0..19f3d52 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java @@ -58,7 +58,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; -import static org.apache.flink.yarn.util.YarnTestUtils.getTestJarPath; +import static org.apache.flink.yarn.util.TestUtils.getTestJarPath; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/util/YarnTestUtils.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/util/TestUtils.java similarity index 98% rename from flink-yarn-tests/src/test/java/org/apache/flink/yarn/util/YarnTestUtils.java rename to flink-yarn-tests/src/test/java/org/apache/flink/yarn/util/TestUtils.java index f7a9634..5d852de 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/util/YarnTestUtils.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/util/TestUtils.java @@ -25,7 +25,7 @@ import java.io.FilenameFilter; /** * Utility methods for YARN tests. */ -public class YarnTestUtils { +public class TestUtils { public static File getTestJarPath(String fileName) throws FileNotFoundException { File f = new File("target/programs/" + fileName); if (!f.exists()) {
