Browse Source

fixed tests

pull/8803/head
dashevchenko 3 years ago
parent
commit
295a145d2d
  1. 4
      application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityMqttSslCertService.java

4
application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java

@ -766,7 +766,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
credentials.getCredentialsId()));
assertThat(commands.get(COAP)).isEqualTo(String.format("coap-client -m POST coap://localhost:5683/api/v1/%s/telemetry -t json -e \"{temperature:25}\"",
credentials.getCredentialsId()));
assertThat(commands.get(COAPS)).isEqualTo(String.format("coap-client-openssl -v 9 -m POST coaps://localhost:5684/api/v1/%s/telemetry -t json -e \"{temperature:25}\"",
assertThat(commands.get(COAPS)).isEqualTo(String.format("coap-client-openssl -m POST coaps://localhost:5684/api/v1/%s/telemetry -t json -e \"{temperature:25}\"",
credentials.getCredentialsId()));
}
@ -856,7 +856,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
assertThat(commands).hasSize(2);
assertThat(commands.get(COAP)).isEqualTo(String.format("coap-client -m POST coap://localhost:5683/api/v1/%s/telemetry -t json -e \"{temperature:25}\"",
credentials.getCredentialsId()));
assertThat(commands.get(COAPS)).isEqualTo(String.format("coap-client-openssl -v 9 -m POST coaps://localhost:5684/api/v1/%s/telemetry -t json -e \"{temperature:25}\"",
assertThat(commands.get(COAPS)).isEqualTo(String.format("coap-client-openssl -m POST coaps://localhost:5684/api/v1/%s/telemetry -t json -e \"{temperature:25}\"",
credentials.getCredentialsId()));
}

2
dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityMqttSslCertService.java

@ -41,7 +41,7 @@ public class DeviceConnectivityMqttSslCertService implements TbDeviceConnectivit
String sslCertPath = deviceConnectivityConfiguration.getConnectivity()
.get(MQTTS)
.getSslCertPath();
if (!sslCertPath.isEmpty() && ResourceUtils.resourceExists(this, sslCertPath)) {
if (sslCertPath != null && ResourceUtils.resourceExists(this, sslCertPath)) {
certificate = FileUtils.readFileToString(new File(sslCertPath), StandardCharsets.UTF_8);
}
}

Loading…
Cancel
Save