CalculatedField functionality support for Edge
- refactoring test
This commit is contained in:
parent
060f728fcd
commit
6f42d5fb77
@ -38,7 +38,6 @@ import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
|
|||||||
import org.thingsboard.server.gen.edge.v1.UplinkMsg;
|
import org.thingsboard.server.gen.edge.v1.UplinkMsg;
|
||||||
import org.thingsboard.server.gen.edge.v1.UplinkResponseMsg;
|
import org.thingsboard.server.gen.edge.v1.UplinkResponseMsg;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@ -62,8 +61,7 @@ public class CalculatedFieldEdgeTest extends AbstractEdgeTest {
|
|||||||
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class);
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class);
|
||||||
Assert.assertTrue(edgeImitator.waitForMessages());
|
Assert.assertTrue(edgeImitator.waitForMessages());
|
||||||
|
|
||||||
List<AbstractMessage> downlinkMsgs = edgeImitator.getDownlinkMsgs();
|
AbstractMessage latestMessage = edgeImitator.getLatestMessage();
|
||||||
AbstractMessage latestMessage = downlinkMsgs.stream().filter(downlinkMsg -> downlinkMsg instanceof CalculatedFieldUpdateMsg).findFirst().get();
|
|
||||||
Assert.assertTrue(latestMessage instanceof CalculatedFieldUpdateMsg);
|
Assert.assertTrue(latestMessage instanceof CalculatedFieldUpdateMsg);
|
||||||
CalculatedFieldUpdateMsg calculatedFieldUpdateMsg = (CalculatedFieldUpdateMsg) latestMessage;
|
CalculatedFieldUpdateMsg calculatedFieldUpdateMsg = (CalculatedFieldUpdateMsg) latestMessage;
|
||||||
Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, calculatedFieldUpdateMsg.getMsgType());
|
Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, calculatedFieldUpdateMsg.getMsgType());
|
||||||
@ -80,8 +78,8 @@ public class CalculatedFieldEdgeTest extends AbstractEdgeTest {
|
|||||||
savedCalculatedField.setName(UPDATED_CF_NAME);
|
savedCalculatedField.setName(UPDATED_CF_NAME);
|
||||||
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class);
|
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class);
|
||||||
Assert.assertTrue(edgeImitator.waitForMessages());
|
Assert.assertTrue(edgeImitator.waitForMessages());
|
||||||
downlinkMsgs = edgeImitator.getDownlinkMsgs();
|
|
||||||
latestMessage = downlinkMsgs.stream().filter(downlinkMsg -> downlinkMsg instanceof CalculatedFieldUpdateMsg).findFirst().get();
|
latestMessage = edgeImitator.getLatestMessage();
|
||||||
Assert.assertTrue(latestMessage instanceof CalculatedFieldUpdateMsg);
|
Assert.assertTrue(latestMessage instanceof CalculatedFieldUpdateMsg);
|
||||||
calculatedFieldUpdateMsg = (CalculatedFieldUpdateMsg) latestMessage;
|
calculatedFieldUpdateMsg = (CalculatedFieldUpdateMsg) latestMessage;
|
||||||
calculatedFieldFromMsg = JacksonUtil.fromString(calculatedFieldUpdateMsg.getEntity(), CalculatedField.class, true);
|
calculatedFieldFromMsg = JacksonUtil.fromString(calculatedFieldUpdateMsg.getEntity(), CalculatedField.class, true);
|
||||||
@ -94,6 +92,7 @@ public class CalculatedFieldEdgeTest extends AbstractEdgeTest {
|
|||||||
doDelete("/api/calculatedField/" + savedCalculatedField.getUuidId())
|
doDelete("/api/calculatedField/" + savedCalculatedField.getUuidId())
|
||||||
.andExpect(status().isOk());
|
.andExpect(status().isOk());
|
||||||
Assert.assertTrue(edgeImitator.waitForMessages());
|
Assert.assertTrue(edgeImitator.waitForMessages());
|
||||||
|
|
||||||
latestMessage = edgeImitator.getLatestMessage();
|
latestMessage = edgeImitator.getLatestMessage();
|
||||||
Assert.assertTrue(latestMessage instanceof CalculatedFieldUpdateMsg);
|
Assert.assertTrue(latestMessage instanceof CalculatedFieldUpdateMsg);
|
||||||
calculatedFieldUpdateMsg = (CalculatedFieldUpdateMsg) latestMessage;
|
calculatedFieldUpdateMsg = (CalculatedFieldUpdateMsg) latestMessage;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user