From 8ceaf06d4d45301786b8c3ec0ee390843f92e465 Mon Sep 17 00:00:00 2001
From: zengsiyu <zengsiyu3@huawei.com>
Date: Tue, 15 Feb 2022 15:39:42 +0800
Subject: [PATCH] fixed c36edb4 from
 https://gitee.com/zengsiyu3/notification_ans_standard/pulls/235 feat: add
 testcases and CheckApiCompatibility

Signed-off-by: zengsiyu <zengsiyu3@huawei.com>
Change-Id: I04e311c94f89c98a140a21d982b06dd13616ebf0
Signed-off-by: zengsiyu <zengsiyu3@huawei.com>
---
 .../ans/dialog/dialog_ui/js/i18n/en-US.json   |  2 +-
 .../ans/dialog/dialog_ui/js/i18n/zh-CN.json   |  2 +-
 .../dialog/dialog_ui/js/pages/index/index.hml |  2 +-
 .../dialog/dialog_ui/js/pages/index/index.js  |  2 +-
 services/ans/include/bundle_manager_helper.h  |  1 +
 .../ans/src/advanced_notification_service.cpp | 21 ++++++++++++--
 services/ans/src/bundle_manager_helper.cpp    | 10 ++++++-
 .../advanced_notification_service_test.cpp    | 20 +++++++++++--
 .../mock/mock_bundle_manager_helper.cpp       |  5 ++++
 .../notification_preferences_test.cpp         | 28 +++++++++++++++++++
 10 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/frameworks/ans/dialog/dialog_ui/js/i18n/en-US.json b/frameworks/ans/dialog/dialog_ui/js/i18n/en-US.json
index 01f54cf99..43b810701 100644
--- a/frameworks/ans/dialog/dialog_ui/js/i18n/en-US.json
+++ b/frameworks/ans/dialog/dialog_ui/js/i18n/en-US.json
@@ -1,7 +1,7 @@
 {
   "message":{
     "requestNotification": "Allowed to send notification?",
-    "allowmButton": "Allow",
+    "allowButton": "Allow",
     "cancelButton": "Cancel"
   }
 }
diff --git a/frameworks/ans/dialog/dialog_ui/js/i18n/zh-CN.json b/frameworks/ans/dialog/dialog_ui/js/i18n/zh-CN.json
index b527187a6..0f049cb99 100644
--- a/frameworks/ans/dialog/dialog_ui/js/i18n/zh-CN.json
+++ b/frameworks/ans/dialog/dialog_ui/js/i18n/zh-CN.json
@@ -1,7 +1,7 @@
 {
   "message": {
     "requestNotification": "是否允许发送通知？",
-    "allowmButton": "允许",
+    "allowButton": "允许",
     "cancelButton": "取消"
   }
 }
diff --git a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
index 4759aece1..98272a4d6 100644
--- a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
+++ b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
@@ -6,7 +6,7 @@
     </div>
     <div>
         <button class="btn" onclick="onAllow">
-            {{ allowmButton }}
+            {{ allowButton }}
         </button>
         <button class="btn" onclick="onCancel">
             {{ cancelButton }}
diff --git a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.js b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.js
index ea497ebbd..928dc3b8b 100644
--- a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.js
+++ b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.js
@@ -4,7 +4,7 @@ export default {
     data: {
         message: router.getParams().message,
         requestNotification: router.getParams().requestNotification,
-        allowmButton: router.getParams().allowmButton,
+        allowButton: router.getParams().allowButton,
         cancelButton: router.getParams().cancelButton,
         uid: router.getParams().uid,
     },
diff --git a/services/ans/include/bundle_manager_helper.h b/services/ans/include/bundle_manager_helper.h
index 5bd43d100..e08a2d415 100644
--- a/services/ans/include/bundle_manager_helper.h
+++ b/services/ans/include/bundle_manager_helper.h
@@ -34,6 +34,7 @@ public:
     std::string GetBundleNameByUid(int uid);
     bool IsSystemApp(int uid);
     int GetDefaultUidByBundleName(const std::string &bundle);
+    bool GetBundleInfoByBundleName(const std::string bundle, AppExecFwk::BundleInfo &bundleInfo);
 #ifdef DISTRIBUTED_NOTIFICATION_SUPPORTED
     bool GetDistributedNotificationEnabled(const std::string &bundleName, const int userId);
 #endif
diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp
index ec56db5b7..80098db23 100644
--- a/services/ans/src/advanced_notification_service.cpp
+++ b/services/ans/src/advanced_notification_service.cpp
@@ -20,6 +20,7 @@
 #include <sstream>
 
 #include "ability_context.h"
+#include "ability_info.h"
 #include "ans_const_define.h"
 #include "ans_inner_errors.h"
 #include "ans_log_wrapper.h"
@@ -117,6 +118,21 @@ inline bool IsSystemApp()
     return isSystemApp;
 }
 
