From b2a93e834b043f9c514e0f2b0ae0a62105244fad Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Tue, 26 Oct 2021 19:35:36 +0300 Subject: [PATCH] Improved tests --- .../lwm2m/AbstractLwM2MIntegrationTest.java | 3 +-- .../lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java | 13 ++++--------- .../lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java index 0bdc221b1b..1a49807374 100644 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java @@ -123,7 +123,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest protected LwM2MTestClient client; private final LwM2MBootstrapCredentials defaultBootstrapCredentials; private String[] resources; - private String endpoint; + protected String endpoint; public AbstractLwM2MIntegrationTest() { this.defaultBootstrapCredentials = new LwM2MBootstrapCredentials(); @@ -238,7 +238,6 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest deviceCredentials.setCredentialsValue(JacksonUtil.toString(credentials)); doPost("/api/device/credentials", deviceCredentials).andExpect(status().isOk()); - Thread.sleep(1000); return device; } diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java index ab08379389..93f9ffb1ae 100644 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL; @@ -52,7 +53,6 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg protected String RPC_TRANSPORT_CONFIGURATION; - protected static final String ENDPOINT_RPC = "deviceEndpointRpc"; protected ScheduledExecutorService executor; protected TbTestWebSocketClient wsClient; protected String deviceId; @@ -72,19 +72,18 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg protected String objectIdVer_19; protected String objectIdVer_50 = "/50"; protected String objectIdVer_3303; + protected static AtomicInteger endpointSequence = new AtomicInteger(); public AbstractRpcLwM2MIntegrationTest(){ setResources(resources); - setEndpoint(ENDPOINT_RPC); } @Before public void beforeTest() throws Exception { + setEndpoint("deviceEndpointRpc" + endpointSequence.incrementAndGet()); init(); createNewClient (SECURITY, COAP_CONFIG, true); - Thread.sleep(1000); - expectedObjects = ConcurrentHashMap.newKeySet(); expectedObjectIdVers = ConcurrentHashMap.newKeySet(); expectedInstances = ConcurrentHashMap.newKeySet(); @@ -179,14 +178,10 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg "}"; createDeviceProfile(RPC_TRANSPORT_CONFIGURATION); - Thread.sleep(1000); - - NoSecClientCredentials credentials = createNoSecClientCredentials(ENDPOINT_RPC); + NoSecClientCredentials credentials = createNoSecClientCredentials(endpoint); final Device device = createDevice(credentials); deviceId = device.getId().getId().toString(); - Thread.sleep(1000); - client.start(); } diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java index 3dad6231ad..e039efa8eb 100644 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java +++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java @@ -121,7 +121,7 @@ public class RpcLwm2mIntegrationWriteTest extends AbstractRpcLwM2MIntegrationTes ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class); assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText()); String actualValues = rpcActualResult.get("error").asText(); - String expected = "Format value is bad. Value for this Multi-Instance Resource must be in Json format!"; + String expected = "Value of Multi-Instance Resource must be in Json format!"; assertTrue(actualValues.contains(expected)); }