dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor RpcController tests

Browse Source
This commit is contained in:
desoliture 2021-12-01 11:13:39 +02:00
parent aa395e3c51
commit d854bab8cb
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/src/test/java/org/thingsboard/server/controller/BaseRpcControllerTest.java
View File

@ -98,14 +98,6 @@ public abstract class BaseRpcControllerTest extends AbstractControllerTest {
return doDelete("/api/rpc/persistent/" + rpcId).andReturn(); return doDelete("/api/rpc/persistent/" + rpcId).andReturn();
} }
private MvcResult getRpcByDeviceId(String deviceId) throws Exception {
String url = "/api/rpc/persistent/device/" + deviceId
+ "?" + "page=0" + "&" +
"pageSize=" + Integer.MAX_VALUE + "&" +
"rpcStatus=" + RpcStatus.DELETED.name();
return doGet(url).andReturn();
}
@Test @Test
public void testSaveRpc() throws Exception { public void testSaveRpc() throws Exception {
Device device = createDefaultDevice(); Device device = createDefaultDevice();
@ -123,7 +115,6 @@ public abstract class BaseRpcControllerTest extends AbstractControllerTest {
.asText(); .asText();
Rpc savedRpc = getRpcById(rpcId); Rpc savedRpc = getRpcById(rpcId);
//Assertion
Assert.assertNotNull(savedRpc); Assert.assertNotNull(savedRpc);
Assert.assertEquals(savedDevice.getId(), savedRpc.getDeviceId()); Assert.assertEquals(savedDevice.getId(), savedRpc.getDeviceId());
} }
@ -153,7 +144,11 @@ public abstract class BaseRpcControllerTest extends AbstractControllerTest {
JsonNode deleteResponse = JacksonUtil.fromString(res.getResponse().getContentAsString(), JsonNode.class); JsonNode deleteResponse = JacksonUtil.fromString(res.getResponse().getContentAsString(), JsonNode.class);
Assert.assertEquals(404, deleteResponse.get("status").asInt()); Assert.assertEquals(404, deleteResponse.get("status").asInt());
MvcResult byDeviceResult = getRpcByDeviceId(savedDevice.getUuidId().toString()); String url = "/api/rpc/persistent/device/" + savedDevice.getUuidId().toString()
+ "?" + "page=0" + "&" +
"pageSize=" + Integer.MAX_VALUE + "&" +
"rpcStatus=" + RpcStatus.DELETED.name();
MvcResult byDeviceResult = doGet(url).andReturn();
JsonNode byDeviceResponse = JacksonUtil.fromString(byDeviceResult.getResponse().getContentAsString(), JsonNode.class); JsonNode byDeviceResponse = JacksonUtil.fromString(byDeviceResult.getResponse().getContentAsString(), JsonNode.class);
Assert.assertEquals(500, byDeviceResponse.get("status").asInt()); Assert.assertEquals(500, byDeviceResponse.get("status").asInt());
@ -183,10 +178,13 @@ public abstract class BaseRpcControllerTest extends AbstractControllerTest {
MvcResult byDeviceResult = doGetAsync(url).andReturn(); MvcResult byDeviceResult = doGetAsync(url).andReturn();
String rpcs = byDeviceResult.getResponse().getContentAsString(); List<Rpc> byDeviceRpcs = JacksonUtil.fromString(
PageData<Rpc> byDeviceResponse = JacksonUtil.fromString(byDeviceResult.getResponse().getContentAsString(), new TypeReference<PageData<Rpc>>() {}); byDeviceResult
.getResponse()
.getContentAsString(),
new TypeReference<PageData<Rpc>>() {}
).getData();
List<Rpc> byDeviceRpcs = byDeviceResponse.getData();
boolean found = byDeviceRpcs.stream().anyMatch(r -> boolean found = byDeviceRpcs.stream().anyMatch(r ->
r.getUuidId().toString().equals(rpcId) r.getUuidId().toString().equals(rpcId)