|
|
@ -40,8 +40,10 @@ import org.thingsboard.server.controller.CalculatedFieldControllerTest; |
|
|
import org.thingsboard.server.dao.service.DaoSqlTest; |
|
|
import org.thingsboard.server.dao.service.DaoSqlTest; |
|
|
|
|
|
|
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
|
import static org.assertj.core.api.Assertions.assertThat; |
|
|
import static org.assertj.core.api.Assertions.assertThat; |
|
|
|
|
|
import static org.awaitility.Awaitility.await; |
|
|
|
|
|
|
|
|
@DaoSqlTest |
|
|
@DaoSqlTest |
|
|
public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTest { |
|
|
public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTest { |
|
|
@ -84,20 +86,22 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes |
|
|
// create CF -> perform initial calculation
|
|
|
// create CF -> perform initial calculation
|
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("77.0"); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("77.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update telemetry -> recalculate state
|
|
|
// update telemetry -> recalculate state
|
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update CF output -> perform calculation with updated output
|
|
|
// update CF output -> perform calculation with updated output
|
|
|
Output savedOutput = savedCalculatedField.getConfiguration().getOutput(); |
|
|
Output savedOutput = savedCalculatedField.getConfiguration().getOutput(); |
|
|
@ -106,32 +110,35 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes |
|
|
savedOutput.setName("temperatureF"); |
|
|
savedOutput.setName("temperatureF"); |
|
|
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class); |
|
|
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
ArrayNode temperatureF = getServerAttributes(testDevice.getId(), "temperatureF"); |
|
|
ArrayNode temperatureF = getServerAttributes(testDevice.getId(), "temperatureF"); |
|
|
assertThat(temperatureF).isNotNull(); |
|
|
assertThat(temperatureF).isNotNull(); |
|
|
assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update CF argument -> perform calculation with new argument
|
|
|
// update CF argument -> perform calculation with new argument
|
|
|
Argument savedArgument = savedCalculatedField.getConfiguration().getArguments().get("T"); |
|
|
Argument savedArgument = savedCalculatedField.getConfiguration().getArguments().get("T"); |
|
|
savedArgument.setRefEntityKey(new ReferencedEntityKey("deviceTemperature", ArgumentType.ATTRIBUTE, AttributeScope.SERVER_SCOPE)); |
|
|
savedArgument.setRefEntityKey(new ReferencedEntityKey("deviceTemperature", ArgumentType.ATTRIBUTE, AttributeScope.SERVER_SCOPE)); |
|
|
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class); |
|
|
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
temperatureF = getServerAttributes(testDevice.getId(), "temperatureF"); |
|
|
ArrayNode temperatureF = getServerAttributes(testDevice.getId(), "temperatureF"); |
|
|
assertThat(temperatureF).isNotNull(); |
|
|
assertThat(temperatureF).isNotNull(); |
|
|
assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("104.0"); |
|
|
assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("104.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update CF expression -> perform calculation with new expression
|
|
|
// update CF expression -> perform calculation with new expression
|
|
|
savedCalculatedField.getConfiguration().setExpression("1.8 * T + 32"); |
|
|
savedCalculatedField.getConfiguration().setExpression("1.8 * T + 32"); |
|
|
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class); |
|
|
savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
temperatureF = getServerAttributes(testDevice.getId(), "temperatureF"); |
|
|
ArrayNode temperatureF = getServerAttributes(testDevice.getId(), "temperatureF"); |
|
|
assertThat(temperatureF).isNotNull(); |
|
|
assertThat(temperatureF).isNotNull(); |
|
|
assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("104.0"); |
|
|
assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("104.0"); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Test |
|
|
@Test |
|
|
@ -164,20 +171,22 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes |
|
|
// create CF -> state is not ready -> no calculation performed
|
|
|
// create CF -> state is not ready -> no calculation performed
|
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").isNull()).isTrue(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").isNull()).isTrue(); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update telemetry -> perform calculation
|
|
|
// update telemetry -> perform calculation
|
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Test |
|
|
@Test |
|
|
@ -211,20 +220,22 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes |
|
|
// create CF -> perform initial calculation with default value
|
|
|
// create CF -> perform initial calculation with default value
|
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("53.6"); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("53.6"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update telemetry -> recalculate state
|
|
|
// update telemetry -> recalculate state
|
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").asText()).isEqualTo("86.0"); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Test |
|
|
@Test |
|
|
@ -275,93 +286,100 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes |
|
|
// create CF and perform initial calculation
|
|
|
// create CF and perform initial calculation
|
|
|
doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
// result of asset 1
|
|
|
// result of asset 1
|
|
|
ArrayNode z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
ArrayNode z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("51.0"); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("51.0"); |
|
|
|
|
|
|
|
|
// result of asset 2
|
|
|
// result of asset 2
|
|
|
ArrayNode z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
ArrayNode z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("52.0"); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("52.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update device telemetry -> recalculate state for all assets
|
|
|
// update device telemetry -> recalculate state for all assets
|
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"x\":25}")); |
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"x\":25}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
|
|
|
// result of asset 1
|
|
|
|
|
|
ArrayNode z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
|
|
|
assertThat(z1).isNotNull(); |
|
|
|
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("36.0"); |
|
|
|
|
|
|
|
|
// result of asset 1
|
|
|
// result of asset 2
|
|
|
z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
ArrayNode z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("36.0"); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("37.0"); |
|
|
|
|
|
}); |
|
|
// result of asset 2
|
|
|
|
|
|
z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
|
|
|
assertThat(z2).isNotNull(); |
|
|
|
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("37.0"); |
|
|
|
|
|
|
|
|
|
|
|
// update asset 1 telemetry -> recalculate state only for asset 1
|
|
|
// update asset 1 telemetry -> recalculate state only for asset 1
|
|
|
doPost("/api/plugins/telemetry/ASSET/" + asset1.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"y\":15}")); |
|
|
doPost("/api/plugins/telemetry/ASSET/" + asset1.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"y\":15}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
// result of asset 1
|
|
|
// result of asset 1
|
|
|
z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
ArrayNode z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("40.0"); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("40.0"); |
|
|
|
|
|
|
|
|
// result of asset 2 (no changes)
|
|
|
// result of asset 2 (no changes)
|
|
|
z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
ArrayNode z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("37.0"); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("37.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update asset 2 telemetry -> recalculate state only for asset 2
|
|
|
// update asset 2 telemetry -> recalculate state only for asset 2
|
|
|
doPost("/api/plugins/telemetry/ASSET/" + asset2.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"y\":5}")); |
|
|
doPost("/api/plugins/telemetry/ASSET/" + asset2.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"y\":5}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
// result of asset 1 (no changes)
|
|
|
// result of asset 1 (no changes)
|
|
|
z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
ArrayNode z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("40.0"); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("40.0"); |
|
|
|
|
|
|
|
|
// result of asset 2
|
|
|
// result of asset 2
|
|
|
z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
ArrayNode z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("30.0"); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("30.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// add new entity to profile -> calculate state for new entity
|
|
|
// add new entity to profile -> calculate state for new entity
|
|
|
Asset asset3 = createAsset("Test asset 3", assetProfile.getId()); |
|
|
Asset asset3 = createAsset("Test asset 3", assetProfile.getId()); |
|
|
doPost("/api/plugins/telemetry/ASSET/" + asset3.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"y\":13}")); |
|
|
doPost("/api/plugins/telemetry/ASSET/" + asset3.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"y\":13}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
Asset finalAsset3 = asset3; |
|
|
|
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
// result of asset 3
|
|
|
.untilAsserted(() -> { |
|
|
ArrayNode z3 = getServerAttributes(asset3.getId(), "z"); |
|
|
// result of asset 3
|
|
|
assertThat(z3).isNotNull(); |
|
|
ArrayNode z3 = getServerAttributes(finalAsset3.getId(), "z"); |
|
|
assertThat(z3.get(0).get("value").asText()).isEqualTo("38.0"); |
|
|
assertThat(z3).isNotNull(); |
|
|
|
|
|
assertThat(z3.get(0).get("value").asText()).isEqualTo("38.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update device telemetry -> recalculate state for all assets
|
|
|
// update device telemetry -> recalculate state for all assets
|
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"x\":20}")); |
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"x\":20}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
// result of asset 1
|
|
|
// result of asset 1
|
|
|
z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
ArrayNode z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1).isNotNull(); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("35.0"); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("35.0"); |
|
|
|
|
|
|
|
|
// result of asset 2
|
|
|
// result of asset 2
|
|
|
z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
ArrayNode z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2).isNotNull(); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("25.0"); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("25.0"); |
|
|
|
|
|
|
|
|
// result of asset 3
|
|
|
// result of asset 3
|
|
|
z3 = getServerAttributes(asset3.getId(), "z"); |
|
|
ArrayNode z3 = getServerAttributes(finalAsset3.getId(), "z"); |
|
|
assertThat(z3).isNotNull(); |
|
|
assertThat(z3).isNotNull(); |
|
|
assertThat(z3.get(0).get("value").asText()).isEqualTo("33.0"); |
|
|
assertThat(z3.get(0).get("value").asText()).isEqualTo("33.0"); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update profile for asset 3 -> delete state for asset 3
|
|
|
// update profile for asset 3 -> delete state for asset 3
|
|
|
AssetProfile newAssetProfile = doPost("/api/assetProfile", createAssetProfile("New Asset Profile"), AssetProfile.class); |
|
|
AssetProfile newAssetProfile = doPost("/api/assetProfile", createAssetProfile("New Asset Profile"), AssetProfile.class); |
|
|
@ -371,22 +389,24 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes |
|
|
// update device telemetry -> recalculate state for asset 1 and asset 2
|
|
|
// update device telemetry -> recalculate state for asset 1 and asset 2
|
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"x\":15}")); |
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"x\":15}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
Asset updatedAsset3 = asset3; |
|
|
|
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
// result of asset 1
|
|
|
.untilAsserted(() -> { |
|
|
z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
// result of asset 1
|
|
|
assertThat(z1).isNotNull(); |
|
|
ArrayNode z1 = getServerAttributes(asset1.getId(), "z"); |
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("30.0"); |
|
|
assertThat(z1).isNotNull(); |
|
|
|
|
|
assertThat(z1.get(0).get("value").asText()).isEqualTo("30.0"); |
|
|
// result of asset 2
|
|
|
|
|
|
z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
// result of asset 2
|
|
|
assertThat(z2).isNotNull(); |
|
|
ArrayNode z2 = getServerAttributes(asset2.getId(), "z"); |
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("20.0"); |
|
|
assertThat(z2).isNotNull(); |
|
|
|
|
|
assertThat(z2.get(0).get("value").asText()).isEqualTo("20.0"); |
|
|
// no changes for asset 3
|
|
|
|
|
|
z3 = getServerAttributes(asset3.getId(), "z"); |
|
|
// no changes for asset 3
|
|
|
assertThat(z3).isNotNull(); |
|
|
ArrayNode z3 = getServerAttributes(updatedAsset3.getId(), "z"); |
|
|
assertThat(z3.get(0).get("value").asText()).isEqualTo("33.0"); |
|
|
assertThat(z3).isNotNull(); |
|
|
|
|
|
assertThat(z3.get(0).get("value").asText()).isEqualTo("33.0"); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Test |
|
|
@Test |
|
|
@ -421,20 +441,22 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes |
|
|
// create CF -> ctx is not initialized -> no calculation perform
|
|
|
// create CF -> ctx is not initialized -> no calculation perform
|
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").isNull()).isTrue(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").isNull()).isTrue(); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// update telemetry -> ctx is not initialized -> no calculation perform
|
|
|
// update telemetry -> ctx is not initialized -> no calculation perform
|
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode("{\"temperature\":30}")); |
|
|
|
|
|
|
|
|
Thread.sleep(300); |
|
|
await().atMost(5, TimeUnit.SECONDS) |
|
|
|
|
|
.untilAsserted(() -> { |
|
|
fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
ObjectNode fahrenheitTemp = getLatestTelemetry(testDevice.getId(), "fahrenheitTemp"); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp).isNotNull(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").isNull()).isTrue(); |
|
|
assertThat(fahrenheitTemp.get("fahrenheitTemp").get(0).get("value").isNull()).isTrue(); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private ObjectNode getLatestTelemetry(EntityId entityId, String... keys) throws Exception { |
|
|
private ObjectNode getLatestTelemetry(EntityId entityId, String... keys) throws Exception { |
|
|
|
Andrii Shvaika
2 years ago