From 40b069e9ed0a35db8bbc53563d1949d3f499ae8f Mon Sep 17 00:00:00 2001 From: Andrii Landiak Date: Wed, 4 Sep 2024 12:14:41 +0300 Subject: [PATCH] Set proper ignore description for edge entities on edge --- .../thingsboard/server/controller/AssetControllerTest.java | 3 +-- .../server/controller/DashboardControllerTest.java | 3 +-- .../thingsboard/server/controller/DeviceControllerTest.java | 3 +-- .../server/controller/EdgeEventControllerTest.java | 3 +-- .../server/controller/RuleChainControllerTest.java | 6 ++---- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java index 225ef2356b..d9ef52a3bb 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java @@ -1031,9 +1031,8 @@ public void testFindCustomerAssetsByType() throws Exception { Assert.assertEquals(0, pageData.getData().size()); } - // edge-only: @Ignore - edge entities support available for CE/PE - @Ignore @Test + @Ignore("Edge entities support available for CE/PE only") public void testAssignAssetToEdge() throws Exception { Edge edge = constructEdge("My edge", "default"); Edge savedEdge = doPost("/api/edge", edge, Edge.class); diff --git a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java index 89a37f4a85..ae69501837 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java @@ -510,9 +510,8 @@ public void testFindCustomerDashboards() throws Exception { Assert.assertEquals(dashboards, loadedDashboards); } - // edge-only: @Ignore - edge entities support available for CE/PE - @Ignore @Test + @Ignore("Edge entities support available for CE/PE only") public void testAssignDashboardToEdge() throws Exception { Edge edge = constructEdge("My edge", "default"); Edge savedEdge = doPost("/api/edge", edge, Edge.class); diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java index 0db22822a1..24e3488ce5 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java @@ -1383,9 +1383,8 @@ public void testAssignDeviceToTenant() throws Exception { deleteTenant(savedDifferentTenant.getId()); } - // edge-only: @Ignore - edge entities support available for CE/PE - @Ignore @Test + @Ignore("Edge entities support available for CE/PE only") public void testAssignDeviceToEdge() throws Exception { Edge edge = constructEdge("My edge", "default"); Edge savedEdge = doPost("/api/edge", edge, Edge.class); diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java index 08c6739253..60e7734f7c 100644 --- a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java @@ -86,9 +86,8 @@ public void beforeTest() throws Exception { public void afterTest() throws Exception { } - // edge-only: @Ignore - edge entities support available for CE/PE - @Ignore @Test + @Ignore("Edge entities support available for CE/PE only") public void testGetEdgeEvents() throws Exception { Edge edge = constructEdge("TestEdge", "default"); edge = doPost("/api/edge", edge, Edge.class); diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java index aa69b93bc9..4ad90d168a 100644 --- a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java @@ -104,9 +104,8 @@ public void afterTest() throws Exception { deleteTenant(savedTenant.getId()); } - // edge-only: @Ignore - edge entities support available for CE/PE - @Ignore @Test + @Ignore("Edge entities support available for CE/PE only") public void testSaveRuleChain() throws Exception { RuleChain ruleChain = new RuleChain(); ruleChain.setName("RuleChain"); @@ -254,9 +253,8 @@ public void testDeleteRuleChain() throws Exception { .andExpect(statusReason(containsString(msgErrorNoFound("Rule chain", entityIdStr)))); } - // edge-only: @Ignore - edge entities support available for CE/PE - @Ignore @Test + @Ignore("Edge entities support available for CE/PE only") public void testFindEdgeRuleChainsByTenantIdAndName() throws Exception { Edge edge = constructEdge("My edge", "default"); Edge savedEdge = doPost("/api/edge", edge, Edge.class);