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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm

Issue 1880693002: Desktop Capture Picker New UI: Preliminary Refactor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit Created 4 years, 8 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
« no previous file with comments | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm ('k') | chrome/browser/ui/views/desktop_media_picker_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
index e586bd206f87f0add153d34b658d8b00cf39d8c1..663d5d9cf1b3efea550be3bc8e51a5b11a121fcc 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
@@ -44,26 +44,28 @@
class DesktopMediaPickerControllerTest : public CocoaTest {
public:
- DesktopMediaPickerControllerTest()
- : callback_called_(false), media_list_(NULL) {
- }
+ DesktopMediaPickerControllerTest() {}
void SetUp() override {
CocoaTest::SetUp();
- media_list_ = new FakeDesktopMediaList();
+ screen_list_ = new FakeDesktopMediaList();
+ window_list_ = new FakeDesktopMediaList();
+ tab_list_ = new FakeDesktopMediaList();
DesktopMediaPicker::DoneCallback callback =
base::Bind(&DesktopMediaPickerControllerTest::OnResult,
base::Unretained(this));
controller_.reset([[DesktopMediaPickerController alloc]
- initWithMediaList:std::unique_ptr<DesktopMediaList>(media_list_)
- parent:nil
- callback:callback
- appName:base::ASCIIToUTF16("Screenshare Test")
- targetName:base::ASCIIToUTF16("https://foo.com")
- requestAudio:true]);
+ initWithScreenList:std::unique_ptr<DesktopMediaList>(screen_list_)
+ windowList:std::unique_ptr<DesktopMediaList>(window_list_)
+ tabList:std::unique_ptr<DesktopMediaList>(tab_list_)
+ parent:nil
+ callback:callback
+ appName:base::ASCIIToUTF16("Screenshare Test")
+ targetName:base::ASCIIToUTF16("https://foo.com")
+ requestAudio:true]);
}
void TearDown() override {
@@ -86,18 +88,20 @@ class DesktopMediaPickerControllerTest : public CocoaTest {
}
content::TestBrowserThreadBundle thread_bundle_;
- bool callback_called_;
+ bool callback_called_ = false;
content::DesktopMediaID source_reported_;
- FakeDesktopMediaList* media_list_;
+ FakeDesktopMediaList* screen_list_ = nullptr;
+ FakeDesktopMediaList* window_list_ = nullptr;
+ FakeDesktopMediaList* tab_list_ = nullptr;
base::scoped_nsobject<DesktopMediaPickerController> controller_;
};
TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->AddSource(1);
- media_list_->SetSourceThumbnail(1);
+ window_list_->AddSource(0);
+ window_list_->AddSource(1);
+ window_list_->SetSourceThumbnail(1);
NSArray* items = [controller_ items];
EXPECT_EQ(2U, [items count]);
@@ -110,10 +114,10 @@ TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
TEST_F(DesktopMediaPickerControllerTest, ClickShare) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->SetSourceThumbnail(0);
- media_list_->AddSource(1);
- media_list_->SetSourceThumbnail(1);
+ window_list_->AddSource(0);
+ window_list_->SetSourceThumbnail(0);
+ window_list_->AddSource(1);
+ window_list_->SetSourceThumbnail(1);
EXPECT_EQ(2U, [[controller_ items] count]);
EXPECT_FALSE([[controller_ shareButton] isEnabled]);
@@ -125,16 +129,16 @@ TEST_F(DesktopMediaPickerControllerTest, ClickShare) {
[[controller_ shareButton] performClick:nil];
EXPECT_TRUE(WaitForCallback());
- EXPECT_EQ(media_list_->GetSource(1).id, source_reported_);
+ EXPECT_EQ(window_list_->GetSource(1).id, source_reported_);
}
TEST_F(DesktopMediaPickerControllerTest, ClickCancel) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->SetSourceThumbnail(0);
- media_list_->AddSource(1);
- media_list_->SetSourceThumbnail(1);
+ window_list_->AddSource(0);
+ window_list_->SetSourceThumbnail(0);
+ window_list_->AddSource(1);
+ window_list_->SetSourceThumbnail(1);
[[controller_ cancelButton] performClick:nil];
EXPECT_TRUE(WaitForCallback());
@@ -144,10 +148,10 @@ TEST_F(DesktopMediaPickerControllerTest, ClickCancel) {
TEST_F(DesktopMediaPickerControllerTest, CloseWindow) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->SetSourceThumbnail(0);
- media_list_->AddSource(1);
- media_list_->SetSourceThumbnail(1);
+ window_list_->AddSource(0);
+ window_list_->SetSourceThumbnail(0);
+ window_list_->AddSource(1);
+ window_list_->SetSourceThumbnail(1);
[controller_ close];
EXPECT_TRUE(WaitForCallback());
@@ -157,42 +161,42 @@ TEST_F(DesktopMediaPickerControllerTest, CloseWindow) {
TEST_F(DesktopMediaPickerControllerTest, UpdateThumbnail) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->SetSourceThumbnail(0);
- media_list_->AddSource(1);
- media_list_->SetSourceThumbnail(1);
+ window_list_->AddSource(0);
+ window_list_->SetSourceThumbnail(0);
+ window_list_->AddSource(1);
+ window_list_->SetSourceThumbnail(1);
NSArray* items = [controller_ items];
EXPECT_EQ(2U, [items count]);
NSUInteger version = [[items objectAtIndex:0] imageVersion];
- media_list_->SetSourceThumbnail(0);
+ window_list_->SetSourceThumbnail(0);
EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
}
TEST_F(DesktopMediaPickerControllerTest, UpdateName) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->SetSourceThumbnail(0);
- media_list_->AddSource(1);
- media_list_->SetSourceThumbnail(1);
+ window_list_->AddSource(0);
+ window_list_->SetSourceThumbnail(0);
+ window_list_->AddSource(1);
+ window_list_->SetSourceThumbnail(1);
NSArray* items = [controller_ items];
EXPECT_EQ(2U, [items count]);
NSUInteger version = [[items objectAtIndex:0] imageVersion];
- media_list_->SetSourceThumbnail(0);
+ window_list_->SetSourceThumbnail(0);
EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
}
TEST_F(DesktopMediaPickerControllerTest, RemoveSource) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->AddSource(1);
- media_list_->AddSource(2);
- media_list_->SetSourceName(1, base::ASCIIToUTF16("foo"));
+ window_list_->AddSource(0);
+ window_list_->AddSource(1);
+ window_list_->AddSource(2);
+ window_list_->SetSourceName(1, base::ASCIIToUTF16("foo"));
NSArray* items = [controller_ items];
EXPECT_EQ(3U, [items count]);
@@ -202,16 +206,16 @@ TEST_F(DesktopMediaPickerControllerTest, RemoveSource) {
TEST_F(DesktopMediaPickerControllerTest, MoveSource) {
[controller_ showWindow:nil];
- media_list_->AddSource(0);
- media_list_->AddSource(1);
- media_list_->SetSourceName(1, base::ASCIIToUTF16("foo"));
+ window_list_->AddSource(0);
+ window_list_->AddSource(1);
+ window_list_->SetSourceName(1, base::ASCIIToUTF16("foo"));
NSArray* items = [controller_ items];
EXPECT_NSEQ(@"foo", [[items objectAtIndex:1] imageTitle]);
- media_list_->MoveSource(1, 0);
+ window_list_->MoveSource(1, 0);
EXPECT_NSEQ(@"foo", [[items objectAtIndex:0] imageTitle]);
- media_list_->MoveSource(0, 1);
+ window_list_->MoveSource(0, 1);
EXPECT_NSEQ(@"foo", [[items objectAtIndex:1] imageTitle]);
}
@@ -221,11 +225,11 @@ TEST_F(DesktopMediaPickerControllerTest, MoveSource) {
TEST_F(DesktopMediaPickerControllerTest, AudioShareCheckboxState) {
[controller_ showWindow:nil];
- media_list_->AddSourceByFullMediaID(
+ screen_list_->AddSourceByFullMediaID(
content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 0));
- media_list_->AddSourceByFullMediaID(
+ window_list_->AddSourceByFullMediaID(
content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW, 1));
- media_list_->AddSourceByFullMediaID(
+ tab_list_->AddSourceByFullMediaID(
content::DesktopMediaID(content::DesktopMediaID::TYPE_WEB_CONTENTS, 2));
NSButton* checkbox = [controller_ audioShareCheckbox];
« no previous file with comments | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm ('k') | chrome/browser/ui/views/desktop_media_picker_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698