dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit test fix

Browse Source
This commit is contained in:
dashevchenko 2023-02-07 17:59:44 +02:00
parent eea206bb6d
commit 4644401a53
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java
View File

@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.User;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.security.Authority;
@ -70,7 +71,7 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest {
customerUser.setEmail("customer@thingsboard.org"); customerUser.setEmail("customer@thingsboard.org");
customerUser = userService.saveUser(customerUser); customerUser = userService.saveUser(customerUser);
userSettings = createUserSettings(); userSettings = createUserSettings(customerUser.getId());
userSettings = userService.saveUserSettings(TenantId.SYS_TENANT_ID, customerUser.getId(), userSettings); userSettings = userService.saveUserSettings(TenantId.SYS_TENANT_ID, customerUser.getId(), userSettings);
} }
@ -488,8 +489,9 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest {
tenantService.deleteTenant(tenantId); tenantService.deleteTenant(tenantId);
} }
private UserSettings createUserSettings() { private UserSettings createUserSettings(UserId userId) {
UserSettings userSettings = new UserSettings(); UserSettings userSettings = new UserSettings();
userSettings.setUserId(userId);
userSettings.setSettings(JacksonUtil.newObjectNode().put("text", StringUtils.randomAlphanumeric(10))); userSettings.setSettings(JacksonUtil.newObjectNode().put("text", StringUtils.randomAlphanumeric(10)));
return userSettings; return userSettings;
} }