From 671b8dc24433433613efdbc8dde8c40f9ec9ebbb Mon Sep 17 00:00:00 2001 From: sarocs Date: Mon, 7 Apr 2025 13:29:30 -0500 Subject: [PATCH 1/2] Use create coap profile in tests --- .../server/controller/DeviceConnectivityControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java index 04d71b890f..27c551be32 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java @@ -176,7 +176,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest { DeviceProfileData deviceProfileData2 = new DeviceProfileData(); deviceProfileData2.setConfiguration(new DefaultDeviceProfileConfiguration()); deviceProfileData2.setTransportConfiguration(new CoapDeviceProfileTransportConfiguration()); - coapProfile.setProfileData(deviceProfileData); + coapProfile.setProfileData(deviceProfileData2); coapProfile.setDefault(false); coapProfile.setDefaultRuleChainId(null); From eadb946d9e7615ccc34e0b7a82a25de21e43a066 Mon Sep 17 00:00:00 2001 From: sarocs Date: Fri, 11 Apr 2025 19:18:15 -0500 Subject: [PATCH 2/2] Renamed profile data variables --- .../DeviceConnectivityControllerTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java index 27c551be32..773f9f33f4 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java @@ -158,12 +158,12 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest { mqttProfile.setName("Mqtt device profile"); mqttProfile.setType(DeviceProfileType.DEFAULT); mqttProfile.setTransportType(DeviceTransportType.MQTT); - DeviceProfileData deviceProfileData = new DeviceProfileData(); - deviceProfileData.setConfiguration(new DefaultDeviceProfileConfiguration()); + DeviceProfileData mqttProfileData = new DeviceProfileData(); + mqttProfileData.setConfiguration(new DefaultDeviceProfileConfiguration()); MqttDeviceProfileTransportConfiguration transportConfiguration = new MqttDeviceProfileTransportConfiguration(); transportConfiguration.setDeviceTelemetryTopic(DEVICE_TELEMETRY_TOPIC); - deviceProfileData.setTransportConfiguration(transportConfiguration); - mqttProfile.setProfileData(deviceProfileData); + mqttProfileData.setTransportConfiguration(transportConfiguration); + mqttProfile.setProfileData(mqttProfileData); mqttProfile.setDefault(false); mqttProfile.setDefaultRuleChainId(null); @@ -173,10 +173,10 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest { coapProfile.setName("Coap device profile"); coapProfile.setType(DeviceProfileType.DEFAULT); coapProfile.setTransportType(DeviceTransportType.COAP); - DeviceProfileData deviceProfileData2 = new DeviceProfileData(); - deviceProfileData2.setConfiguration(new DefaultDeviceProfileConfiguration()); - deviceProfileData2.setTransportConfiguration(new CoapDeviceProfileTransportConfiguration()); - coapProfile.setProfileData(deviceProfileData2); + DeviceProfileData coapProfileData = new DeviceProfileData(); + coapProfileData.setConfiguration(new DefaultDeviceProfileConfiguration()); + coapProfileData.setTransportConfiguration(new CoapDeviceProfileTransportConfiguration()); + coapProfile.setProfileData(coapProfileData); coapProfile.setDefault(false); coapProfile.setDefaultRuleChainId(null);