Add tests for Virtual "Other Bookmarks" mapping

brave · Feb 6, 2020 · 8b8f4e3 · 8b8f4e3
1 parent e556675
commit 8b8f4e3
Show file tree

Hide file tree

Showing 7 changed files with 389 additions and 19 deletions.
diff --git a/components/brave_sync/brave_profile_sync_service_impl.cc b/components/brave_sync/brave_profile_sync_service_impl.cc
@@ -805,12 +805,15 @@ void BraveProfileSyncServiceImpl::LoadSyncEntityInfo(
 
 bool BraveProfileSyncServiceImpl::IsOtherBookmarksFolder(
     const jslib::SyncRecord* record) const {
+  auto bookmark = record->GetBookmark();
+  if (!bookmark.isFolder)
+    return false;
+
   std::string other_node_object_id;
   if (model_->other_node()->GetMetaInfo("object_id", &other_node_object_id) &&
       record->objectId == other_node_object_id)
     return true;
 
-  auto bookmark = record->GetBookmark();
   if (bookmark.order == tools::kOtherNodeOrder &&
       bookmark.site.title == tools::GetOtherNodeName() &&
       bookmark.site.customTitle == tools::GetOtherNodeName()) {

diff --git a/components/brave_sync/brave_profile_sync_service_impl.h b/components/brave_sync/brave_profile_sync_service_impl.h
@@ -49,6 +49,11 @@ FORWARD_DECLARE_TEST(BraveSyncServiceTest, SetThisDeviceCreatedTime);
 FORWARD_DECLARE_TEST(BraveSyncServiceTest, InitialFetchesStartWithZero);
 FORWARD_DECLARE_TEST(BraveSyncServiceTest, DeviceIdV2Migration);
 FORWARD_DECLARE_TEST(BraveSyncServiceTest, DeviceIdV2MigrationDupDeviceId);
+FORWARD_DECLARE_TEST(BraveSyncServiceTest, IsOtherBookmarksFolder);
+FORWARD_DECLARE_TEST(BraveSyncServiceTest, ProcessOtherBookmarksFolder);
+FORWARD_DECLARE_TEST(BraveSyncServiceTest, ProcessOtherBookmarksChildren);
+FORWARD_DECLARE_TEST(BraveSyncServiceTest, CheckOtherBookmarkRecord);
+FORWARD_DECLARE_TEST(BraveSyncServiceTest, CheckOtherBookmarkChildRecord);
 
 class BraveSyncServiceTest;
 
@@ -168,6 +173,16 @@ class BraveProfileSyncServiceImpl
   FRIEND_TEST_ALL_PREFIXES(::BraveSyncServiceTest, DeviceIdV2Migration);
   FRIEND_TEST_ALL_PREFIXES(::BraveSyncServiceTest,
                            DeviceIdV2MigrationDupDeviceId);
+  FRIEND_TEST_ALL_PREFIXES(::BraveSyncServiceTest,
+                           IsOtherBookmarksFolder);
+  FRIEND_TEST_ALL_PREFIXES(::BraveSyncServiceTest,
+                           ProcessOtherBookmarksFolder);
+  FRIEND_TEST_ALL_PREFIXES(::BraveSyncServiceTest,
+                           ProcessOtherBookmarksChildren);
+  FRIEND_TEST_ALL_PREFIXES(::BraveSyncServiceTest,
+                           CheckOtherBookmarkRecord);
+  FRIEND_TEST_ALL_PREFIXES(::BraveSyncServiceTest,
+                           CheckOtherBookmarkChildRecord);
 
   friend class ::BraveSyncServiceTest;