From 0936e4922be91c6d938b9bde866022f09d209c45 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 21 Oct 2022 12:22:44 +0300 Subject: [PATCH] Remove duplicated autogenerated code coverage --- .../java/org/thingsboard/server/edge/BaseAssetEdgeTest.java | 2 -- .../java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java | 4 ---- .../test/java/org/thingsboard/server/edge/BaseEdgeTest.java | 1 - .../java/org/thingsboard/server/edge/BaseUserEdgeTest.java | 3 --- 4 files changed, 10 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java index c9489f9b64..9a68637eba 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java @@ -50,7 +50,6 @@ abstract public class BaseAssetEdgeTest extends AbstractEdgeTest { Assert.assertEquals(savedAsset.getUuidId().getLeastSignificantBits(), assetUpdateMsg.getIdLSB()); Assert.assertEquals(savedAsset.getName(), assetUpdateMsg.getName()); Assert.assertEquals(savedAsset.getType(), assetUpdateMsg.getType()); - testAutoGeneratedCodeByProtobuf(assetUpdateMsg); Optional assetProfileUpdateMsgOpt = edgeImitator.findMessageByType(AssetProfileUpdateMsg.class); Assert.assertTrue(assetProfileUpdateMsgOpt.isPresent()); AssetProfileUpdateMsg assetProfileUpdateMsg = assetProfileUpdateMsgOpt.get(); @@ -102,7 +101,6 @@ abstract public class BaseAssetEdgeTest extends AbstractEdgeTest { Assert.assertEquals(savedAsset.getUuidId().getLeastSignificantBits(), assetUpdateMsg.getIdLSB()); Assert.assertEquals(savedAsset.getName(), assetUpdateMsg.getName()); Assert.assertEquals(savedAsset.getType(), assetUpdateMsg.getType()); - testAutoGeneratedCodeByProtobuf(assetUpdateMsg); assetProfileUpdateMsgOpt = edgeImitator.findMessageByType(AssetProfileUpdateMsg.class); Assert.assertTrue(assetProfileUpdateMsgOpt.isPresent()); assetProfileUpdateMsg = assetProfileUpdateMsgOpt.get(); diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java index 4516e75e3d..3bd9de31b6 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java @@ -380,10 +380,8 @@ abstract public class BaseDeviceEdgeTest extends AbstractEdgeTest { entityDataBuilder2.setEntityIdLSB(device.getId().getId().getLeastSignificantBits()); entityDataBuilder2.setAttributesUpdatedMsg(JsonConverter.convertToAttributesProto(attributesData)); entityDataBuilder2.setPostAttributeScope(DataConstants.SERVER_SCOPE); - testAutoGeneratedCodeByProtobuf(entityDataBuilder2); uplinkMsgBuilder2.addEntityData(entityDataBuilder2.build()); - testAutoGeneratedCodeByProtobuf(uplinkMsgBuilder2); edgeImitator.sendUplinkMsg(uplinkMsgBuilder2.build()); Assert.assertTrue(edgeImitator.waitForResponses()); @@ -479,12 +477,10 @@ abstract public class BaseDeviceEdgeTest extends AbstractEdgeTest { deviceUpdateMsgBuilder.setName("Edge Device 2"); deviceUpdateMsgBuilder.setType("test"); deviceUpdateMsgBuilder.setMsgType(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE); - testAutoGeneratedCodeByProtobuf(deviceUpdateMsgBuilder); uplinkMsgBuilder.addDeviceUpdateMsg(deviceUpdateMsgBuilder.build()); edgeImitator.expectResponsesAmount(1); edgeImitator.expectMessageAmount(1); - testAutoGeneratedCodeByProtobuf(uplinkMsgBuilder); edgeImitator.sendUplinkMsg(uplinkMsgBuilder.build()); diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java index 2018e5c2ca..1c01ba93aa 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java @@ -57,7 +57,6 @@ abstract public class BaseEdgeTest extends AbstractEdgeTest { Assert.assertEquals(savedCustomer.getUuidId().getMostSignificantBits(), customerUpdateMsg.getIdMSB()); Assert.assertEquals(savedCustomer.getUuidId().getLeastSignificantBits(), customerUpdateMsg.getIdLSB()); Assert.assertEquals(savedCustomer.getTitle(), customerUpdateMsg.getTitle()); - testAutoGeneratedCodeByProtobuf(customerUpdateMsg); // unassign edge from customer edgeImitator.expectMessageAmount(2); diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java index c0deffa74b..61e2976574 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java @@ -62,7 +62,6 @@ abstract public class BaseUserEdgeTest extends AbstractEdgeTest { Assert.assertEquals(savedTenantAdmin.getEmail(), userUpdateMsg.getEmail()); Assert.assertEquals(savedTenantAdmin.getFirstName(), userUpdateMsg.getFirstName()); Assert.assertEquals(savedTenantAdmin.getLastName(), userUpdateMsg.getLastName()); - testAutoGeneratedCodeByProtobuf(userUpdateMsg); Optional userCredentialsUpdateMsgOpt = edgeImitator.findMessageByType(UserCredentialsUpdateMsg.class); Assert.assertTrue(userCredentialsUpdateMsgOpt.isPresent()); @@ -208,8 +207,6 @@ abstract public class BaseUserEdgeTest extends AbstractEdgeTest { UserCredentialsUpdateMsg userCredentialsUpdateMsg = (UserCredentialsUpdateMsg) latestMessage; Assert.assertEquals(tenantAdmin.getId().getId().getMostSignificantBits(), userCredentialsUpdateMsg.getUserIdMSB()); Assert.assertEquals(tenantAdmin.getId().getId().getLeastSignificantBits(), userCredentialsUpdateMsg.getUserIdLSB()); - - testAutoGeneratedCodeByProtobuf(userCredentialsUpdateMsg); } @Test