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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 89683003: Rename DesktopMediaPickerModel[Impl]->[Native]DesktopMediaList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/cocoa/media_picker/desktop_media_picker_item.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 7c518b99fca3d82e9059f58446afd99f99aee742..3901f95adbe1a4f234691bd15a9ffe159d667681 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
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/run_loop.h"
+#include "chrome/browser/media/desktop_media_list_observer.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest_mac.h"
@@ -35,15 +36,16 @@
}
@end
-class FakeDesktopMediaPickerModel : public DesktopMediaPickerModel {
+class FakeDesktopMediaList : public DesktopMediaList {
public:
- FakeDesktopMediaPickerModel() : observer_(NULL) {
+ FakeDesktopMediaList() : observer_(NULL) {
}
void AddSource(int id) {
- Source source(
- content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW, id),
- base::Int64ToString16(id));
+ Source source;
+ source.id =
+ content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW, id);
+ source.name = base::Int64ToString16(id);
sources_.push_back(source);
observer_->OnSourceAdded(sources_.size() - 1);
@@ -64,7 +66,7 @@ class FakeDesktopMediaPickerModel : public DesktopMediaPickerModel {
observer_->OnSourceNameChanged(index);
}
- // DesktopMediaPickerModel implementation:
+ // DesktopMediaList implementation:
virtual void SetUpdatePeriod(base::TimeDelta period) OVERRIDE {
}
@@ -75,7 +77,7 @@ class FakeDesktopMediaPickerModel : public DesktopMediaPickerModel {
content::DesktopMediaID::Id dialog_id) OVERRIDE {
}
- virtual void StartUpdating(Observer* observer) OVERRIDE {
+ virtual void StartUpdating(DesktopMediaListObserver* observer) OVERRIDE {
observer_ = observer;
SkBitmap bitmap;
@@ -85,29 +87,30 @@ class FakeDesktopMediaPickerModel : public DesktopMediaPickerModel {
thumbnail_ = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
}
- virtual int source_count() const OVERRIDE {
+ virtual int GetSourceCount() const OVERRIDE {
return sources_.size();
}
- virtual const Source& source(int index) const OVERRIDE {
+ virtual const Source& GetSource(int index) const OVERRIDE {
return sources_[index];
}
private:
std::vector<Source> sources_;
- Observer* observer_;
+ DesktopMediaListObserver* observer_;
gfx::ImageSkia thumbnail_;
};
class DesktopMediaPickerControllerTest : public CocoaTest {
public:
- DesktopMediaPickerControllerTest() : callback_called_(false), model_(NULL) {
+ DesktopMediaPickerControllerTest()
+ : callback_called_(false), media_list_(NULL) {
}
virtual void SetUp() OVERRIDE {
CocoaTest::SetUp();
- model_ = new FakeDesktopMediaPickerModel();
+ media_list_ = new FakeDesktopMediaList();
DesktopMediaPicker::DoneCallback callback =
base::Bind(&DesktopMediaPickerControllerTest::OnResult,
@@ -115,9 +118,9 @@ class DesktopMediaPickerControllerTest : public CocoaTest {
controller_.reset(
[[DesktopMediaPickerController alloc]
- initWithModel:scoped_ptr<DesktopMediaPickerModel>(model_)
- callback:callback
- appName:ASCIIToUTF16("Screenshare Test")]);
+ initWithMediaList:scoped_ptr<DesktopMediaList>(media_list_)
+ callback:callback
+ appName:ASCIIToUTF16("Screenshare Test")]);
}
virtual void TearDown() OVERRIDE {
@@ -142,16 +145,16 @@ class DesktopMediaPickerControllerTest : public CocoaTest {
content::TestBrowserThreadBundle thread_bundle_;
bool callback_called_;
content::DesktopMediaID source_reported_;
- FakeDesktopMediaPickerModel* model_;
+ FakeDesktopMediaList* media_list_;
base::scoped_nsobject<DesktopMediaPickerController> controller_;
};
TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
[controller_ showWindow:nil];
- model_->AddSource(0);
- model_->AddSource(1);
- model_->SetSourceThumbnail(1);
+ media_list_->AddSource(0);
+ media_list_->AddSource(1);
+ media_list_->SetSourceThumbnail(1);
NSArray* items = [controller_ items];
EXPECT_EQ(2U, [items count]);
@@ -164,10 +167,10 @@ TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
TEST_F(DesktopMediaPickerControllerTest, ClickOK) {
[controller_ showWindow:nil];
- model_->AddSource(0);
- model_->SetSourceThumbnail(0);
- model_->AddSource(1);
- model_->SetSourceThumbnail(1);
+ media_list_->AddSource(0);
+ media_list_->SetSourceThumbnail(0);
+ media_list_->AddSource(1);
+ media_list_->SetSourceThumbnail(1);
EXPECT_EQ(2U, [[controller_ items] count]);
EXPECT_FALSE([[controller_ okButton] isEnabled]);
@@ -179,16 +182,16 @@ TEST_F(DesktopMediaPickerControllerTest, ClickOK) {
[[controller_ okButton] performClick:nil];
EXPECT_TRUE(WaitForCallback());
- EXPECT_EQ(model_->source(1).id, source_reported_);
+ EXPECT_EQ(media_list_->GetSource(1).id, source_reported_);
}
TEST_F(DesktopMediaPickerControllerTest, ClickCancel) {
[controller_ showWindow:nil];
- model_->AddSource(0);
- model_->SetSourceThumbnail(0);
- model_->AddSource(1);
- model_->SetSourceThumbnail(1);
+ media_list_->AddSource(0);
+ media_list_->SetSourceThumbnail(0);
+ media_list_->AddSource(1);
+ media_list_->SetSourceThumbnail(1);
[[controller_ cancelButton] performClick:nil];
EXPECT_TRUE(WaitForCallback());
@@ -198,10 +201,10 @@ TEST_F(DesktopMediaPickerControllerTest, ClickCancel) {
TEST_F(DesktopMediaPickerControllerTest, CloseWindow) {
[controller_ showWindow:nil];
- model_->AddSource(0);
- model_->SetSourceThumbnail(0);
- model_->AddSource(1);
- model_->SetSourceThumbnail(1);
+ media_list_->AddSource(0);
+ media_list_->SetSourceThumbnail(0);
+ media_list_->AddSource(1);
+ media_list_->SetSourceThumbnail(1);
[controller_ close];
EXPECT_TRUE(WaitForCallback());
@@ -211,42 +214,42 @@ TEST_F(DesktopMediaPickerControllerTest, CloseWindow) {
TEST_F(DesktopMediaPickerControllerTest, UpdateThumbnail) {
[controller_ showWindow:nil];
- model_->AddSource(0);
- model_->SetSourceThumbnail(0);
- model_->AddSource(1);
- model_->SetSourceThumbnail(1);
+ media_list_->AddSource(0);
+ media_list_->SetSourceThumbnail(0);
+ media_list_->AddSource(1);
+ media_list_->SetSourceThumbnail(1);
NSArray* items = [controller_ items];
EXPECT_EQ(2U, [items count]);
NSUInteger version = [[items objectAtIndex:0] imageVersion];
- model_->SetSourceThumbnail(0);
+ media_list_->SetSourceThumbnail(0);
EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
}
TEST_F(DesktopMediaPickerControllerTest, UpdateName) {
[controller_ showWindow:nil];
- model_->AddSource(0);
- model_->SetSourceThumbnail(0);
- model_->AddSource(1);
- model_->SetSourceThumbnail(1);
+ media_list_->AddSource(0);
+ media_list_->SetSourceThumbnail(0);
+ media_list_->AddSource(1);
+ media_list_->SetSourceThumbnail(1);
NSArray* items = [controller_ items];
EXPECT_EQ(2U, [items count]);
NSUInteger version = [[items objectAtIndex:0] imageVersion];
- model_->SetSourceThumbnail(0);
+ media_list_->SetSourceThumbnail(0);
EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
}
TEST_F(DesktopMediaPickerControllerTest, RemoveSource) {
[controller_ showWindow:nil];
- model_->AddSource(0);
- model_->AddSource(1);
- model_->AddSource(2);
- model_->SetSourceName(1, ASCIIToUTF16("foo"));
+ media_list_->AddSource(0);
+ media_list_->AddSource(1);
+ media_list_->AddSource(2);
+ media_list_->SetSourceName(1, ASCIIToUTF16("foo"));
NSArray* items = [controller_ items];
EXPECT_EQ(3U, [items count]);
« no previous file with comments | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm ('k') | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698