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

Fixed calculated fields tests

dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java

@@ -17,11 +17,13 @@ package org.thingsboard.server.dao.service;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentType;
+import org.thingsboard.server.common.data.cf.configuration.AttributesOutput;
 import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.ReferencedEntityKey;
 import org.thingsboard.server.common.data.cf.configuration.RelationPathQueryDynamicSourceConfiguration;
@@ -36,8 +38,8 @@ import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationPathLevel;
 import org.thingsboard.server.dao.cf.CalculatedFieldService;
 import org.thingsboard.server.dao.device.DeviceService;
-import org.thingsboard.server.exception.DataValidationException;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
+import org.thingsboard.server.exception.DataValidationException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -103,6 +105,10 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
         zoneGroupConfiguration.setRefDynamicSourceConfiguration(dynamicSourceConfiguration);
         cfg.setZoneGroups(Map.of("allowed", zoneGroupConfiguration));
 
+        AttributesOutput out = new AttributesOutput();
+        out.setScope(AttributeScope.SERVER_SCOPE);
+        cfg.setOutput(out);
+
         // Get tenant profile min.
         int min = tbTenantProfileCache.get(tenantId)
                 .getDefaultProfileConfiguration()
@@ -157,6 +163,10 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
         zoneGroupConfiguration.setRefDynamicSourceConfiguration(dynamicSourceConfiguration);
         cfg.setZoneGroups(Map.of("allowed", zoneGroupConfiguration));
 
+        AttributesOutput out = new AttributesOutput();
+        out.setScope(AttributeScope.SERVER_SCOPE);
+        cfg.setOutput(out);
+
         // Create & save Calculated Field
         CalculatedField cf = new CalculatedField();
         cf.setTenantId(tenantId);
@@ -191,6 +201,10 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
         zoneGroupConfiguration.setRefDynamicSourceConfiguration(dynamicSourceConfiguration);
         cfg.setZoneGroups(Map.of("allowed", zoneGroupConfiguration));
 
+        AttributesOutput out = new AttributesOutput();
+        out.setScope(AttributeScope.SERVER_SCOPE);
+        cfg.setOutput(out);
+
         // Get tenant profile min.
         int min = tbTenantProfileCache.get(tenantId)
                 .getDefaultProfileConfiguration()