tests: CoapClientX509Test disconnect() is awaiting until UDP fixedPort released. reuse socket removed for UPD isUDPPortAvailable as not useful

application/src/test/java/org/thingsboard/server/transport/AbstractTransportIntegrationTest.java

@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 @Slf4j
 public abstract class AbstractTransportIntegrationTest extends AbstractControllerTest {
 
-    protected static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 30;
+    public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 30;
 
     protected static final AtomicInteger atomicInteger = new AtomicInteger(2);
 

application/src/test/java/org/thingsboard/server/transport/coap/security/AbstractCoapSecurityIntegrationTest.java

@@ -24,7 +24,6 @@ import org.junit.Assert;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.util.TestSocketUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.Device;
@@ -44,7 +43,6 @@ import org.thingsboard.server.utils.PortFinder;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.DatagramSocket;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.PrivateKey;
@@ -55,9 +53,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
-import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -178,16 +174,10 @@ public abstract class AbstractCoapSecurityIntegrationTest extends AbstractCoapIn
         CoapClientX509Test clientX509 = clientX509UpdateTest(FeatureType.ATTRIBUTES, certPrivateKey,
                 "CoapX509TrustNo_" + FeatureType.TELEMETRY.name(), deviceProfile.getId(), fixedPort);
         clientX509.disconnect();
-        await("Need to make port " + fixedPort + " free")
-                .atMost(40, TimeUnit.SECONDS)
-                .until(() -> isUDPPortAvailable(fixedPort));
         CoapClientX509Test clientX509_01 = clientX509UpdateTest(FeatureType.ATTRIBUTES, certPrivateKey_01,
                 "CoapX509TrustNo_" + FeatureType.TELEMETRY.name() + "_01", deviceProfile.getId(),
                 fixedPort, PAYLOAD_VALUES_STR_01);
         clientX509_01.disconnect();
-        await("Await to make port " + fixedPort + " free")
-                .atMost(40, TimeUnit.SECONDS)
-                .until(() -> isUDPPortAvailable(fixedPort));
     }
 
     private CoapClientX509Test clientX509UpdateTest(FeatureType featureType, CertPrivateKey certPrivateKey,
@@ -291,14 +281,5 @@ public abstract class AbstractCoapSecurityIntegrationTest extends AbstractCoapIn
         }
     }
 
-    private static boolean isUDPPortAvailable(int port) {
-        try (DatagramSocket socket = new DatagramSocket(port)) {
-            socket.setReuseAddress(true);
-            return true;
-        } catch (IOException e) {
-            log.warn("Failed to open UDP port on port " + port, e);
-            return false;
-        }
-    }
 }
 

application/src/test/java/org/thingsboard/server/transport/coap/x509/CoapClientX509Test.java

@@ -51,6 +51,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.awaitility.Awaitility.await;
 import static org.eclipse.californium.core.config.CoapConfig.DEFAULT_BLOCKWISE_STATUS_LIFETIME_IN_SECONDS;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_AUTO_HANDSHAKE_TIMEOUT;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CIPHER_SUITES;
@@ -71,6 +72,8 @@ import static org.eclipse.californium.scandium.config.DtlsConfig.MODULE;
 import static org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.SHA256_WITH_ECDSA;
 import static org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.SHA256_WITH_RSA;
 import static org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.SHA384_WITH_ECDSA;
+import static org.thingsboard.server.transport.AbstractTransportIntegrationTest.DEFAULT_WAIT_TIMEOUT_SECONDS;
+import static org.thingsboard.server.utils.PortFinder.isUDPPortAvailable;
 
 @Slf4j
 public class CoapClientX509Test {
@@ -82,6 +85,7 @@ public class CoapClientX509Test {
     private final Configuration config;
     private final CertPrivateKey certPrivateKey;
     private final String coapsBaseUrl;
+    private final Integer fixedPort;
 
     @Getter
     private CoAP.Type type = CoAP.Type.CON;
@@ -90,6 +94,7 @@ public class CoapClientX509Test {
         this.certPrivateKey = certPrivateKey;
         this.coapsBaseUrl = coapsBaseUrl;
         this.config = createConfiguration();
+        this.fixedPort = fixedPort;
         this.dtlsConnector = createDTLSConnector(fixedPort);
         this.clientX509 = createClient(getFeatureTokenUrl(featureType));
     }
@@ -99,6 +104,12 @@ public class CoapClientX509Test {
         }
         if (dtlsConnector != null) {
             dtlsConnector.destroy();
+            if (fixedPort != null) {
+                log.debug("Awaiting releasing UDP fixedPort {}", fixedPort);
+                await("Await client UDP port " + fixedPort + " to disconnect")
+                        .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
+                        .until(() -> isUDPPortAvailable(fixedPort));
+            }
         }
     }
 

application/src/test/java/org/thingsboard/server/utils/PortFinder.java

@@ -15,9 +15,13 @@
  */
 package org.thingsboard.server.utils;
 
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
 import java.net.DatagramSocket;
 import java.net.SocketException;
 
+@Slf4j
 public class PortFinder {
     public static int findAvailableUdpPort() {
         try (DatagramSocket socket = new DatagramSocket(0)) {
@@ -26,4 +30,13 @@ public class PortFinder {
             throw new IllegalStateException("No available UDP ports found", e);
         }
     }
+
+    public static boolean isUDPPortAvailable(int port) {
+        try (DatagramSocket socket = new DatagramSocket(port)) {
+            return true;
+        } catch (IOException e) {
+            log.debug("Failed to open UDP port {}", port, e);
+            return false;
+        }
+    }
 }