[FLINK-27467][cli][tests] Drop CliFrontendTestBase

apache · May 2, 2022 · f64e371 · f64e371
1 parent d1dcc94
commit f64e371
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 38 deletions.
diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendCancelTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendCancelTest.java
@@ -25,6 +25,7 @@
 import org.apache.flink.core.execution.SavepointFormatType;
 import org.apache.flink.core.testutils.OneShotLatch;
 import org.apache.flink.runtime.messages.Acknowledge;
+import org.apache.flink.util.TestLogger;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -33,13 +34,14 @@
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 
+import static org.apache.flink.client.cli.CliFrontendTestUtils.getCli;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 /** Tests for the CANCEL command. */
-public class CliFrontendCancelTest extends CliFrontendTestBase {
+public class CliFrontendCancelTest extends TestLogger {
 
     @BeforeClass
     public static void init() {

diff --git a/...k-clients/src/test/java/org/apache/flink/client/cli/CliFrontendDynamicPropertiesTest.java b/...k-clients/src/test/java/org/apache/flink/client/cli/CliFrontendDynamicPropertiesTest.java
@@ -23,6 +23,7 @@
 import org.apache.flink.configuration.CoreOptions;
 import org.apache.flink.runtime.execution.librarycache.FlinkUserCodeClassLoaders.ParentFirstClassLoader;
 import org.apache.flink.util.ChildFirstClassLoader;
+import org.apache.flink.util.TestLogger;
 
 import org.apache.commons.cli.Options;
 import org.junit.AfterClass;
@@ -39,7 +40,7 @@
 import static org.junit.Assert.assertEquals;
 
 /** Tests for the RUN command with Dynamic Properties. */
-public class CliFrontendDynamicPropertiesTest extends CliFrontendTestBase {
+public class CliFrontendDynamicPropertiesTest extends TestLogger {
 
     private GenericCLI cliUnderTest;
     private Configuration configuration;

diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendInfoTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendInfoTest.java
@@ -20,18 +20,20 @@
 
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.CoreOptions;
+import org.apache.flink.util.TestLogger;
 
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Collections;
 
+import static org.apache.flink.client.cli.CliFrontendTestUtils.getCli;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /** Tests for the "info" command. */
-public class CliFrontendInfoTest extends CliFrontendTestBase {
+public class CliFrontendInfoTest extends TestLogger {
 
     private static PrintStream stdOut;
     private static PrintStream capture;

diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendListTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendListTest.java
@@ -24,6 +24,7 @@
 import org.apache.flink.client.program.ClusterClient;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.runtime.client.JobStatusMessage;
+import org.apache.flink.util.TestLogger;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -34,14 +35,15 @@
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 
+import static org.apache.flink.client.cli.CliFrontendTestUtils.getCli;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
 /** Tests for the LIST command. */
-public class CliFrontendListTest extends CliFrontendTestBase {
+public class CliFrontendListTest extends TestLogger {
 
     @BeforeClass
     public static void init() {

diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendRunTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendRunTest.java
@@ -25,6 +25,7 @@
 import org.apache.flink.configuration.CoreOptions;
 import org.apache.flink.runtime.jobgraph.RestoreMode;
 import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings;
+import org.apache.flink.util.TestLogger;
 
 import org.apache.commons.cli.CommandLine;
 import org.junit.AfterClass;
@@ -33,13 +34,14 @@
 
 import java.util.Collections;
 
+import static org.apache.flink.client.cli.CliFrontendTestUtils.getCli;
 import static org.apache.flink.client.cli.CliFrontendTestUtils.getTestJarPath;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /** Tests for the RUN command. */
-public class CliFrontendRunTest extends CliFrontendTestBase {
+public class CliFrontendRunTest extends TestLogger {
 
     @BeforeClass
     public static void init() {

diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendSavepointTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendSavepointTest.java
@@ -30,6 +30,7 @@
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.Preconditions;
+import org.apache.flink.util.TestLogger;
 import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.hamcrest.Matchers;
@@ -59,7 +60,7 @@
 import static org.mockito.Mockito.when;
 
 /** Tests for the SAVEPOINT command. */
-public class CliFrontendSavepointTest extends CliFrontendTestBase {
+public class CliFrontendSavepointTest extends TestLogger {
 
     private static PrintStream stdOut;
     private static PrintStream stdErr;

diff --git a/...k-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopWithSavepointTest.java b/...k-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopWithSavepointTest.java
@@ -26,6 +26,7 @@
 import org.apache.flink.core.testutils.OneShotLatch;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
+import org.apache.flink.util.TestLogger;
 import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.junit.AfterClass;
@@ -35,14 +36,15 @@
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 
+import static org.apache.flink.client.cli.CliFrontendTestUtils.getCli;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /** Tests for the STOP command. */
-public class CliFrontendStopWithSavepointTest extends CliFrontendTestBase {
+public class CliFrontendStopWithSavepointTest extends TestLogger {
 
     @BeforeClass
     public static void setup() {

diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestBase.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestBase.java
diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestUtils.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestUtils.java
@@ -64,6 +64,10 @@ public static void restoreSystemOut() {
         System.setOut(previousSysout);
     }
 
+    public static AbstractCustomCommandLine getCli() {
+        return new DefaultCLI();
+    }
+
     private static final class BlackholeOutputSteam extends java.io.OutputStream {
         @Override
         public void write(int b) {}

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
@@ -19,14 +19,14 @@
 package org.apache.flink.yarn;
 
 import org.apache.flink.client.cli.CliFrontend;
-import org.apache.flink.client.cli.CliFrontendTestBase;
 import org.apache.flink.client.cli.CliFrontendTestUtils;
 import org.apache.flink.client.deployment.ClusterClientServiceLoader;
 import org.apache.flink.client.deployment.DefaultClusterClientServiceLoader;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.JobManagerOptions;
 import org.apache.flink.configuration.MemorySize;
 import org.apache.flink.configuration.TaskManagerOptions;
+import org.apache.flink.util.TestLogger;
 import org.apache.flink.yarn.cli.FlinkYarnSessionCli;
 
 import org.junit.AfterClass;
@@ -43,7 +43,7 @@
  *
  * @see org.apache.flink.client.cli.CliFrontendRunTest
  */
-public class CliFrontendRunWithYarnTest extends CliFrontendTestBase {
+public class CliFrontendRunWithYarnTest extends TestLogger {
 
     @Rule public TemporaryFolder tmp = new TemporaryFolder();