From 0227b2b314009545fe5c52dfbee7a3d087d434e0 Mon Sep 17 00:00:00 2001 From: nickAS21 Date: Tue, 11 Nov 2025 09:41:11 +0200 Subject: [PATCH] lwm2m: test CID client - 2 --- ...tyLwM2MIntegrationDtlsCidLength2Test.java} | 6 +- ...oSecLwM2MIntegrationDtlsCidLengthTest.java | 63 ------------------- .../PskLwm2mIntegrationDtlsCidLengthTest.java | 18 +++--- ...oSecLwM2MIntegrationDtlsCidLengthTest.java | 62 ------------------ ...oSecLwM2MIntegrationDtlsCidLengthTest.java | 63 ------------------- 5 files changed, 12 insertions(+), 200 deletions(-) rename application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/{AbstractSecurityLwM2MIntegrationDtlsCidLength8Test.java => AbstractSecurityLwM2MIntegrationDtlsCidLength2Test.java} (87%) delete mode 100644 application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_1/NoSecLwM2MIntegrationDtlsCidLengthTest.java rename application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/{serverDtlsCidLength_8 => serverDtlsCidLength_2}/PskLwm2mIntegrationDtlsCidLengthTest.java (87%) delete mode 100644 application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_4/NoSecLwM2MIntegrationDtlsCidLengthTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_8/NoSecLwM2MIntegrationDtlsCidLengthTest.java diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength8Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength2Test.java similarity index 87% rename from application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength8Test.java rename to application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength2Test.java index 341d8a8f86..1cb657e4a4 100644 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength8Test.java +++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength2Test.java @@ -21,14 +21,14 @@ import org.thingsboard.server.dao.service.DaoSqlTest; @TestPropertySource(properties = { - "transport.lwm2m.dtls.connection_id_length=8" + "transport.lwm2m.dtls.connection_id_length=2" }) @DaoSqlTest @Slf4j -public abstract class AbstractSecurityLwM2MIntegrationDtlsCidLength8Test extends AbstractSecurityLwM2MIntegrationDtlsCidLengthTest { +public abstract class AbstractSecurityLwM2MIntegrationDtlsCidLength2Test extends AbstractSecurityLwM2MIntegrationDtlsCidLengthTest { - private static final Integer serverDtlsCidLength = 8; + private static final Integer serverDtlsCidLength = 2; protected void testNoSecDtlsCidLength(Integer dtlsCidLength) throws Exception { testNoSecDtlsCidLength(dtlsCidLength, serverDtlsCidLength); diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_1/NoSecLwM2MIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_1/NoSecLwM2MIntegrationDtlsCidLengthTest.java deleted file mode 100644 index 6f9a2ac753..0000000000 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_1/NoSecLwM2MIntegrationDtlsCidLengthTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright © 2016-2025 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_1; - -import org.junit.Before; -import org.junit.Test; -import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength0Test; -import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength1Test; - -import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.NO_SEC; -import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; - -public class NoSecLwM2MIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength1Test { - - @Before - public void setUpNoSecDtlsCidLength() { - transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(NO_SEC, NONE)); - awaitAlias = "await on client state (NoSec_Lwm2m) DtlsCidLength = 1"; - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception { - testNoSecDtlsCidLength(null); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception { - testNoSecDtlsCidLength(0); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_1() throws Exception { - testNoSecDtlsCidLength(1); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_4() throws Exception { - testNoSecDtlsCidLength(4); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_8() throws Exception { - testNoSecDtlsCidLength(8); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_16() throws Exception { - testNoSecDtlsCidLength(16); - } -} diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_8/PskLwm2mIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_2/PskLwm2mIntegrationDtlsCidLengthTest.java similarity index 87% rename from application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_8/PskLwm2mIntegrationDtlsCidLengthTest.java rename to application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_2/PskLwm2mIntegrationDtlsCidLengthTest.java index 32e6802375..a1a1d18042 100644 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_8/PskLwm2mIntegrationDtlsCidLengthTest.java +++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_2/PskLwm2mIntegrationDtlsCidLengthTest.java @@ -13,22 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_8; +package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_2; import org.junit.Before; import org.junit.Test; -import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength4Test; -import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength8Test; +import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength2Test; import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.PSK; import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; -public class PskLwm2mIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength8Test { +public class PskLwm2mIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength2Test { @Before public void createProfileRpc() { transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(PSK, NONE)); - awaitAlias = "await on client state (Psk_Lwm2m) DtlsCidLength = 8"; + awaitAlias = "await on client state (Psk_Lwm2m) DtlsCidLength = 2"; } @Test @@ -47,14 +46,15 @@ public class PskLwm2mIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MI } @Test - public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_4() throws Exception { - testPskDtlsCidLength(4); + public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_2() throws Exception { + testPskDtlsCidLength(2); } @Test - public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_8() throws Exception { - testPskDtlsCidLength(8); + public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_4() throws Exception { + testPskDtlsCidLength(4); } + @Test public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_16() throws Exception { testPskDtlsCidLength(16); diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_4/NoSecLwM2MIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_4/NoSecLwM2MIntegrationDtlsCidLengthTest.java deleted file mode 100644 index 258e0d1263..0000000000 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_4/NoSecLwM2MIntegrationDtlsCidLengthTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright © 2016-2025 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_4; - -import org.junit.Before; -import org.junit.Test; -import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength4Test; - -import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.NO_SEC; -import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; - -public class NoSecLwM2MIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength4Test { - - @Before - public void setUpNoSecDtlsCidLength() { - transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(NO_SEC, NONE)); - awaitAlias = "await on client state (NoSec_Lwm2m) DtlsCidLength = 4"; - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception { - testNoSecDtlsCidLength(null); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception { - testNoSecDtlsCidLength(0); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_1() throws Exception { - testNoSecDtlsCidLength(1); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_4() throws Exception { - testNoSecDtlsCidLength(4); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_8() throws Exception { - testNoSecDtlsCidLength(8); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_16() throws Exception { - testNoSecDtlsCidLength(16); - } -} diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_8/NoSecLwM2MIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_8/NoSecLwM2MIntegrationDtlsCidLengthTest.java deleted file mode 100644 index 7af7a73544..0000000000 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_8/NoSecLwM2MIntegrationDtlsCidLengthTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright © 2016-2025 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_8; - -import org.junit.Before; -import org.junit.Test; -import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength4Test; -import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength8Test; - -import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.NO_SEC; -import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; - -public class NoSecLwM2MIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength8Test { - - @Before - public void setUpNoSecDtlsCidLength() { - transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(NO_SEC, NONE)); - awaitAlias = "await on client state (NoSec_Lwm2m) DtlsCidLength = 8"; - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception { - testNoSecDtlsCidLength(null); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception { - testNoSecDtlsCidLength(0); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_1() throws Exception { - testNoSecDtlsCidLength(1); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_4() throws Exception { - testNoSecDtlsCidLength(4); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_8() throws Exception { - testNoSecDtlsCidLength(8); - } - - @Test - public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_16() throws Exception { - testNoSecDtlsCidLength(16); - } -}