Fixed MockBean and SpyBean dependency for newly added tests

application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.edge.rpc.processor;
 
 import org.junit.jupiter.params.provider.Arguments;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.context.annotation.Lazy;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.Dashboard;
@@ -207,10 +208,10 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected AlarmMsgConstructor alarmMsgConstructor;
 
-    @MockBean
+    @SpyBean
     protected DeviceMsgConstructor deviceMsgConstructor;
 
-    @MockBean
+    @SpyBean
     protected AssetMsgConstructor assetMsgConstructor;
 
     @MockBean
@@ -228,10 +229,10 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected CustomerMsgConstructor customerMsgConstructor;
 
-    @MockBean
+    @SpyBean
     protected DeviceProfileMsgConstructor deviceProfileMsgConstructor;
 
-    @MockBean
+    @SpyBean
     protected AssetProfileMsgConstructor assetProfileMsgConstructor;
 
     @MockBean

application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/asset/AbstractAssetProcessorTest.java

@@ -17,8 +17,6 @@ package org.thingsboard.server.service.edge.rpc.processor.asset;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
@@ -29,13 +27,8 @@ import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.asset.AssetProfileService;
-import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.gen.edge.v1.AssetProfileUpdateMsg;
-import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
-import org.thingsboard.server.service.edge.rpc.constructor.AssetMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.AssetProfileMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessorTest;
 
 import java.util.UUID;
@@ -45,15 +38,6 @@ import static org.mockito.BDDMockito.willReturn;
 
 public abstract class AbstractAssetProcessorTest extends BaseEdgeProcessorTest {
 
-    @MockBean
-    AssetProfileService assetProfileService;
-    @MockBean
-    AssetService assetService;
-
-    @SpyBean
-    AssetMsgConstructor assetMsgConstructor;
-    @SpyBean
-    AssetProfileMsgConstructor assetProfileMsgConstructor;
 
     protected AssetId assetId;
     protected AssetProfileId assetProfileId;

application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/device/AbstractDeviceProcessorTest.java

@@ -17,8 +17,6 @@ package org.thingsboard.server.service.edge.rpc.processor.device;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -32,12 +30,8 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.device.DeviceProfileService;
-import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
-import org.thingsboard.server.service.edge.rpc.constructor.DeviceMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.DeviceProfileMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessorTest;
 
 import java.util.UUID;
@@ -47,16 +41,6 @@ import static org.mockito.BDDMockito.willReturn;
 
 public abstract class AbstractDeviceProcessorTest extends BaseEdgeProcessorTest {
 
-    @MockBean
-    DeviceProfileService deviceProfileService;
-    @MockBean
-    DeviceService deviceService;
-
-    @SpyBean
-    DeviceMsgConstructor deviceMsgConstructor;
-    @SpyBean
-    DeviceProfileMsgConstructor deviceProfileMsgConstructor;
-
     protected DeviceId deviceId;
     protected DeviceProfileId deviceProfileId;
     protected DeviceProfile deviceProfile;