dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lwm2m tests add RPK

Browse Source
This commit is contained in:
nickAS21 2022-01-08 23:48:24 +02:00
parent fe9b61586f
commit 98331c79a0
7 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ public class Lwm2mTestHelper {
public static final int resourceId_2 = 2; public static final int resourceId_2 = 2;
public static final int resourceId_3 = 3; public static final int resourceId_3 = 3;
public static final int resourceId_4 = 4; 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_8 = 8;
public static final int resourceId_9 = 9; public static final int resourceId_9 = 9;
public static final int resourceId_11 = 11; public static final int resourceId_11 = 11;

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

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

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

@ -67,9 +67,6 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
// Client // Client
protected LwM2MTestClient 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_NO_TRUST = "deviceAEndpoint";
protected static final String CLIENT_ENDPOINT_TRUST = "LwX50900000000"; protected static final String CLIENT_ENDPOINT_TRUST = "LwX50900000000";
protected static final String CLIENT_JKS_FOR_TEST = "lwm2mclient"; protected static final String CLIENT_JKS_FOR_TEST = "lwm2mclient";

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

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

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

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

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

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

1
application/src/test/resources/logback.xml
View File

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