Removed redundant endpoint, RPK test is separated

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

@@ -163,13 +163,12 @@ public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
 
     protected static final int SECURE_PORT = 5686;
     protected static final NetworkConfig SECURE_COAP_CONFIG = new NetworkConfig().setString("COAP_SECURE_PORT", Integer.toString(SECURE_PORT));
-    protected static final String SECURE_ENDPOINT = "deviceAEndpoint";
+    protected static final String ENDPOINT = "deviceAEndpoint";
     protected static final String SECURE_URI = "coaps://localhost:" + SECURE_PORT;
 
     protected static final int PORT = 5685;
     protected static final Security SECURITY = noSec("coap://localhost:" + PORT, 123);
     protected static final NetworkConfig COAP_CONFIG = new NetworkConfig().setString("COAP_PORT", Integer.toString(PORT));
-    protected static final String ENDPOINT = "deviceAEndpoint";
 
     public AbstractLwM2MIntegrationTest() {
 // create client credentials

application/src/test/java/org/thingsboard/server/transport/lwm2m/PskRpkLwm2mIntegrationTest.java → application/src/test/java/org/thingsboard/server/transport/lwm2m/PskLwm2mIntegrationTest.java

@@ -19,39 +19,25 @@ import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.core.util.Hex;
 import org.junit.Test;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.PSKClientCredentials;
-import org.thingsboard.server.common.data.device.credentials.lwm2m.RPKClientCredentials;
 
 import java.nio.charset.StandardCharsets;
 
 import static org.eclipse.leshan.client.object.Security.psk;
-import static org.eclipse.leshan.client.object.Security.rpk;
 
-public class PskRpkLwm2mIntegrationTest extends AbstractLwM2MIntegrationTest {
-    @Test
-    public void testConnectWithRPKAndObserveTelemetry() throws Exception {
-        RPKClientCredentials rpkClientCredentials = new RPKClientCredentials();
-        rpkClientCredentials.setEndpoint(SECURE_ENDPOINT);
-        rpkClientCredentials.setKey(Hex.encodeHexString(clientPublicKey.getEncoded()));
-        Security security = rpk(SECURE_URI,
-                123,
-                clientPublicKey.getEncoded(),
-                clientPrivateKey.getEncoded(),
-                serverX509Cert.getPublicKey().getEncoded());
-        super.basicTestConnectionObserveTelemetry(security, rpkClientCredentials, SECURE_COAP_CONFIG, SECURE_ENDPOINT);
-    }
+public class PskLwm2mIntegrationTest extends AbstractLwM2MIntegrationTest {
 
     @Test
     public void testConnectWithPSKAndObserveTelemetry() throws Exception {
         String pskIdentity = "SOME_PSK_ID";
         String pskKey = "73656372657450534b";
         PSKClientCredentials clientCredentials = new PSKClientCredentials();
-        clientCredentials.setEndpoint(SECURE_ENDPOINT);
+        clientCredentials.setEndpoint(ENDPOINT);
         clientCredentials.setKey(pskKey);
         clientCredentials.setIdentity(pskIdentity);
         Security security = psk(SECURE_URI,
                 123,
                 pskIdentity.getBytes(StandardCharsets.UTF_8),
                 Hex.decodeHex(pskKey.toCharArray()));
-        super.basicTestConnectionObserveTelemetry(security, clientCredentials, SECURE_COAP_CONFIG, SECURE_ENDPOINT);
+        super.basicTestConnectionObserveTelemetry(security, clientCredentials, SECURE_COAP_CONFIG, ENDPOINT);
     }
 }

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

@@ -0,0 +1,39 @@
+/**
+ * Copyright © 2016-2021 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;
+
+import org.eclipse.leshan.client.object.Security;
+import org.eclipse.leshan.core.util.Hex;
+import org.junit.Test;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.RPKClientCredentials;
+
+import static org.eclipse.leshan.client.object.Security.rpk;
+
+public class RpkLwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
+    @Test
+    public void testConnectWithRPKAndObserveTelemetry() throws Exception {
+        RPKClientCredentials rpkClientCredentials = new RPKClientCredentials();
+        rpkClientCredentials.setEndpoint(ENDPOINT);
+        rpkClientCredentials.setKey(Hex.encodeHexString(clientPublicKey.getEncoded()));
+        Security security = rpk(SECURE_URI,
+                123,
+                clientPublicKey.getEncoded(),
+                clientPrivateKey.getEncoded(),
+                serverX509Cert.getPublicKey().getEncoded());
+        super.basicTestConnectionObserveTelemetry(security, rpkClientCredentials, SECURE_COAP_CONFIG, ENDPOINT);
+    }
+
+}

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

@@ -26,25 +26,25 @@ public class X509LwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
     @Test
     public void testConnectAndObserveTelemetry() throws Exception {
         X509ClientCredentials credentials = new X509ClientCredentials();
-        credentials.setEndpoint(SECURE_ENDPOINT);
+        credentials.setEndpoint(ENDPOINT);
         Security security = x509(SECURE_URI,
                 123,
                 clientX509Cert.getEncoded(),
                 clientPrivateKeyFromCert.getEncoded(),
                 serverX509Cert.getEncoded());
-        super.basicTestConnectionObserveTelemetry(security, credentials, SECURE_COAP_CONFIG, SECURE_ENDPOINT);
+        super.basicTestConnectionObserveTelemetry(security, credentials, SECURE_COAP_CONFIG, ENDPOINT);
     }
 
     @Test
     public void testConnectWithCertAndObserveTelemetry() throws Exception {
         X509ClientCredentials credentials = new X509ClientCredentials();
-        credentials.setEndpoint(SECURE_ENDPOINT);
+        credentials.setEndpoint(ENDPOINT);
         credentials.setCert(SslUtil.getCertificateString(clientX509CertNotTrusted));
         Security security = x509(SECURE_URI,
                 123,
                 clientX509CertNotTrusted.getEncoded(),
                 clientPrivateKeyFromCert.getEncoded(),
                 serverX509Cert.getEncoded());
-        super.basicTestConnectionObserveTelemetry(security, credentials, SECURE_COAP_CONFIG, SECURE_ENDPOINT);
+        super.basicTestConnectionObserveTelemetry(security, credentials, SECURE_COAP_CONFIG, ENDPOINT);
     }
 }