coap-tests-spead-up

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

@@ -0,0 +1,73 @@
+package org.thingsboard.server.transport.coap;
+
+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.thingsboard.server.common.msg.session.FeatureType;
+
+import java.io.IOException;
+
+public class CoapTestClient {
+
+    private static final String COAP_BASE_URL = "coap://localhost:5683/api/v1/";
+    private static final long CLIENT_REQUEST_TIMEOUT = 60000L;
+
+    private final CoapClient client;
+
+    public CoapTestClient(){
+        this.client = createClient();
+    }
+
+    public CoapTestClient(String accessToken, FeatureType featureType) {
+        this.client = createClient(getFeatureTokenUrl(accessToken, featureType));
+    }
+
+    public CoapTestClient(String featureTokenUrl) {
+        this.client = createClient(featureTokenUrl);
+    }
+
+    public void connectToCoap(String accessToken, FeatureType featureType) {
+        connect(accessToken, featureType);
+    }
+
+    public void connectToCoap(String accessToken) {
+        connect(accessToken, null);
+    }
+
+    public void disconnect() {
+        if (client != null) {
+            client.shutdown();
+        };
+    }
+
+    public CoapResponse PostMethod(String requestBody) throws ConnectorException, IOException {
+        return client.setTimeout(CLIENT_REQUEST_TIMEOUT).post(requestBody.getBytes(), MediaTypeRegistry.APPLICATION_JSON);
+    }
+
+    public CoapResponse GetMethod() throws ConnectorException, IOException {
+        return client.setTimeout(CLIENT_REQUEST_TIMEOUT).get();
+    }
+
+    private void connect(String accessToken, FeatureType featureType) {
+        if (client == null) {
+            throw new RuntimeException("Failed to connect! CoapClient is not initialized!");
+        }
+        if (featureType == null){
+            featureType = FeatureType.ATTRIBUTES;
+        }
+        client.setURI(getFeatureTokenUrl(accessToken, featureType));
+    }
+
+    private CoapClient createClient() {
+        return new CoapClient();
+    }
+
+    private CoapClient createClient(String featureTokenUrl) {
+        return new CoapClient(featureTokenUrl);
+    }
+
+    public static String getFeatureTokenUrl(String token, FeatureType featureType) {
+        return COAP_BASE_URL + token + "/" + featureType.name().toLowerCase();
+    }
+}

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

@@ -15,16 +15,31 @@
  */
 package org.thingsboard.server.transport.coap.attributes;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.core.CoapResponse;
+import org.eclipse.californium.core.coap.CoAP;
+import org.eclipse.californium.core.coap.MediaTypeRegistry;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.coap.AbstractCoapIntegrationTest;
+import org.thingsboard.server.transport.coap.CoapTestClient;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @Slf4j
 public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoapIntegrationTest {
 
+    protected static final long CLIENT_REQUEST_TIMEOUT = 60000L;
+
     protected static final String POST_ATTRIBUTES_PAYLOAD = "{\"attribute1\":\"value1\",\"attribute2\":true,\"attribute3\":42.0,\"attribute4\":73," +
             "\"attribute5\":{\"someNumber\":42,\"someArray\":[1,2,3],\"someNestedObject\":{\"key\":\"value\"}}}";
 
@@ -49,4 +64,53 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         tsKvProtoBuilder.setKv(keyValueProto);
         return tsKvProtoBuilder.build();
     }
+
+    protected void processTestRequestAttributesValuesFromTheServer() throws Exception {
+        postAttributes();
+
+        long start = System.currentTimeMillis();
+        long end = System.currentTimeMillis() + 5000;
+
+        List<String> savedAttributeKeys = null;
+        while (start <= end) {
+            savedAttributeKeys = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/keys/attributes/CLIENT_SCOPE", new TypeReference<>() {});
+            if (savedAttributeKeys.size() == 5) {
+                break;
+            }
+            Thread.sleep(100);
+            start += 100;
+        }
+        assertNotNull(savedAttributeKeys);
+
+        String keys = "attribute1,attribute2,attribute3,attribute4,attribute5";
+        //String featureTokenUrl = getFeatureTokenUrl(accessToken, FeatureType.ATTRIBUTES) + "?clientKeys=" + keys + "&sharedKeys=" + keys;
+        //client = getCoapClient(featureTokenUrl);
+
+        //CoapResponse getAttributesResponse = client.setTimeout(CLIENT_REQUEST_TIMEOUT).get();
+        //validateResponse(getAttributesResponse);
+
+        //TODO - NEW -- YURIY
+        String featureTokenUrl = CoapTestClient.getFeatureTokenUrl(accessToken, FeatureType.ATTRIBUTES) + "?clientKeys=" + keys + "&sharedKeys=" + keys;
+        CoapTestClient client = new CoapTestClient(featureTokenUrl);
+
+        validateResponse(client.GetMethod());
+    }
+
+    protected void postAttributes() throws Exception {
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", POST_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+
+        //client = getCoapClient(FeatureType.ATTRIBUTES);
+        //CoapResponse coapResponse = client.setTimeout(CLIENT_REQUEST_TIMEOUT).post(POST_ATTRIBUTES_PAYLOAD.getBytes(), MediaTypeRegistry.APPLICATION_JSON);
+
+        CoapTestClient client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
+        CoapResponse coapResponse = client.PostMethod(POST_ATTRIBUTES_PAYLOAD);
+
+        assertEquals(CoAP.ResponseCode.CREATED, coapResponse.getCode());
+    }
+
+    protected void validateResponse(CoapResponse getAttributesResponse) throws InvalidProtocolBufferException {
+        assertEquals(CoAP.ResponseCode.CONTENT, getAttributesResponse.getCode());
+        String expectedRequestPayload = "{\"client\":{\"attribute1\":\"value1\",\"attribute2\":true,\"attribute3\":42.0,\"attribute4\":73,\"attribute5\":{\"someNumber\":42,\"someArray\":[1,2,3],\"someNestedObject\":{\"key\":\"value\"}}},\"shared\":{\"attribute1\":\"value1\",\"attribute2\":true,\"attribute3\":42.0,\"attribute4\":73,\"attribute5\":{\"someNumber\":42,\"someArray\":[1,2,3],\"someNestedObject\":{\"key\":\"value\"}}}}";
+        assertEquals(JacksonUtil.toJsonNode(expectedRequestPayload), JacksonUtil.toJsonNode(new String(getAttributesResponse.getPayload(), StandardCharsets.UTF_8)));
+    }
 }

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

