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

refactored tests

Browse Source
This commit is contained in:
IrynaMatveieva 2024-11-12 12:51:29 +02:00
parent 444c5bf079
commit b6b7af8003
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
View File

@ -22,7 +22,8 @@ import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.User;
import org.thingsboard.server.common.data.cf.CalculatedField; import org.thingsboard.server.common.data.cf.CalculatedField;
import org.thingsboard.server.common.data.cf.CalculatedFieldConfig; import org.thingsboard.server.common.data.cf.CalculatedFieldConfiguration;
import org.thingsboard.server.common.data.cf.SimpleCalculatedFieldConfiguration;
import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.security.Authority;
@ -123,25 +124,25 @@ public class CalculatedFieldControllerTest extends AbstractControllerTest {
private CalculatedField getCalculatedField(DeviceId deviceId) { private CalculatedField getCalculatedField(DeviceId deviceId) {
CalculatedField calculatedField = new CalculatedField(); CalculatedField calculatedField = new CalculatedField();
calculatedField.setEntityId(deviceId); calculatedField.setEntityId(deviceId);
calculatedField.setType("Simple"); calculatedField.setType("SIMPLE");
calculatedField.setName("Test Calculated Field"); calculatedField.setName("Test Calculated Field");
calculatedField.setConfigurationVersion(1); calculatedField.setConfigurationVersion(1);
// calculatedField.setConfiguration(getCalculatedFieldConfig(null)); calculatedField.setConfiguration(getCalculatedFieldConfig(null));
calculatedField.setVersion(1L); calculatedField.setVersion(1L);
return calculatedField; return calculatedField;
} }
private CalculatedFieldConfig getCalculatedFieldConfig(EntityId referencedEntityId) { private CalculatedFieldConfiguration getCalculatedFieldConfig(EntityId referencedEntityId) {
CalculatedFieldConfig config = new CalculatedFieldConfig(); SimpleCalculatedFieldConfiguration config = new SimpleCalculatedFieldConfiguration();
CalculatedFieldConfig.Argument argument = new CalculatedFieldConfig.Argument(); SimpleCalculatedFieldConfiguration.Argument argument = new SimpleCalculatedFieldConfiguration.Argument();
argument.setEntityId(referencedEntityId); argument.setEntityId(referencedEntityId);
argument.setType("TIME_SERIES"); argument.setType("TIME_SERIES");
argument.setKey("temperature"); argument.setKey("temperature");
config.setArguments(Map.of("T", argument)); config.setArguments(Map.of("T", argument));
CalculatedFieldConfig.Output output = new CalculatedFieldConfig.Output(); SimpleCalculatedFieldConfiguration.Output output = new SimpleCalculatedFieldConfiguration.Output();
output.setType("TIME_SERIES"); output.setType("TIME_SERIES");
output.setExpression("T - (100 - H) / 5"); output.setExpression("T - (100 - H) / 5");

18
dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java
View File

@ -25,8 +25,6 @@ import org.thingsboard.common.util.ThingsBoardExecutors;
import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.cf.CalculatedField; import org.thingsboard.server.common.data.cf.CalculatedField;
import org.thingsboard.server.common.data.cf.CalculatedFieldConfiguration; import org.thingsboard.server.common.data.cf.CalculatedFieldConfiguration;
import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
import org.thingsboard.server.common.data.cf.CalculatedFieldLinkConfiguration;
import org.thingsboard.server.common.data.cf.SimpleCalculatedFieldConfiguration; import org.thingsboard.server.common.data.cf.SimpleCalculatedFieldConfiguration;
import org.thingsboard.server.common.data.id.CalculatedFieldId; import org.thingsboard.server.common.data.id.CalculatedFieldId;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
@ -34,7 +32,6 @@ import org.thingsboard.server.dao.cf.CalculatedFieldService;
import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.device.DeviceService;
import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DataValidationException;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -148,21 +145,6 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
return calculatedField; return calculatedField;
} }
private CalculatedFieldLink getCalculatedFieldLink(CalculatedField calculatedField) {
CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink();
calculatedFieldLink.setTenantId(tenantId);
calculatedFieldLink.setEntityId(calculatedField.getEntityId());
calculatedFieldLink.setConfiguration(getCalculatedFieldLinkConfiguration());
calculatedFieldLink.setCalculatedFieldId(calculatedField.getId());
return calculatedFieldLink;
}
private CalculatedFieldLinkConfiguration getCalculatedFieldLinkConfiguration() {
CalculatedFieldLinkConfiguration calculatedFieldLinkConfiguration = new CalculatedFieldLinkConfiguration();
calculatedFieldLinkConfiguration.setTimeSeries(List.of("temperature"));
return calculatedFieldLinkConfiguration;
}
private CalculatedFieldConfiguration getCalculatedFieldConfig(EntityId referencedEntityId) { private CalculatedFieldConfiguration getCalculatedFieldConfig(EntityId referencedEntityId) {
SimpleCalculatedFieldConfiguration config = new SimpleCalculatedFieldConfiguration(); SimpleCalculatedFieldConfiguration config = new SimpleCalculatedFieldConfiguration();