SupervisedUsers : Fix transaction cleanup

chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
@@ skipping 108 matching lines @@
     function.append("').value = '");
     function.append(value);
     function.append("'");
     JSEval(function);
   }
 
   void PrepareUsers();
   void CreateSupervisedUser();
   void SigninAsSupervisedUser();
   void RemoveSupervisedUser();
+  void LogInAsManagerAndFillUserData();
 
  protected:
    cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;
    NetworkPortalDetectorTestImpl* network_portal_detector_;
    ManagedUserRegistrationUtilityStub* registration_utility_stub_;
    scoped_ptr<ScopedTestingManagedUserRegistrationUtility> scoped_utility_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserTest);
 };
 
 void SupervisedUserTest::PrepareUsers() {
   RegisterUser(kTestManager);
   RegisterUser(kTestOtherUser);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
-void SupervisedUserTest::CreateSupervisedUser() {
+void SupervisedUserTest::LogInAsManagerAndFillUserData() {
   // Create supervised user.
 
   // Navigate to supervised user creation screen.
   JSEval("chrome.send('showLocallyManagedUserCreationScreen')");
 
   // Read intro and proceed.
   JSExpect("$('managed-user-creation').currentPage_ == 'intro'");
 
   JSEval("$('managed-user-creation-start-button').click()");
 
@@ skipping 51 matching lines @@
 
   JSSetTextField(
       "#managed-user-creation-password",
       kSupervisedUserPassword);
   JSSetTextField(
       "#managed-user-creation-password-confirm",
       kSupervisedUserPassword);
 
   JSEval("$('managed-user-creation').updateNextButtonForUser_()");
   JSExpect("!$('managed-user-creation-next-button').disabled");
+}
+
+void SupervisedUserTest::CreateSupervisedUser() {
+  LogInAsManagerAndFillUserData();
 
   EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
       .Times(1);
   EXPECT_CALL(*mock_async_method_caller_, AsyncGetSanitizedUsername(_, _))
       .Times(1);
   EXPECT_CALL(*mock_async_method_caller_, AsyncAddKey(_, _, _, _))
       .Times(1);
 
   JSEval("$('managed-user-creation-next-button').click()");
 
@@ skipping 52 matching lines @@
   ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size());
 }
 
 class SupervisedUserCreationTest : public SupervisedUserTest {
  public:
   SupervisedUserCreationTest() : SupervisedUserTest() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationTest);
 };
 
+class SupervisedUserTransactionCleanupTest : public SupervisedUserTest {
+ public:
+  SupervisedUserTransactionCleanupTest() : SupervisedUserTest () {}
+ private:

[Nikita (slow), 2013/11/14 01:19:13]

nit: Insert empty line.

+  DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest);
+};
+
 class SupervisedUserOwnerCreationTest : public SupervisedUserTest {
  public:
   SupervisedUserOwnerCreationTest() : SupervisedUserTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     SupervisedUserTest::SetUpInProcessBrowserTestFixture();
     cros_settings_provider_.reset(new StubCrosSettingsProvider());
     cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager));
   }
  private:
@@ skipping 34 matching lines @@
 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
     PRE_CreateAndRemoveSupervisedUser) {
   SigninAsSupervisedUser();
 }
 
 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
     CreateAndRemoveSupervisedUser) {
   RemoveSupervisedUser();
 }
 
+IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
+    PRE_PRE_CreateAndCancelSupervisedUser) {
+  PrepareUsers();
+}
+
+IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
+    PRE_CreateAndCancelSupervisedUser) {
+  LogInAsManagerAndFillUserData();
+
+  EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
+      .Times(1);
+  EXPECT_CALL(*mock_async_method_caller_, AsyncGetSanitizedUsername(_, _))
+      .Times(1);
+  EXPECT_CALL(*mock_async_method_caller_, AsyncAddKey(_, _, _, _))
+      .Times(1);
+
+  JSEval("$('managed-user-creation-next-button').click()");
+
+  testing::Mock::VerifyAndClearExpectations(mock_async_method_caller_);
+
+  EXPECT_TRUE(registration_utility_stub_->register_was_called());
+  EXPECT_EQ(registration_utility_stub_->display_name(),
+            UTF8ToUTF16(kSupervisedUserDisplayName));
+
+  std::string user_id = registration_utility_stub_->managed_user_id();
+  // Make sure user is already in list.
+  ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
+  // We wait for token now. Press cancel button at this point.
+  JSEval("$('cancel-add-user-button').click()");
+}
+
+IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
+    CreateAndCancelSupervisedUser) {
+  // Make sure there is no supervised user in list.
+  ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size());
+}
+
 }  // namespace chromeos