From 0fe6865b187b68259181f8e6e7bfe742969089c4 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 31 Oct 2024 15:20:15 +0200
Subject: [PATCH] fixed tests

---
 .../controller/QrCodeSettingsControllerTest.java       | 10 ++++++----
 .../server/dao/service/MobileAppServiceTest.java       |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/QrCodeSettingsControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/QrCodeSettingsControllerTest.java
index a1ab80ff8e..0301cb3153 100644
--- a/application/src/test/java/org/thingsboard/server/controller/QrCodeSettingsControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/QrCodeSettingsControllerTest.java
@@ -24,6 +24,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.mobile.app.MobileApp;
+import org.thingsboard.server.common.data.mobile.app.MobileAppStatus;
 import org.thingsboard.server.common.data.mobile.bundle.MobileAppBundle;
 import org.thingsboard.server.common.data.mobile.bundle.MobileAppBundleInfo;
 import org.thingsboard.server.common.data.mobile.qrCodeSettings.QRCodeConfig;
@@ -143,14 +144,14 @@ public class QrCodeSettingsControllerTest extends AbstractControllerTest {
 
         doPost("/api/mobile/qr/settings", qrCodeSettings)
                 .andExpect(status().isBadRequest())
-                .andExpect(statusReason(containsString("Mobile app bundle is required to use custom application!")));
+                .andExpect(statusReason(containsString("Validation error: qrCodeConfig must not be null")));
 
-        qrCodeSettings.setMobileAppBundleId(mobileAppBundle.getId());
+        qrCodeSettings.setQrCodeConfig(QRCodeConfig.builder().showOnHomePage(false).build());
         doPost("/api/mobile/qr/settings", qrCodeSettings)
                 .andExpect(status().isBadRequest())
-                .andExpect(statusReason(containsString("Qr code configuration is required!")));
+                .andExpect(statusReason(containsString("Mobile app bundle is required to use custom application!")));
 
-        qrCodeSettings.setQrCodeConfig(QRCodeConfig.builder().showOnHomePage(false).build());
+        qrCodeSettings.setMobileAppBundleId(mobileAppBundle.getId());
         doPost("/api/mobile/qr/settings", qrCodeSettings)
                 .andExpect(status().isOk());
     }
@@ -247,6 +248,7 @@ public class QrCodeSettingsControllerTest extends AbstractControllerTest {
     private MobileApp validMobileApp(String mobileAppName, PlatformType platformType) {
         MobileApp mobileApp = new MobileApp();
         mobileApp.setTenantId(tenantId);
+        mobileApp.setStatus(MobileAppStatus.DRAFT);
         mobileApp.setPkgName(mobileAppName);
         mobileApp.setPlatformType(platformType);
         mobileApp.setAppSecret(StringUtils.randomAlphanumeric(24));
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/MobileAppServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/MobileAppServiceTest.java
index f3919d0d2b..4ab9bb6d86 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/MobileAppServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/MobileAppServiceTest.java
@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.mobile.app.MobileApp;
+import org.thingsboard.server.common.data.mobile.app.MobileAppStatus;
 import org.thingsboard.server.common.data.oauth2.PlatformType;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -49,7 +50,7 @@ public class MobileAppServiceTest extends AbstractServiceTest {
 
     @Test
     public void testSaveMobileApp() {
-        MobileApp MobileApp = validMobileApp("mobileApp.ce", PlatformType.IOS);
+        MobileApp MobileApp = validMobileApp(SYSTEM_TENANT_ID, "mobileApp.ce", PlatformType.IOS);
         MobileApp savedMobileApp = mobileAppService.saveMobileApp(SYSTEM_TENANT_ID, MobileApp);
 
         MobileApp retrievedMobileApp = mobileAppService.findMobileAppById(savedMobileApp.getTenantId(), savedMobileApp.getId());
@@ -71,7 +72,7 @@ public class MobileAppServiceTest extends AbstractServiceTest {
     public void testGetTenantMobileApps() {
         List<MobileApp> mobileApps = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
-            MobileApp oAuth2Client = validMobileApp(StringUtils.randomAlphabetic(5), PlatformType.ANDROID);
+            MobileApp oAuth2Client = validMobileApp(SYSTEM_TENANT_ID, StringUtils.randomAlphabetic(5), PlatformType.ANDROID);
             MobileApp savedOauth2Client = mobileAppService.saveMobileApp(SYSTEM_TENANT_ID, oAuth2Client);
             mobileApps.add(savedOauth2Client);
         }
@@ -79,9 +80,11 @@ public class MobileAppServiceTest extends AbstractServiceTest {
         assertThat(retrieved.getData()).containsOnlyOnceElementsOf(mobileApps);
     }
 
-    private MobileApp validMobileApp(String mobileAppName, PlatformType platformType) {
+    private MobileApp validMobileApp(TenantId tenantId, String mobileAppName, PlatformType platformType) {
         MobileApp MobileApp = new MobileApp();
+        MobileApp.setTenantId(tenantId);
         MobileApp.setPkgName(mobileAppName);
+        MobileApp.setStatus(MobileAppStatus.DRAFT);
         MobileApp.setAppSecret(StringUtils.randomAlphanumeric(24));
         MobileApp.setPlatformType(platformType);
         return MobileApp;