Fix tests

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

@@ -525,7 +525,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         JsonNode activateRequest = getActivateRequest(password);
         ResultActions resultActions = doPost("/api/noauth/activate", activateRequest);
         resultActions.andExpect(status().isOk());
-        return savedUser;
+        return doGet("/api/user/" + savedUser.getId(), User.class);
     }
 
     private JsonNode getActivateRequest(String password) throws Exception {

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

@@ -161,7 +161,7 @@ public class AuditLogControllerTest extends AbstractControllerTest {
         Device savedDevice = doPost("/api/device", device, Device.class);
         for (int i = 0; i < 11; i++) {
             savedDevice.setName("Device name" + i);
-            doPost("/api/device", savedDevice, Device.class);
+            savedDevice = doPost("/api/device", savedDevice, Device.class);
         }
 
         List<AuditLog> loadedAuditLogs = new ArrayList<>();

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

@@ -176,7 +176,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
 
         savedView.setName("New test entity view");
 
-        doPost("/api/entityView", savedView, EntityView.class);
+        savedView = doPost("/api/entityView", savedView, EntityView.class);
         foundEntityView = doGet("/api/entityView/" + savedView.getId().getId().toString(), EntityView.class);
 
         assertEquals(savedView, foundEntityView);

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

@@ -120,7 +120,7 @@ public class RuleChainControllerTest extends AbstractControllerTest {
                 ActionType.ADDED);
 
         savedRuleChain.setName("New RuleChain");
-        doPost("/api/ruleChain", savedRuleChain, RuleChain.class);
+        savedRuleChain = doPost("/api/ruleChain", savedRuleChain, RuleChain.class);
         RuleChain foundRuleChain = doGet("/api/ruleChain/" + savedRuleChain.getId().getId().toString(), RuleChain.class);
         Assert.assertEquals(savedRuleChain.getName(), foundRuleChain.getName());
 

application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java

@@ -204,8 +204,7 @@ public class DeviceEdgeTest extends AbstractEdgeTest {
         Assert.assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId());
         deviceCredentials.setCredentialsType(DeviceCredentialsType.ACCESS_TOKEN);
         deviceCredentials.setCredentialsId("access_token");
-        doPost("/api/device/credentials", deviceCredentials)
-                .andExpect(status().isOk());
+        deviceCredentials = doPost("/api/device/credentials", deviceCredentials, DeviceCredentials.class);
         Assert.assertTrue(edgeImitator.waitForMessages());
         AbstractMessage latestMessage = edgeImitator.getLatestMessage();
         Assert.assertTrue(latestMessage instanceof DeviceCredentialsUpdateMsg);
@@ -218,8 +217,7 @@ public class DeviceEdgeTest extends AbstractEdgeTest {
         deviceCredentials.setCredentialsType(DeviceCredentialsType.X509_CERTIFICATE);
         deviceCredentials.setCredentialsId(null);
         deviceCredentials.setCredentialsValue("-----BEGIN RSA PRIVATE KEY-----");
-        doPost("/api/device/credentials", deviceCredentials)
-                .andExpect(status().isOk());
+        deviceCredentials = doPost("/api/device/credentials", deviceCredentials, DeviceCredentials.class);
         Assert.assertTrue(edgeImitator.waitForMessages());
         latestMessage = edgeImitator.getLatestMessage();
         Assert.assertTrue(latestMessage instanceof DeviceCredentialsUpdateMsg);