@@ -41,8 +41,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class CoapAttributesRequestIntegrationTest extends AbstractCoapAttributesIntegrationTest {
 
-    protected static final long CLIENT_REQUEST_TIMEOUT = 60000L;
-
     @Before
     public void beforeTest() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
@@ -60,42 +58,4 @@ public class CoapAttributesRequestIntegrationTest extends AbstractCoapAttributes
     public void testRequestAttributesValuesFromTheServer() throws Exception {
         processTestRequestAttributesValuesFromTheServer();
     }
-
-    protected void processTestRequestAttributesValuesFromTheServer() throws Exception {
-        postAttributes();
-
-        long start = System.currentTimeMillis();
-        long end = System.currentTimeMillis() + 5000;
-
-        List<String> savedAttributeKeys = null;
-        while (start <= end) {
-            savedAttributeKeys = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/keys/attributes/CLIENT_SCOPE", new TypeReference<>() {});
-            if (savedAttributeKeys.size() == 5) {
-                break;
-            }
-            Thread.sleep(100);
-            start += 100;
-        }
-        assertNotNull(savedAttributeKeys);
-
-        String keys = "attribute1,attribute2,attribute3,attribute4,attribute5";
-        String featureTokenUrl = getFeatureTokenUrl(accessToken, FeatureType.ATTRIBUTES) + "?clientKeys=" + keys + "&sharedKeys=" + keys;
-        client = getCoapClient(featureTokenUrl);
-
-        CoapResponse getAttributesResponse = client.setTimeout(CLIENT_REQUEST_TIMEOUT).get();
-        validateResponse(getAttributesResponse);
-    }
-
-    protected void postAttributes() throws Exception {
-        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", POST_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
-        client = getCoapClient(FeatureType.ATTRIBUTES);
-        CoapResponse coapResponse = client.setTimeout(CLIENT_REQUEST_TIMEOUT).post(POST_ATTRIBUTES_PAYLOAD.getBytes(), MediaTypeRegistry.APPLICATION_JSON);
-        assertEquals(CoAP.ResponseCode.CREATED, coapResponse.getCode());
-    }
-
-    protected void validateResponse(CoapResponse getAttributesResponse) throws InvalidProtocolBufferException {
-        assertEquals(CoAP.ResponseCode.CONTENT, getAttributesResponse.getCode());
-        String expectedRequestPayload = "{\"client\":{\"attribute1\":\"value1\",\"attribute2\":true,\"attribute3\":42.0,\"attribute4\":73,\"attribute5\":{\"someNumber\":42,\"someArray\":[1,2,3],\"someNestedObject\":{\"key\":\"value\"}}},\"shared\":{\"attribute1\":\"value1\",\"attribute2\":true,\"attribute3\":42.0,\"attribute4\":73,\"attribute5\":{\"someNumber\":42,\"someArray\":[1,2,3],\"someNestedObject\":{\"key\":\"value\"}}}}";
-        assertEquals(JacksonUtil.toJsonNode(expectedRequestPayload), JacksonUtil.toJsonNode(new String(getAttributesResponse.getPayload(), StandardCharsets.UTF_8)));
-    }
 }

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

@@ -45,6 +45,6 @@ public class CoapAttributesRequestJsonIntegrationTest extends CoapAttributesRequ
 
     @Test
     public void testRequestAttributesValuesFromTheServer() throws Exception {
-        super.testRequestAttributesValuesFromTheServer();
+        processTestRequestAttributesValuesFromTheServer();
     }
 }