refactoring: tests Dashboard add .andExpect(. Commits2

application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java

@@ -355,8 +355,6 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
                 return EdgeEventActionType.ASSIGNED_TO_EDGE;
             case UNASSIGNED_FROM_EDGE:
                 return EdgeEventActionType.UNASSIGNED_FROM_EDGE;
-            case CREDENTIALS_UPDATED:
-                return EdgeEventActionType.CREDENTIALS_UPDATED;
             default:
                 return null;
         }

application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java

@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -257,9 +258,11 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
     }
 
     private void testSendNotificationMsgToEdgeServiceTime(EntityId entityId, TenantId tenantId, ActionType actionType, int cntTime) {
+        EdgeEventActionType edgeEventActionType = ActionType.CREDENTIALS_UPDATED.equals(actionType) ?
+                EdgeEventActionType.CREDENTIALS_UPDATED : edgeTypeByActionType(actionType);
         Mockito.verify(tbClusterService, times(cntTime)).sendNotificationMsgToEdge(Mockito.eq(tenantId),
                 Mockito.any(), Mockito.eq(entityId), Mockito.any(), Mockito.isNull(),
-                Mockito.eq(edgeTypeByActionType(actionType)));
+                Mockito.eq(edgeEventActionType));
     }
 
     private void testSendNotificationMsgToEdgeServiceTimeEntityEqAny(TenantId tenantId, ActionType actionType, int cntTime) {

application/src/test/java/org/thingsboard/server/controller/BaseDashboardControllerTest.java

@@ -116,7 +116,9 @@ public abstract class BaseDashboardControllerTest extends AbstractControllerTest
 
         Mockito.reset(tbClusterService, auditLogService);
 
-        doPost("/api/dashboard", dashboard).andExpect(statusReason(containsString(msgError)));
+        doPost("/api/dashboard", dashboard)
+                .andExpect(status().isBadRequest())
+                .andExpect(statusReason(containsString(msgError)));
 
         dashboard.setTenantId(savedTenant.getId());
         testNotifyEntityEqualsOneTimeError(dashboard, savedTenant.getId(),
@@ -165,9 +167,11 @@ public abstract class BaseDashboardControllerTest extends AbstractControllerTest
                 savedDashboard.getTenantId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.DELETED,
                 savedDashboard.getId().getId().toString());
 
-
+        String dashboardIdStr = savedDashboard.getId().getId().toString();
+        String msgError = "Dashboard with id [" + dashboardIdStr + "] is not found";
         doGet("/api/dashboard/" + savedDashboard.getId().getId().toString())
-                .andExpect(status().isNotFound());
+                .andExpect(status().isNotFound())
+                .andExpect(statusReason(containsString(msgError)));
     }
 
     @Test
@@ -231,9 +235,12 @@ public abstract class BaseDashboardControllerTest extends AbstractControllerTest
         dashboard.setTitle("My dashboard");
         Dashboard savedDashboard = doPost("/api/dashboard", dashboard, Dashboard.class);
 
-        doPost("/api/customer/" + Uuids.timeBased().toString()
+        String customerIdStr = Uuids.timeBased().toString();
+        String msgError = "Customer with id [" + customerIdStr + "] is not found";
+        doPost("/api/customer/" + customerIdStr
                 + "/dashboard/" + savedDashboard.getId().getId().toString())
-                .andExpect(status().isNotFound());
+                .andExpect(status().isNotFound())
+                .andExpect(statusReason(containsString(msgError)));
 
         Mockito.reset(tbClusterService, auditLogService);
         testNotifyEntityNever(savedDashboard.getId(), savedDashboard);
@@ -269,13 +276,15 @@ public abstract class BaseDashboardControllerTest extends AbstractControllerTest
 
         doPost("/api/customer/" + savedCustomer.getId().getId().toString()
                 + "/dashboard/" + savedDashboard.getId().getId().toString())
-                .andExpect(status().isForbidden());
+                .andExpect(status().isForbidden())
+                .andExpect(statusReason(containsString(msgErrorPermission)));
 
         Mockito.reset(tbClusterService, auditLogService);
         testNotifyEntityNever(savedDashboard.getId(), savedDashboard);
 
         doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isForbidden());
+                .andExpect(status().isForbidden())
+                .andExpect(statusReason(containsString(msgErrorPermission)));
         testNotifyEntityNever(savedDashboard.getId(), savedDashboard);
 
         loginSysAdmin();