Small cleaning up in MQTT Java tests

Author: acogoluegnes

deps/rabbitmq_mqtt/test/java_SUITE_data/src/test/java/com/rabbitmq/mqtt/test/MqttTest.java

@@ -52,9 +52,7 @@ public class MqttTest implements MqttCallback {
   private final byte[] payload = "payload".getBytes();
   private final String topic = "test-topic";
   private final String retainedTopic = "test-retained-topic";
-  private int testDelay = 2000;
 
-  private volatile long lastReceipt;
   private volatile boolean expectConnectionFailure;
   private volatile boolean failOnDelivery = false;
 
@@ -80,14 +78,12 @@ private static int getAmqpPort() {
   }
 
   // override the 10s limit
-  private class TestMqttConnectOptions extends MqttConnectOptions {
+  private static class TestMqttConnectOptions extends MqttConnectOptions {
     private int keepAliveInterval = 60;
-    private final String user_name = "guest";
-    private final String password = "guest";
 
     public TestMqttConnectOptions() {
-      super.setUserName(user_name);
-      super.setPassword(password.toCharArray());
+      super.setUserName("guest");
+      super.setPassword("guest".toCharArray());
       super.setCleanSession(true);
       super.setKeepAliveInterval(60);
       // PublishMultiple overwhelms Paho defaults
@@ -214,8 +210,7 @@ public void connectFirst() throws MqttException, IOException {
 
       // ---8<---
       // Copy/pasted from readMqttWireMessage() in MqttInputStream.java.
-      ByteArrayOutputStream bais = new ByteArrayOutputStream();
-      byte first = in.readByte();
+      in.readByte();
       // ---8<---
 
       fail("Error expected if CONNECT is not first packet");
@@ -301,8 +296,7 @@ public void emptyPassword(TestInfo info) throws MqttException {
     MqttConnectOptions client_opts = options();
     client_opts.setPassword("".toCharArray());
 
-    MqttClient client = newClient(info);
-    try {
+    try (MqttClient client = newClient(info)) {
       client.connect(client_opts);
       fail("Authentication failure expected");
     } catch (MqttException ex) {
@@ -1047,7 +1041,6 @@ public void connectionLost(Throwable cause) {
   }
 
   public void messageArrived(String topic, MqttMessage message) throws Exception {
-    lastReceipt = System.currentTimeMillis();
     receivedMessages.add(message);
     if (failOnDelivery) {
       throw new Exception("unexpected delivery on topic " + topic);
@@ -1062,6 +1055,7 @@ private Integer receivedMessagesSize() {
 
   private void waitForTestDelay() {
     try {
+      int testDelay = 2000;
       Thread.sleep(testDelay);
     } catch (InterruptedException e) {
       throw new RuntimeException(e);

deps/rabbitmq_mqtt/test/java_SUITE_data/src/test/java/com/rabbitmq/mqtt/test/MqttV5Test.java

@@ -12,7 +12,6 @@
 import static org.eclipse.paho.mqttv5.common.packet.MqttReturnCode.RETURN_CODE_BAD_USERNAME_OR_PASSWORD;
 
 import com.rabbitmq.client.*;
-import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -55,7 +54,6 @@ public class MqttV5Test implements MqttCallback {
   private final byte[] payload = "payload".getBytes();
   private final String topic = "test-topic";
   private final String retainedTopic = "test-retained-topic";
-  private int testDelay = 2000;
 
   private Connection conn;
   private Channel ch;
@@ -78,14 +76,12 @@ private static int getAmqpPort() {
   }
 
   // override the 10s limit
-  private class TestMqttConnectOptions extends MqttConnectionOptions {
+  private static class TestMqttConnectOptions extends MqttConnectionOptions {
     private int keepAliveInterval = 60;
-    private final String user_name = "guest";
-    private final String password = "guest";
 
     public TestMqttConnectOptions() {
-      super.setUserName(user_name);
-      super.setPassword(password.getBytes());
+      super.setUserName("guest");
+      super.setPassword("guest".getBytes());
       super.setTopicAliasMaximum(0);
       super.setKeepAliveInterval(keepAliveInterval);
     }
@@ -211,8 +207,7 @@ public void connectFirst() throws MqttException, IOException {
 
       // ---8<---
       // Copy/pasted from readMqttWireMessage() in MqttInputStream.java.
-      ByteArrayOutputStream bais = new ByteArrayOutputStream();
-      byte first = in.readByte();
+      in.readByte();
       // ---8<---
 
       fail("Error expected if CONNECT is not first packet");
@@ -823,7 +818,7 @@ public Socket createSocket() {
   }
 
   @Test
-  public void topicAuthorisationVariableExpansion(TestInfo info) throws Exception {
+  public void topicAuthorisationVariableExpansion() throws Exception {
     final String client_id = "client-id-variable-expansion";
     MqttClient client = newConnectedClient(client_id);
     client.setCallback(this);
@@ -894,7 +889,7 @@ public void interopA2M(TestInfo info)
   // [MQTT-3.1.3-6]
   // RabbitMQ allows a Client to supply a ClientId that has a length of zero bytes.
   @Test
-  public void emptyClientId(TestInfo info) throws MqttException, InterruptedException {
+  public void emptyClientId() throws MqttException, InterruptedException {
     String emptyClientId = "";
     MqttClient client = newConnectedClient(emptyClientId);
     MqttClient client2 = newConnectedClient(emptyClientId);
@@ -955,6 +950,7 @@ private Integer receivedMessagesSize() {
 
   private void waitForTestDelay() {
     try {
+      int testDelay = 2000;
       Thread.sleep(testDelay);
     } catch (InterruptedException e) {
       throw new RuntimeException(e);

deps/rabbitmq_mqtt/test/java_SUITE_data/src/test/java/com/rabbitmq/mqtt/test/tls/MqttSSLTest.java

@@ -45,7 +45,7 @@ private static String getHost() {
   }
 
   // override 10s limit
-  private class MyConnOpts extends MqttConnectOptions {
+  private static class MyConnOpts extends MqttConnectOptions {
     private int keepAliveInterval = 60;
 
     @Override

deps/rabbitmq_mqtt/test/java_SUITE_data/src/test/java/com/rabbitmq/mqtt/test/tls/MqttV5SSLTest.java

@@ -47,7 +47,7 @@ private static String getHost() {
   }
 
   // override 10s limit
-  private class MyConnOpts extends MqttConnectionOptions {
+  private static class MyConnOpts extends MqttConnectionOptions {
     private int keepAliveInterval = 60;
 
     @Override

deps/rabbitmq_mqtt/test/java_SUITE_data/src/test/java/com/rabbitmq/mqtt/test/tls/MutualAuth.java

@@ -6,8 +6,10 @@
 //
 package com.rabbitmq.mqtt.test.tls;
 
-import java.io.FileInputStream;
+import static java.nio.file.Files.newInputStream;
+
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -33,11 +35,10 @@ private static TrustManagerFactory getServerTrustManagerFactory()
       throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException {
     String keystorePath = System.getProperty("test-keystore.ca");
     char[] trustPhrase = getStringProperty("test-keystore.password").toCharArray();
-    MutualAuth dummy = new MutualAuth();
 
     // Server TrustStore
     KeyStore tks = KeyStore.getInstance("JKS");
-    tks.load(new FileInputStream(keystorePath), trustPhrase);
+    tks.load(newInputStream(Paths.get(keystorePath)), trustPhrase);
 
     TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
     tmf.init(tks);
@@ -51,12 +52,11 @@ public static SSLContext getSSLContextWithClientCert() throws IOException {
 
     String p12Path = System.getProperty("test-client-cert.path");
 
-    MutualAuth dummy = new MutualAuth();
     try {
       SSLContext sslContext = getVanillaSSLContext();
       // Client Keystore
       KeyStore ks = KeyStore.getInstance("PKCS12");
-      ks.load(new FileInputStream(p12Path), clientPhrase);
+      ks.load(newInputStream(Paths.get(p12Path)), clientPhrase);
       KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
       kmf.init(ks, clientPhrase);
 
@@ -69,7 +69,6 @@ public static SSLContext getSSLContextWithClientCert() throws IOException {
   }
 
   private static SSLContext getVanillaSSLContext() throws NoSuchAlgorithmException {
-    SSLContext result = null;
     List<String> xs = Arrays.asList("TLSv1.2", "TLSv1.1", "TLSv1");
     for (String x : xs) {
       try {