Browse Source

fixed tests

pull/12792/head
IrynaMatveieva 1 year ago
parent
commit
5fb5d008bf
  1. 11
      dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java
  2. 2
      dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java

11
dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java

@ -15,9 +15,7 @@
*/
package org.thingsboard.server.dao.model.sql;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.persistence.Column;
import jakarta.persistence.Convert;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import lombok.Data;
@ -60,6 +58,15 @@ public class CalculatedFieldLinkEntity extends BaseSqlEntity<CalculatedFieldLink
super();
}
public CalculatedFieldLinkEntity(CalculatedFieldLink calculatedFieldLink) {
this.setUuid(calculatedFieldLink.getUuidId());
this.createdTime = calculatedFieldLink.getCreatedTime();
this.tenantId = calculatedFieldLink.getTenantId().getId();
this.entityType = calculatedFieldLink.getEntityId().getEntityType().name();
this.entityId = calculatedFieldLink.getEntityId().getId();
this.calculatedFieldId = calculatedFieldLink.getCalculatedFieldId().getId();
}
@Override
public CalculatedFieldLink toData() {
CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink(new CalculatedFieldLinkId(id));

2
dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java

@ -1211,7 +1211,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
}
@Test
public void testDeleteAssetIfReferencedInCalculatedField() {
public void testDeleteDeviceIfReferencedInCalculatedField() {
Device device = saveDevice(tenantId, "Test Device");
Device deviceWithCf = saveDevice(tenantId, "Device with CF");

Loading…
Cancel
Save