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

updated tests due to changed method results for cf calculation

Browse Source
This commit is contained in:
dshvaika 2025-07-18 12:35:34 +03:00
parent 57146ff94f
commit 04eefbc29b
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/test/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldStateTest.java
View File

@ -44,6 +44,7 @@ import org.thingsboard.server.dao.usagerecord.ApiLimitService;
import org.thingsboard.server.service.cf.CalculatedFieldResult; import org.thingsboard.server.service.cf.CalculatedFieldResult;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.UUID; import java.util.UUID;
@ -124,9 +125,10 @@ public class ScriptCalculatedFieldStateTest {
void testPerformCalculation() throws ExecutionException, InterruptedException { void testPerformCalculation() throws ExecutionException, InterruptedException {
state.arguments = new HashMap<>(Map.of("deviceTemperature", deviceTemperatureArgEntry, "assetHumidity", assetHumidityArgEntry)); state.arguments = new HashMap<>(Map.of("deviceTemperature", deviceTemperatureArgEntry, "assetHumidity", assetHumidityArgEntry));
CalculatedFieldResult result = state.performCalculation(ctx).get(); List<CalculatedFieldResult> resultList = state.performCalculation(ctx).get();
assertThat(result).isNotNull(); assertThat(resultList).isNotNull().hasSize(1);
CalculatedFieldResult result = resultList.get(0);
Output output = getCalculatedFieldConfig().getOutput(); Output output = getCalculatedFieldConfig().getOutput();
assertThat(result.getType()).isEqualTo(output.getType()); assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope()); assertThat(result.getScope()).isEqualTo(output.getScope());

16
application/src/test/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldStateTest.java
View File

@ -42,6 +42,7 @@ import org.thingsboard.server.dao.usagerecord.ApiLimitService;
import org.thingsboard.server.service.cf.CalculatedFieldResult; import org.thingsboard.server.service.cf.CalculatedFieldResult;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -134,9 +135,10 @@ public class SimpleCalculatedFieldStateTest {
"key3", key3ArgEntry "key3", key3ArgEntry
)); ));
CalculatedFieldResult result = state.performCalculation(ctx).get(); List<CalculatedFieldResult> resultList = state.performCalculation(ctx).get();
assertThat(result).isNotNull(); assertThat(resultList).isNotNull().hasSize(1);
CalculatedFieldResult result = resultList.get(0);
Output output = getCalculatedFieldConfig().getOutput(); Output output = getCalculatedFieldConfig().getOutput();
assertThat(result.getType()).isEqualTo(output.getType()); assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope()); assertThat(result.getScope()).isEqualTo(output.getScope());
@ -164,9 +166,10 @@ public class SimpleCalculatedFieldStateTest {
"key3", key3ArgEntry "key3", key3ArgEntry
)); ));
CalculatedFieldResult result = state.performCalculation(ctx).get(); List<CalculatedFieldResult> resultList = state.performCalculation(ctx).get();
assertThat(result).isNotNull(); assertThat(resultList).isNotNull().hasSize(1);
CalculatedFieldResult result = resultList.get(0);
Output output = getCalculatedFieldConfig().getOutput(); Output output = getCalculatedFieldConfig().getOutput();
assertThat(result.getType()).isEqualTo(output.getType()); assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope()); assertThat(result.getScope()).isEqualTo(output.getScope());
@ -185,9 +188,10 @@ public class SimpleCalculatedFieldStateTest {
output.setDecimalsByDefault(3); output.setDecimalsByDefault(3);
ctx.setOutput(output); ctx.setOutput(output);
CalculatedFieldResult result = state.performCalculation(ctx).get(); List<CalculatedFieldResult> resultList = state.performCalculation(ctx).get();
assertThat(result).isNotNull(); assertThat(resultList).isNotNull().hasSize(1);
CalculatedFieldResult result = resultList.get(0);
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(JacksonUtil.valueToTree(Map.of("output", 49.546))); assertThat(result.getResult()).isEqualTo(JacksonUtil.valueToTree(Map.of("output", 49.546)));