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

Unified Diff: remoting/host/it2me/it2me_host_unittest.cc

Issue 2342393003: Removing TODO for It2Me Confirmation Dialog (Closed)
Patch Set: Switching Logging statement Created 4 years, 3 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 | « remoting/host/it2me/it2me_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/it2me/it2me_host_unittest.cc
diff --git a/remoting/host/it2me/it2me_host_unittest.cc b/remoting/host/it2me/it2me_host_unittest.cc
index ef53af73b0c26cbf4f098d662deb74fcfa1dc59b..de3613f34f071379895310c87b4d8b9de28dea89 100644
--- a/remoting/host/it2me/it2me_host_unittest.cc
+++ b/remoting/host/it2me/it2me_host_unittest.cc
@@ -127,7 +127,7 @@ class It2MeHostTest : public testing::Test {
ValidationResult validation_result_ = ValidationResult::SUCCESS;
// Used to set ConfirmationDialog behavior.
- FakeIt2MeConfirmationDialogFactory* fake_dialog_factory_ = nullptr;
+ FakeIt2MeConfirmationDialog* dialog_ = nullptr;
private:
std::unique_ptr<base::MessageLoop> message_loop_;
@@ -145,13 +145,18 @@ void It2MeHostTest::SetUp() {
message_loop_.reset(new base::MessageLoop());
run_loop_.reset(new base::RunLoop());
- fake_dialog_factory_ = new FakeIt2MeConfirmationDialogFactory();
+ std::unique_ptr<FakeIt2MeConfirmationDialogFactory> fake_dialog_factory(
+ new FakeIt2MeConfirmationDialogFactory());
+ dialog_ = new FakeIt2MeConfirmationDialog();
+ fake_dialog_factory->set_confirmation_dialog(base::WrapUnique(dialog_));
+
scoped_refptr<AutoThreadTaskRunner> auto_thread_task_runner =
new AutoThreadTaskRunner(base::ThreadTaskRunnerHandle::Get(),
run_loop_->QuitClosure());
+
it2me_host_ = new It2MeHost(
ChromotingHostContext::Create(auto_thread_task_runner),
- /*policy_watcher=*/nullptr, base::WrapUnique(fake_dialog_factory_),
+ /*policy_watcher=*/nullptr, std::move(fake_dialog_factory),
/*observer=*/nullptr, xmpp_server_config_, directory_bot_jid_);
}
@@ -242,28 +247,17 @@ TEST_F(It2MeHostTest, ConnectionValidation_WrongClientDomain_MatchEnd) {
ASSERT_EQ(ValidationResult::ERROR_INVALID_ACCOUNT, validation_result_);
}
-TEST_F(It2MeHostTest, ConnectionValidation_ConfirmationDialog_NoDialog) {
- RunValidationCallback(kTestClientJid);
- ASSERT_EQ(ValidationResult::SUCCESS, validation_result_);
-}
-
TEST_F(It2MeHostTest, ConnectionValidation_ConfirmationDialog_Accept) {
- FakeIt2MeConfirmationDialog* dialog = new FakeIt2MeConfirmationDialog();
- fake_dialog_factory_->set_confirmation_dialog(base::WrapUnique(dialog));
-
RunValidationCallback(kTestClientJid);
ASSERT_EQ(ValidationResult::SUCCESS, validation_result_);
- ASSERT_STREQ(kTestClientUserName, dialog->get_remote_user_email().c_str());
+ ASSERT_STREQ(kTestClientUserName, dialog_->get_remote_user_email().c_str());
}
TEST_F(It2MeHostTest, ConnectionValidation_ConfirmationDialog_Reject) {
- FakeIt2MeConfirmationDialog* dialog = new FakeIt2MeConfirmationDialog();
- dialog->set_dialog_result(DialogResult::CANCEL);
- fake_dialog_factory_->set_confirmation_dialog(base::WrapUnique(dialog));
-
+ dialog_->set_dialog_result(DialogResult::CANCEL);
RunValidationCallback(kTestClientJid);
ASSERT_EQ(ValidationResult::ERROR_REJECTED_BY_USER, validation_result_);
- ASSERT_STREQ(kTestClientUserName, dialog->get_remote_user_email().c_str());
+ ASSERT_STREQ(kTestClientUserName, dialog_->get_remote_user_email().c_str());
}
} // namespace remoting
« no previous file with comments | « remoting/host/it2me/it2me_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698