[hotfix] Let SSLUtilsTest and NettyClientServerSslTest extend TestLogger

tongcheng-elong · Jul 16, 2018 · a72b55e · a72b55e
1 parent a502f82
commit a72b55e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...ime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyClientServerSslTest.java b/...ime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyClientServerSslTest.java
@@ -23,6 +23,7 @@
 import org.apache.flink.runtime.io.network.netty.NettyTestUtil.NettyServerAndClient;
 import org.apache.flink.runtime.net.SSLUtilsTest;
 import org.apache.flink.util.NetUtils;
+import org.apache.flink.util.TestLogger;
 
 import org.apache.flink.shaded.netty4.io.netty.channel.Channel;
 import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandler;
@@ -41,7 +42,7 @@
  * Tests for the SSL connection between Netty Server and Client used for the
  * data plane.
  */
-public class NettyClientServerSslTest {
+public class NettyClientServerSslTest extends TestLogger {
 
  /**
  * Verify valid ssl configuration and connection.

diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/net/SSLUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/net/SSLUtilsTest.java
@@ -21,6 +21,7 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.IllegalConfigurationException;
 import org.apache.flink.configuration.SecurityOptions;
+import org.apache.flink.util.TestLogger;
 
 import org.junit.Test;
 
@@ -40,15 +41,14 @@
 /**
  * Tests for the {@link SSLUtils}.
  */
-public class SSLUtilsTest {
+public class SSLUtilsTest extends TestLogger {
 
- public static final String TRUST_STORE_PATH = SSLUtilsTest.class.getResource("/local127.truststore").getFile();
- public static final String KEY_STORE_PATH = SSLUtilsTest.class.getResource("/local127.keystore").getFile();
- public static final String UNTRUSTED_KEY_STORE_PATH = SSLUtilsTest.class.getResource("/local127.keystore").getFile();
+ private static final String TRUST_STORE_PATH = SSLUtilsTest.class.getResource("/local127.truststore").getFile();
+ private static final String KEY_STORE_PATH = SSLUtilsTest.class.getResource("/local127.keystore").getFile();
 
- public static final String TRUST_STORE_PASSWORD = "password";
- public static final String KEY_STORE_PASSWORD = "password";
- public static final String KEY_PASSWORD = "password";
+ private static final String TRUST_STORE_PASSWORD = "password";
+ private static final String KEY_STORE_PASSWORD = "password";
+ private static final String KEY_PASSWORD = "password";
 
  /**
  * Tests whether activation of internal / REST SSL evaluates the config flags correctly.