refactoring coap-tests-speed-up

application/src/test/java/org/thingsboard/server/transport/coap/AbstractCoapIntegrationTest.java

@@ -16,8 +16,6 @@
 package org.thingsboard.server.transport.coap;
 
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.californium.core.CoapClient;
-import org.junit.After;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.Device;
@@ -41,7 +39,6 @@ import org.thingsboard.server.common.data.device.profile.JsonTransportPayloadCon
 import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
-import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.transport.AbstractTransportIntegrationTest;
 
 import static org.junit.Assert.assertEquals;
@@ -54,8 +51,12 @@ import static org.junit.Assert.assertNotNull;
 public abstract class AbstractCoapIntegrationTest extends AbstractTransportIntegrationTest {
 
     protected final byte[] EMPTY_PAYLOAD = new byte[0];
+    protected CoapTestClient client;
 
     protected void processAfterTest() throws Exception {
+        if (client != null) {
+            client.disconnect();
+        }
     }
 
     protected void processBeforeTest(CoapTestConfigProperties config) throws Exception {

application/src/test/java/org/thingsboard/server/transport/coap/attributes/AbstractCoapAttributesIntegrationTest.java

@@ -15,36 +15,33 @@
  */
 package org.thingsboard.server.transport.coap.attributes;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.os72.protobuf.dynamic.DynamicSchema;
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.squareup.wire.schema.internal.parser.ProtoFileElement;
-import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.extern.slf4j.Slf4j;
 import org.awaitility.Awaitility;
 import org.eclipse.californium.core.CoapObserveRelation;
 import org.eclipse.californium.core.CoapResponse;
 import org.eclipse.californium.core.coap.CoAP;
-import org.eclipse.californium.core.coap.MediaTypeRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.device.profile.*;
-import org.thingsboard.server.common.data.query.DeviceTypeFilter;
+import org.thingsboard.server.common.data.device.profile.CoapDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.CoapDeviceTypeConfiguration;
+import org.thingsboard.server.common.data.device.profile.DefaultCoapDeviceTypeConfiguration;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
+import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.query.SingleEntityFilter;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.common.transport.service.DefaultTransportService;
-import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.coap.AbstractCoapIntegrationTest;
 import org.thingsboard.server.transport.coap.CoapTestCallback;
 import org.thingsboard.server.transport.coap.CoapTestClient;
-import org.thingsboard.server.transport.coap.attributes.updates.CoapAttributesUpdatesIntegrationTest;
-import org.thingsboard.server.transport.mqtt.MqttTestCallback;
-import org.thingsboard.server.transport.mqtt.MqttTestClient;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -54,7 +51,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.common.data.query.EntityKeyType.CLIENT_ATTRIBUTE;
@@ -168,7 +167,7 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
     }
 
     protected void processJsonTestRequestAttributesValuesFromTheServer() throws Exception {
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
+        client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
         SingleEntityFilter dtf = new SingleEntityFilter();
         dtf.setSingleEntity(savedDevice.getId());
         String clientKeysStr = "clientStr,clientBool,clientDbl,clientLong,clientJson";
@@ -195,11 +194,10 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         String featureTokenUrl = CoapTestClient.getFeatureTokenUrl(accessToken, FeatureType.ATTRIBUTES) + "?clientKeys=" + clientKeysStr + "&sharedKeys=" + sharedKeysStr;
         client.setURI(featureTokenUrl);
         validateJsonResponse(client.getMethod());
-        client.disconnect();
     }
 
     protected void processProtoTestRequestAttributesValuesFromTheServer() throws Exception {
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
+        client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
         SingleEntityFilter dtf = new SingleEntityFilter();
         dtf.setSingleEntity(savedDevice.getId());
         String clientKeysStr = "clientStr,clientBool,clientDbl,clientLong,clientJson";
@@ -226,7 +224,6 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         String featureTokenUrl = CoapTestClient.getFeatureTokenUrl(accessToken, FeatureType.ATTRIBUTES) + "?clientKeys=" + clientKeysStr + "&sharedKeys=" + sharedKeysStr;
         client.setURI(featureTokenUrl);
         validateProtoResponse(client.getMethod());
-        client.disconnect();
     }
 
     protected void processJsonTestSubscribeToAttributesUpdates(boolean emptyCurrentStateNotification) throws Exception {
@@ -234,7 +231,7 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
             doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD_ON_CURRENT_STATE_NOTIFICATION, String.class, status().isOk());
         }
 
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
+        client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
         CoapTestCallback callbackCoap = new CoapTestCallback(1);
 
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
@@ -262,7 +259,6 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         assertTrue(observeRelation.isCanceled());
 
         awaitClientAfterCancelObserve();
