lwm2m tests add RPK

application/src/test/java/org/thingsboard/server/transport/lwm2m/Lwm2mTestHelper.java

@@ -55,6 +55,7 @@ public class Lwm2mTestHelper {
     public static final int resourceId_2 = 2;
     public static final int resourceId_3 = 3;
     public static final int resourceId_4 = 4;
+    public static final int resourceId_7 = 7;
     public static final int resourceId_8 = 8;
     public static final int resourceId_9 = 9;
     public static final int resourceId_11 = 11;

application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDeleteTest.java

@@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.objectInstanceId_0;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.objectInstanceId_12;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.resourceId_7;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.resourceId_9;
 
 
@@ -74,18 +75,18 @@ public class RpcLwm2mIntegrationDeleteTest extends AbstractRpcLwM2MIntegrationTe
     }
 
 
-//    /**
-//     * delete resource
-//     * Delete {"id":"/3/0/9"}
-//     * {"result":"METHOD_NOT_ALLOWED"}
-//     */
-//    @Test
-//    public void testDeleteResourceByIdKey_Result_METHOD_NOT_ALLOWED() throws Exception {
-//        String expectedPath = objectIdVer_3 + "/" + objectInstanceId_0 + resourceId_9;
-//        String actualResult = sendRPCDeleteById(expectedPath);
-//        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
-//        assertEquals(ResponseCode.METHOD_NOT_ALLOWED.getName(), rpcActualResult.get("result").asText());
-//    }
+    /**
+     * delete resource
+     * Delete {"id":"/3/0/7"}
+     * {"result":"METHOD_NOT_ALLOWED"}
+     */
+    @Test
+    public void testDeleteResourceByIdKey_Result_METHOD_NOT_ALLOWED() throws Exception {
+        String expectedPath = objectIdVer_3 + "/" + objectInstanceId_0 + resourceId_7;
+        String actualResult = sendRPCDeleteById(expectedPath);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.METHOD_NOT_ALLOWED.getName(), rpcActualResult.get("result").asText());
+    }
 
 
     private String sendRPCDeleteById(String path) throws Exception {

application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractSecurityLwM2MIntegrationTest.java

@@ -67,9 +67,6 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
 
     // Client
     protected LwM2MTestClient client;
-    protected static final String CLIENT_ENDPOINT_NO_SEC = "deviceNoSec";
-    protected static final String CLIENT_ENDPOINT_PSK = "devicePSK";
-    protected static final String CLIENT_ENDPOINT_RPK = "deviceRPK";
     protected static final String CLIENT_ENDPOINT_NO_TRUST = "deviceAEndpoint";
     protected static final String CLIENT_ENDPOINT_TRUST = "LwX50900000000";
     protected static final String CLIENT_JKS_FOR_TEST = "lwm2mclient";

application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/NoSecLwM2MIntegrationTest.java

@@ -29,8 +29,8 @@ public class NoSecLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegrationT
 
     @Test
     public void testConnectAndObserveTelemetry() throws Exception {
-        NoSecClientCredential clientCredentials =  createNoSecClientCredentials(CLIENT_ENDPOINT_NO_SEC);
-        super.basicTestConnectionObserveTelemetry(SECURITY, clientCredentials, COAP_CONFIG, CLIENT_ENDPOINT_NO_SEC);
+        NoSecClientCredential clientCredentials =  createNoSecClientCredentials(CLIENT_ENDPOINT_TRUST);
+        super.basicTestConnectionObserveTelemetry(SECURITY, clientCredentials, COAP_CONFIG, CLIENT_ENDPOINT_TRUST);
     }
 
 }

application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java

@@ -34,13 +34,13 @@ public class PskLwm2mIntegrationTest extends AbstractSecurityLwM2MIntegrationTes
     @Test
     public void testConnectWithPSKAndObserveTelemetry() throws Exception {
         PSKClientCredential clientCredentials = new PSKClientCredential();
-        clientCredentials.setEndpoint(CLIENT_ENDPOINT_PSK);
+        clientCredentials.setEndpoint(CLIENT_ENDPOINT_TRUST);
         clientCredentials.setKey(pskKey);
         clientCredentials.setIdentity(pskIdentity);
         Security security = psk(SECURE_URI,
                 SHORT_SERVER_ID,
                 pskIdentity.getBytes(StandardCharsets.UTF_8),
                 Hex.decodeHex(pskKey.toCharArray()));
-        super.basicTestConnectionObserveTelemetry(security, clientCredentials, SECURE_COAP_CONFIG, CLIENT_ENDPOINT_PSK);
+        super.basicTestConnectionObserveTelemetry(security, clientCredentials, SECURE_COAP_CONFIG, CLIENT_ENDPOINT_TRUST);
     }
 }

application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/RpkLwM2MIntegrationTest.java

@@ -30,17 +30,16 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.SHORT_SERVE
 
 public class RpkLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegrationTest {
 
-    @Ignore
     @Test
     public void testConnectWithRPKAndObserveTelemetry() throws Exception {
         RPKClientCredential rpkClientCredentials = new RPKClientCredential();
-        rpkClientCredentials.setEndpoint(CLIENT_ENDPOINT_RPK);
-        rpkClientCredentials.setKey(new String(Base64.encodeBase64(clientPrivateKeyFromCert.getEncoded())));
+        rpkClientCredentials.setEndpoint(CLIENT_ENDPOINT_TRUST);
+        rpkClientCredentials.setKey(new String(Base64.encodeBase64(clientPublicKeyFromCert.getEncoded())));
         Security security = rpk(SECURE_URI,
                 SHORT_SERVER_ID,
                 clientPublicKeyFromCert.getEncoded(),
                 clientPrivateKeyFromCert.getEncoded(),
                 serverPublicKeyFromCert.getEncoded());
-        super.basicTestConnectionObserveTelemetry(security, rpkClientCredentials, SECURE_COAP_CONFIG, CLIENT_ENDPOINT_RPK);
+        super.basicTestConnectionObserveTelemetry(security, rpkClientCredentials, SECURE_COAP_CONFIG, CLIENT_ENDPOINT_TRUST);
     }
 }

application/src/test/resources/logback.xml

@@ -10,7 +10,6 @@
 <!--    <logger name="org.thingsboard.server.service.subscription" level="TRACE"/>-->
     <logger name="org.thingsboard.server.controller.TbTestWebSocketClient" level="INFO"/>
     <logger name="org.thingsboard.server" level="WARN"/>
-    <logger name="org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest" level="INFO"/>
     <logger name="org.springframework" level="WARN"/>
     <logger name="org.springframework.boot.test" level="WARN"/>
     <logger name="org.apache.cassandra" level="WARN"/>