Browse Source

Minor log messages changes to DeviceApiController, GetOtaPackageCallback test added.

Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
pull/10436/head
Oleksandra Matviienko 3 years ago
parent
commit
2e045a158f
  1. 8
      common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
  2. 36
      common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java

8
common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java

@ -431,7 +431,7 @@ public class DeviceApiController implements TbTransportService {
.setDeviceIdMSB(sessionInfo.getDeviceIdMSB()) .setDeviceIdMSB(sessionInfo.getDeviceIdMSB())
.setDeviceIdLSB(sessionInfo.getDeviceIdLSB()) .setDeviceIdLSB(sessionInfo.getDeviceIdLSB())
.setType(firmwareType.name()).build(); .setType(firmwareType.name()).build();
transportContext.getTransportService().process(sessionInfo, requestMsg, new GetOtaPackageCallback(responseWriter, title, version, size, chunk)); transportContext.getTransportService().process(sessionInfo, requestMsg, new GetOtaPackageCallback(transportContext,responseWriter, title, version, size, chunk));
})); }));
return responseWriter; return responseWriter;
} }
@ -494,14 +494,16 @@ public class DeviceApiController implements TbTransportService {
} }
} }
private class GetOtaPackageCallback implements TransportServiceCallback<TransportProtos.GetOtaPackageResponseMsg> { static class GetOtaPackageCallback implements TransportServiceCallback<TransportProtos.GetOtaPackageResponseMsg> {
private final TransportContext transportContext;
private final DeferredResult<ResponseEntity> responseWriter; private final DeferredResult<ResponseEntity> responseWriter;
private final String title; private final String title;
private final String version; private final String version;
private final int chuckSize; private final int chuckSize;
private final int chuck; private final int chuck;
GetOtaPackageCallback(DeferredResult<ResponseEntity> responseWriter, String title, String version, int chuckSize, int chuck) { GetOtaPackageCallback(TransportContext transportContext, DeferredResult<ResponseEntity> responseWriter, String title, String version, int chuckSize, int chuck) {
this.transportContext = transportContext;
this.responseWriter = responseWriter; this.responseWriter = responseWriter;
this.title = title; this.title = title;
this.version = version; this.version = version;

36
common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java

@ -16,7 +16,6 @@
package org.thingsboard.server.transport.http; package org.thingsboard.server.transport.http;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -28,12 +27,10 @@ import org.thingsboard.server.gen.transport.TransportProtos;
import java.io.IOException; import java.io.IOException;
import java.util.function.Consumer; import java.util.function.Consumer;
import static org.junit.jupiter.api.Assertions.*;
class DeviceApiControllerTest { class DeviceApiControllerTest {
@Test @Test
void DeviceAuthCallbackTest() { void deviceAuthCallbackTest() {
TransportContext transportContext = Mockito.mock(TransportContext.class); TransportContext transportContext = Mockito.mock(TransportContext.class);
DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class); DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
Consumer<TransportProtos.SessionInfoProto> onSuccess = x -> {}; Consumer<TransportProtos.SessionInfoProto> onSuccess = x -> {};
@ -49,7 +46,7 @@ class DeviceApiControllerTest {
} }
@Test @Test
void DeviceProvisionCallbackTest() { void deviceProvisionCallbackTest() {
DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class); DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
var callback = new DeviceApiController.DeviceProvisionCallback(responseWriter); var callback = new DeviceApiController.DeviceProvisionCallback(responseWriter);
@ -62,14 +59,23 @@ class DeviceApiControllerTest {
callback.onError(new RuntimeException("oops it is run time error")); callback.onError(new RuntimeException("oops it is run time error"));
} }
//@Test @Test
// void GetOtaPackageCallback() { void getOtaPackageCallback() {
// DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class); TransportContext transportContext = Mockito.mock(TransportContext.class);
// String title = "Title"; DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
// String version = "version"; String title = "Title";
// int chuckSize = 11; String version = "version";
// int chuck = 3; int chuckSize = 11;
// int chuck = 3;
// var callback = new DeviceApiController.GetOtaPackageCallback(responseWriter, title, version, chuckSize, chuck);
// } var callback = new DeviceApiController.GetOtaPackageCallback(transportContext, responseWriter, title, version, chuckSize, chuck);
callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
callback.onError(new JsonParseException("Json ; expected"));
callback.onError(new IOException("not found"));
callback.onError(new RuntimeException("oops it is run time error"));
}
} }

Loading…
Cancel
Save