+inline bool CheckApiCompatibility(const std::string bundleName)
+{
+    AppExecFwk::BundleInfo bundleInfo;
+    std::shared_ptr<BundleManagerHelper> bundleManager = BundleManagerHelper::GetInstance();
+    if (bundleManager != nullptr) {
+        bundleManager->GetBundleInfoByBundleName(bundleName, bundleInfo);
+    }
+    for (int i = 0; i < (int)bundleInfo.abilityInfos.size(); ++i) {
+        if (bundleInfo.abilityInfos[i].isStageBasedModel) {
+            return false;
+        }
+    }
+    return true;
+}
+
 inline int64_t ResetSeconds(int64_t date)
 {
     auto milliseconds = std::chrono::milliseconds(date);
@@ -1377,7 +1393,7 @@ ErrCode AdvancedNotificationService::RequestEnableNotification(const std::string
     }
 
     const std::string params = std::string("{\"requestNotification\":\"Allowed to send notification?\", ") +
-        std::string("\"allowButton\":\"Alllow\", \"cancelButton\":\"Cancel\", \"uid\":\"") +
+        std::string("\"allowButton\":\"Allow\", \"cancelButton\":\"Cancel\", \"uid\":\"") +
         std::to_string(bundleOption->GetUid()) + std::string("\"}");
     Ace::UIServiceMgrClient::GetInstance()->ShowDialog(
         "notification_dialog",
@@ -1517,8 +1533,9 @@ ErrCode AdvancedNotificationService::IsAllowedNotifySelf(bool &allowed)
         return ERR_ANS_INVALID_BUNDLE;
     }
 
+    allowed = CheckApiCompatibility(bundleOption->GetBundleName());
+
     handler_->PostSyncTask(std::bind([&]() {
-        allowed = false;
         result = NotificationPreferences::GetInstance().GetNotificationsEnabledForBundle(bundleOption, allowed);
         if (result == ERR_ANS_PREFERENCES_NOTIFICATION_BUNDLE_NOT_EXIST) {
             result = ERR_OK;
diff --git a/services/ans/src/bundle_manager_helper.cpp b/services/ans/src/bundle_manager_helper.cpp
index ff21b58a7..dd9cfa14f 100644
--- a/services/ans/src/bundle_manager_helper.cpp
+++ b/services/ans/src/bundle_manager_helper.cpp
@@ -56,7 +56,6 @@ std::string BundleManagerHelper::GetBundleNameByUid(int uid)
 
     return bundle;
 }
-
 bool BundleManagerHelper::IsSystemApp(int uid)
 {
     bool isSystemApp = false;
@@ -72,6 +71,15 @@ bool BundleManagerHelper::IsSystemApp(int uid)
     return isSystemApp;
 }
 
+bool BundleManagerHelper::GetBundleInfoByBundleName(const std::string bundle, AppExecFwk::BundleInfo &bundleInfo)
+{
+    if (bundleMgr_ == nullptr) {
+        return false;
+    }
+    return bundleMgr_->GetBundleInfo(bundle, AppExecFwk::BundleFlag::GET_BUNDLE_WITH_ABILITIES, bundleInfo);
+}
+
+
 void BundleManagerHelper::Connect()
 {
     if (bundleMgr_ != nullptr) {
diff --git a/services/ans/test/unittest/advanced_notification_service_test.cpp b/services/ans/test/unittest/advanced_notification_service_test.cpp
index 53f41da1b..fc1d0c27c 100644
--- a/services/ans/test/unittest/advanced_notification_service_test.cpp
+++ b/services/ans/test/unittest/advanced_notification_service_test.cpp
@@ -1195,11 +1195,11 @@ HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_09300,
 }
 
 /**
- * @tc.number    : AdvancedNotificationServiceTest_09600
- * @tc.name      : ANS_IsAllowedNotify_0200
+ * @tc.number    : AdvancedNotificationServiceTest_09500
+ * @tc.name      : ANS_IsAllowedNotify_0100
  * @tc.desc      : Test IsAllowedNotify function
  */
-HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_09600, Function | SmallTest | Level1)
+HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_09500, Function | SmallTest | Level1)
 {
     EXPECT_EQ(
         (int)advancedNotificationService_->SetNotificationsEnabledForAllBundles(std::string(), true), (int)ERR_OK);
@@ -1208,6 +1208,20 @@ HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_09600,
     EXPECT_TRUE(allowed);
 }
 
+/**
+ * @tc.number    : AdvancedNotificationServiceTest_09600
+ * @tc.name      : ANS_IsAllowedNotifySelf_0100
+ * @tc.desc      : Test IsAllowedNotifySelf function
+ */
+HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_09600, Function | SmallTest | Level1)
+{
+    EXPECT_EQ(
+        (int)advancedNotificationService_->SetNotificationsEnabledForAllBundles(std::string(), true), (int)ERR_OK);
+    bool allowed = false;
+    EXPECT_EQ((int)advancedNotificationService_->IsAllowedNotifySelf(allowed), (int)ERR_OK);
+    EXPECT_TRUE(allowed);
+}
+
 /**
  * @tc.number    : AdvancedNotificationServiceTest_09700
  * @tc.name      : ANS_IsSpecialBundleAllowedNotify_0100
diff --git a/services/ans/test/unittest/mock/mock_bundle_manager_helper.cpp b/services/ans/test/unittest/mock/mock_bundle_manager_helper.cpp
index 53a462d00..f49cc6066 100644
--- a/services/ans/test/unittest/mock/mock_bundle_manager_helper.cpp
+++ b/services/ans/test/unittest/mock/mock_bundle_manager_helper.cpp
@@ -46,6 +46,11 @@ bool BundleManagerHelper::IsSystemApp(int uid)
     return (uid == SYSTEM_APP_UID);
 }
 
+bool BundleManagerHelper::GetBundleInfoByBundleName(const std::string bundle, AppExecFwk::BundleInfo &bundleInfo)
+{
+    return true;
+}
+
 void BundleManagerHelper::Connect()
 {}
 
diff --git a/services/ans/test/unittest/notification_preferences_test.cpp b/services/ans/test/unittest/notification_preferences_test.cpp
index fa283597a..86220aeb8 100644
--- a/services/ans/test/unittest/notification_preferences_test.cpp
+++ b/services/ans/test/unittest/notification_preferences_test.cpp
@@ -1120,5 +1120,33 @@ HWTEST_F(NotificationPreferencesTest, GetDoNotDisturbDate_00200, Function | Smal
     EXPECT_EQ((int)NotificationPreferences::GetInstance().GetDoNotDisturbDate(
         NON_SYSTEM_APP_UID, getExsitDate), (int)ERR_ANS_INVALID_PARAM);
 }
+
+/**
+ * @tc.number    : SetHasPoppedDialog_00100
+ * @tc.name      :
+ * @tc.desc      : Set has popped dialog into disturbe DB, return is ERR_OK
+ */
+HWTEST_F(NotificationPreferencesTest, SetHasPoppedDialog_00100, Function | SmallTest | Level1)
+{
+    bool hasPopped = false;
+
+    EXPECT_EQ((int)NotificationPreferences::GetInstance().SetHasPoppedDialog(bundleOption_, hasPopped), (int)ERR_OK);
+}
+
+/**
+ * @tc.number    : GetHasPoppedDialog_00100
+ * @tc.name      :
+ * @tc.desc      : Get has popped dialog from disturbe DB, return is ERR_OK
+ */
+HWTEST_F(NotificationPreferencesTest, GetHasPoppedDialog_00100, Function | SmallTest | Level1)
+{
+    bool popped = true;
+
+    EXPECT_EQ((int)NotificationPreferences::GetInstance().SetHasPoppedDialog(bundleOption_, popped), (int)ERR_OK);
+
+    bool hasPopped = false;
+    EXPECT_EQ((int)NotificationPreferences::GetInstance().GetHasPoppedDialog(bundleOption_, hasPopped), (int)ERR_OK);
+    EXPECT_TRUE(hasPopped);
+}
 }  // namespace Notification
 }  // namespace OHOS
-- 
Gitee