-        client.disconnect();
     }
 
     protected void processProtoTestSubscribeToAttributesUpdates(boolean emptyCurrentStateNotification) throws Exception {
@@ -270,7 +266,7 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
             doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD_ON_CURRENT_STATE_NOTIFICATION, String.class, status().isOk());
         }
 
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
+        client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
         CoapTestCallback callbackCoap = new CoapTestCallback(1);
 
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
@@ -298,7 +294,6 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         assertTrue(observeRelation.isCanceled());
 
         awaitClientAfterCancelObserve();
-        client.disconnect();
     }
 
     protected void validateJsonResponse(CoapResponse getAttributesResponse) throws InvalidProtocolBufferException {

application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesIntegrationTest.java

@@ -16,19 +16,38 @@
 package org.thingsboard.server.transport.coap.attributes.updates;
 
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.core.server.resources.Resource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.coapserver.DefaultCoapServerService;
+import org.thingsboard.server.common.transport.service.DefaultTransportService;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.transport.coap.CoapTestConfigProperties;
+import org.thingsboard.server.transport.coap.CoapTransportResource;
 import org.thingsboard.server.transport.coap.attributes.AbstractCoapAttributesIntegrationTest;
 
+import static org.mockito.Mockito.spy;
+
 @Slf4j
 @DaoSqlTest
 public class CoapAttributesUpdatesIntegrationTest extends AbstractCoapAttributesIntegrationTest {
 
+    CoapTransportResource coapTransportResource;
+
+    @Autowired
+    DefaultCoapServerService defaultCoapServerService;
+
+    @Autowired
+    DefaultTransportService defaultTransportService;
+
     @Before
     public void beforeTest() throws Exception {
+        Resource api = defaultCoapServerService.getCoapServer().getRoot().getChild("api");
+        coapTransportResource = spy( (CoapTransportResource) api.getChild("v1") );
+        api.delete(api.getChild("v1") );
+        api.add(coapTransportResource);
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
                 .deviceName("Test Subscribe to attribute updates")
                 .build();

application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java

@@ -16,10 +16,8 @@
 package org.thingsboard.server.transport.coap.claim;
 
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.californium.core.CoapClient;
 import org.eclipse.californium.core.CoapResponse;
 import org.eclipse.californium.core.coap.CoAP;
-import org.eclipse.californium.core.coap.MediaTypeRegistry;
 import org.eclipse.californium.elements.exception.ConnectorException;
 import org.junit.After;
 import org.junit.Before;
@@ -97,7 +95,7 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
 
     protected void processTestClaimingDevice(boolean emptyPayload) throws Exception {
         log.warn("[testClaimingDevice] Device: {}, Transport type: {}", savedDevice.getName(), savedDevice.getType());
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.CLAIM);
+        client = new CoapTestClient(accessToken, FeatureType.CLAIM);
         byte[] payloadBytes;
         byte[] failurePayloadBytes;
         if (emptyPayload) {
@@ -144,7 +142,6 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
-        client.disconnect();
     }
 
     private void postClaimRequest(CoapTestClient client, byte[] payload) throws IOException, ConnectorException {

application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java

@@ -57,7 +57,7 @@ public class CoapClaimProtoDeviceTest extends CoapClaimDeviceTest {
 
     @Override
     protected void processTestClaimingDevice(boolean emptyPayload) throws Exception {
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.CLAIM);
+        client = new CoapTestClient(accessToken, FeatureType.CLAIM);
         byte[] payloadBytes;
         if (emptyPayload) {
             TransportApiProtos.ClaimDevice claimDevice = getClaimDevice(0, emptyPayload);

application/src/test/java/org/thingsboard/server/transport/coap/provision/CoapProvisionJsonDeviceTest.java

@@ -227,10 +227,8 @@ public class CoapProvisionJsonDeviceTest extends AbstractCoapIntegrationTest {
 
     private byte[] createCoapClientAndPublish(String deviceCredentials) throws Exception {
         String provisionRequestMsg = createTestProvisionMessage(deviceCredentials);
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.PROVISION);
-        byte[] responseByte = client.postMethod(provisionRequestMsg.getBytes()).getPayload();
-        client.disconnect();
-        return responseByte;
+        client = new CoapTestClient(accessToken, FeatureType.PROVISION);
+        return client.postMethod(provisionRequestMsg.getBytes()).getPayload();
     }
 
     private String createTestProvisionMessage(String deviceCredentials) {

application/src/test/java/org/thingsboard/server/transport/coap/provision/CoapProvisionProtoDeviceTest.java

@@ -16,10 +16,7 @@
 package org.thingsboard.server.transport.coap.provision;
 
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.californium.core.CoapClient;
 import org.eclipse.californium.core.CoapResponse;
-import org.eclipse.californium.core.coap.MediaTypeRegistry;
-import org.eclipse.californium.elements.exception.ConnectorException;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -47,8 +44,6 @@ import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509Ce
 import org.thingsboard.server.transport.coap.CoapTestClient;
 import org.thingsboard.server.transport.coap.CoapTestConfigProperties;
 
-import java.io.IOException;
-
 @Slf4j
 @DaoSqlTest
 public class CoapProvisionProtoDeviceTest extends AbstractCoapIntegrationTest {
@@ -231,10 +226,9 @@ public class CoapProvisionProtoDeviceTest extends AbstractCoapIntegrationTest {
     }
 
     private byte[] createCoapClientAndPublish(byte[] provisionRequestMsg) throws Exception {
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.PROVISION);
+        client = new CoapTestClient(accessToken, FeatureType.PROVISION);
         CoapResponse coapResponse = client.postMethod(provisionRequestMsg);
         Assert.assertNotNull("COAP response", coapResponse);
-        client.disconnect();
         return coapResponse.getPayload();
     }
 

application/src/test/java/org/thingsboard/server/transport/coap/rpc/AbstractCoapServerSideRpcIntegrationTest.java

@@ -71,7 +71,7 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
     protected static final Long asyncContextTimeoutToUseRpcPlugin = 10000L;
 
     protected void processOneWayRpcTest(boolean protobuf) throws Exception {
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.RPC);
+        client = new CoapTestClient(accessToken, FeatureType.RPC);
         CoapTestCallback callbackCoap = new TestCoapCallbackForRPC(client, 1, true, protobuf);
 
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
@@ -87,11 +87,10 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
 
         observeRelation.proactiveCancel();
         assertTrue(observeRelation.isCanceled());
-        client.disconnect();
     }
 
     protected void processTwoWayRpcTest(String expectedResponseResult, boolean protobuf) throws Exception {
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.RPC);
+        client = new CoapTestClient(accessToken, FeatureType.RPC);
         CoapTestCallback callbackCoap = new TestCoapCallbackForRPC(client, 1, false, protobuf);
 
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
@@ -115,7 +114,6 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
 
         observeRelation.proactiveCancel();
         assertTrue(observeRelation.isCanceled());
-        client.disconnect();
     }
 
     protected void processOnLoadResponse(CoapResponse response, CoapTestClient client, Integer observe, CountDownLatch latch) {

application/src/test/java/org/thingsboard/server/transport/coap/telemetry/attributes/CoapAttributesIntegrationTest.java

@@ -72,7 +72,7 @@ public class CoapAttributesIntegrationTest extends AbstractCoapIntegrationTest {
 
     protected void processAttributesTest(List<String> expectedKeys, byte[] payload, boolean presenceFieldsTest) throws Exception {
 
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
+        client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
         CoapResponse coapResponse = client.postMethod(payload);
         assertEquals(CoAP.ResponseCode.CREATED, coapResponse.getCode());
 

application/src/test/java/org/thingsboard/server/transport/coap/telemetry/timeseries/AbstractCoapTimeseriesIntegrationTest.java

@@ -73,7 +73,7 @@ public abstract class AbstractCoapTimeseriesIntegrationTest extends AbstractCoap
     }
 
     protected void processTestPostTelemetry(byte[] payloadBytes, List<String> expectedKeys, boolean withTs, boolean presenceFieldsTest) throws Exception {
-        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.TELEMETRY);
+        client = new CoapTestClient(accessToken, FeatureType.TELEMETRY);
         CoapResponse coapResponse = client.postMethod(payloadBytes);
         assertEquals(CoAP.ResponseCode.CREATED, coapResponse.getCode());
 
@@ -128,7 +128,6 @@ public abstract class AbstractCoapTimeseriesIntegrationTest extends AbstractCoap
         } else {
             assertValues(values, 0);
         }
-        client.disconnect();
     }
 
     private void assertTs(Map<String, List<Map<String, Object>>> deviceValues, List<String> expectedKeys, int ts, int arrayIndex) {