From 5fb5d008bfe483bcd9b2bbc59fa730dcba6102ad Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Fri, 28 Feb 2025 12:33:29 +0200
Subject: [PATCH] fixed tests

---
 .../dao/model/sql/CalculatedFieldLinkEntity.java      | 11 +++++++++--
 .../server/dao/service/DeviceServiceTest.java         |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java
index 2668a1a0d8..3a529b7d93 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java
+++ b/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));
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
index 0fbf97ff7e..bbbd48aa49 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
+++ b/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");