Browse Source

Merge pull request #14543 from irynamatveieva/fix/cf-tests

Fixed geofencing calculated fields tests
pull/14547/head
Viacheslav Klimov 10 months ago
committed by GitHub
parent
commit
b8744290d3
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingCalculatedFieldStateTest.java

6
application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingCalculatedFieldStateTest.java

@ -247,7 +247,7 @@ public class GeofencingCalculatedFieldStateTest {
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result.getType()).isEqualTo(output.getType()); assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope()); assertThat(result.getScope()).isEqualTo(output.getScope());
assertThat(result.getResult()).isEqualTo( assertThat(result.getResult().get("values")).isEqualTo(
JacksonUtil.newObjectNode() JacksonUtil.newObjectNode()
.put("allowedZonesEvent", "ENTERED") .put("allowedZonesEvent", "ENTERED")
.put("allowedZonesStatus", "INSIDE") .put("allowedZonesStatus", "INSIDE")
@ -329,7 +329,7 @@ public class GeofencingCalculatedFieldStateTest {
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result.getType()).isEqualTo(output.getType()); assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope()); assertThat(result.getScope()).isEqualTo(output.getScope());
assertThat(result.getResult()).isEqualTo( assertThat(result.getResult().get("values")).isEqualTo(
JacksonUtil.newObjectNode().put("allowedZonesEvent", "ENTERED") JacksonUtil.newObjectNode().put("allowedZonesEvent", "ENTERED")
); );
@ -406,7 +406,7 @@ public class GeofencingCalculatedFieldStateTest {
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result.getType()).isEqualTo(output.getType()); assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope()); assertThat(result.getScope()).isEqualTo(output.getScope());
assertThat(result.getResult()).isEqualTo( assertThat(result.getResult().get("values")).isEqualTo(
JacksonUtil.newObjectNode() JacksonUtil.newObjectNode()
.put("allowedZonesStatus", "INSIDE") .put("allowedZonesStatus", "INSIDE")
.put("restrictedZonesStatus", "OUTSIDE") .put("restrictedZonesStatus", "OUTSIDE")

Loading…
Cancel
Save