Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3023)

Unified Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm

Issue 2826233002: [subresource_filter] Mac UI updated and xib replaced with code based layout. (Closed)
Patch Set: Feedback addressed , tests added. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm
index c53d1a3c43f8c891a06b2992b4c31f8bc407f7d8..a7abcf99c27b161a3d9c2831d380bf1f50fd6a69 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm
@@ -8,17 +8,20 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/mac/scoped_nsobject.h"
+#include "base/strings/sys_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/download/download_request_limiter.h"
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
#include "chrome/browser/ui/browser.h"
+#import "chrome/browser/ui/cocoa/subresource_filter/subresource_filter_bubble_controller.h"
#import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
#include "chrome/browser/ui/content_settings/content_setting_image_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "components/strings/grit/components_strings.h"
#include "content/public/common/media_stream_request.h"
#include "testing/gtest_mac.h"
#include "ui/base/l10n/l10n_util.h"
@@ -117,3 +120,69 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleControllerTest, MediaStreamBubble) {
[parent_ close];
}
+
+// Subresource Filter bubble.
+
+IN_PROC_BROWSER_TEST_F(ContentSettingBubbleControllerTest,
+ InitSubresourceFilter) {
+ ContentSettingBubbleController* controller =
+ CreateBubbleController(new ContentSettingSubresourceFilterBubbleModel(
+ nullptr, web_contents(), profile()));
+ EXPECT_TRUE(controller);
+
+ SubresourceFilterBubbleController* filterController =
+ (SubresourceFilterBubbleController*)controller;
Robert Sesek 2017/05/05 16:53:34 C-style casts are banned in Chromium, but base::ma
shivanisha 2017/05/05 17:33:21 done
+
+ EXPECT_TRUE([filterController titleLabel]);
+ NSString* label = base::SysUTF16ToNSString(
+ l10n_util::GetStringUTF16(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE));
+ EXPECT_TRUE(
Robert Sesek 2017/05/05 16:53:34 Use EXPECT_NSEQ to get a better failure message if
shivanisha 2017/05/05 17:33:21 done
+ [[[filterController titleLabel] stringValue] isEqualToString:label]);
+
+ EXPECT_TRUE([filterController messageLabel]);
+ label = base::SysUTF16ToNSString(l10n_util::GetStringUTF16(
+ IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION));
+ EXPECT_TRUE(
+ [[[filterController messageLabel] stringValue] isEqualToString:label]);
+
+ EXPECT_TRUE([filterController manageCheckbox]);
+ label = base::SysUTF16ToNSString(
+ l10n_util::GetStringUTF16(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD));
+ EXPECT_TRUE(
+ [[[filterController manageCheckbox] title] isEqualToString:label]);
+
+ EXPECT_TRUE([filterController doneButton]);
+ label = base::SysUTF16ToNSString(l10n_util::GetStringUTF16(IDS_OK));
+ EXPECT_TRUE([[[filterController doneButton] title] isEqualToString:label]);
+
+ [parent_ close];
+}
+
+IN_PROC_BROWSER_TEST_F(ContentSettingBubbleControllerTest,
Robert Sesek 2017/05/05 16:53:34 Same comments above as in this test.
shivanisha 2017/05/05 17:33:21 done
+ ManageCheckboxSubresourceFilter) {
+ ContentSettingSubresourceFilterBubbleModel* model =
+ new ContentSettingSubresourceFilterBubbleModel(nullptr, web_contents(),
+ profile());
+ ContentSettingBubbleController* controller = CreateBubbleController(model);
+ EXPECT_TRUE(controller);
+
+ SubresourceFilterBubbleController* filterController =
+ (SubresourceFilterBubbleController*)controller;
+ NSButton* manageCheckbox = [filterController manageCheckbox];
+ NSButton* doneButton = [filterController doneButton];
+
+ EXPECT_EQ([manageCheckbox state], NSOffState);
+
+ NSString* label = base::SysUTF16ToNSString(l10n_util::GetStringUTF16(IDS_OK));
+ EXPECT_TRUE([[doneButton title] isEqualToString:label]);
+
+ [manageCheckbox setState:NSOnState];
+ [filterController manageCheckboxChecked:manageCheckbox];
+ EXPECT_EQ([manageCheckbox state], NSOnState);
+
+ label =
+ base::SysUTF16ToNSString(l10n_util::GetStringUTF16(IDS_APP_MENU_RELOAD));
+ EXPECT_TRUE([[doneButton title] isEqualToString:label]);
+
+ [parent_ close];
+}

Powered by Google App Engine
This is Rietveld 408576698