OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <string> | 5 #include <string> |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 83 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
84 SupervisedUserTransactionCleanupTest::SetUpInProcessBrowserTestFixture(); | 84 SupervisedUserTransactionCleanupTest::SetUpInProcessBrowserTestFixture(); |
85 EXPECT_CALL(*mock_async_method_caller_, AsyncRemove(_, _)).Times(1); | 85 EXPECT_CALL(*mock_async_method_caller_, AsyncRemove(_, _)).Times(1); |
86 } | 86 } |
87 | 87 |
88 private: | 88 private: |
89 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest2); | 89 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest2); |
90 }; | 90 }; |
91 | 91 |
92 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, | 92 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
93 PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { | 93 DISABLED_PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { |
94 PrepareUsers(); | 94 PrepareUsers(); |
95 } | 95 } |
96 | 96 |
97 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, | 97 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
98 PRE_PRE_CreateAndRemoveSupervisedUser) { | 98 DISABLED_PRE_PRE_CreateAndRemoveSupervisedUser) { |
99 StartFlowLoginAsManager(); | 99 StartFlowLoginAsManager(); |
100 FillNewUserData(kTestSupervisedUserDisplayName); | 100 FillNewUserData(kTestSupervisedUserDisplayName); |
101 StartUserCreation("managed-user-creation-next-button", | 101 StartUserCreation("managed-user-creation-next-button", |
102 kTestSupervisedUserDisplayName); | 102 kTestSupervisedUserDisplayName); |
103 } | 103 } |
104 | 104 |
105 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, | 105 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
106 PRE_CreateAndRemoveSupervisedUser) { | 106 DISABLED_PRE_CreateAndRemoveSupervisedUser) { |
107 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); | 107 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); |
108 } | 108 } |
109 | 109 |
110 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, | 110 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
111 CreateAndRemoveSupervisedUser) { | 111 DISABLED_CreateAndRemoveSupervisedUser) { |
112 RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName); | 112 RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName); |
113 } | 113 } |
114 | 114 |
115 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, | 115 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, |
116 PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { | 116 DISABLED_PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { |
117 PrepareUsers(); | 117 PrepareUsers(); |
118 } | 118 } |
119 | 119 |
120 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, | 120 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, |
121 PRE_PRE_CreateAndRemoveSupervisedUser) { | 121 DISABLED_PRE_PRE_CreateAndRemoveSupervisedUser) { |
122 StartFlowLoginAsManager(); | 122 StartFlowLoginAsManager(); |
123 FillNewUserData(kTestSupervisedUserDisplayName); | 123 FillNewUserData(kTestSupervisedUserDisplayName); |
124 StartUserCreation("managed-user-creation-next-button", | 124 StartUserCreation("managed-user-creation-next-button", |
125 kTestSupervisedUserDisplayName); | 125 kTestSupervisedUserDisplayName); |
126 } | 126 } |
127 | 127 |
128 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, | 128 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, |
129 PRE_CreateAndRemoveSupervisedUser) { | 129 DISABLED_PRE_CreateAndRemoveSupervisedUser) { |
130 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); | 130 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); |
131 } | 131 } |
132 | 132 |
133 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, | 133 IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, |
134 CreateAndRemoveSupervisedUser) { | 134 DISABLED_CreateAndRemoveSupervisedUser) { |
135 RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName); | 135 RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName); |
136 } | 136 } |
137 | 137 |
138 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, | 138 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, |
139 PRE_PRE_CreateAndCancelSupervisedUser) { | 139 DISABLED_PRE_PRE_CreateAndCancelSupervisedUser) { |
140 PrepareUsers(); | 140 PrepareUsers(); |
141 } | 141 } |
142 | 142 |
143 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, | 143 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, |
144 PRE_CreateAndCancelSupervisedUser) { | 144 DISABLED_PRE_CreateAndCancelSupervisedUser) { |
145 StartFlowLoginAsManager(); | 145 StartFlowLoginAsManager(); |
146 FillNewUserData(kTestSupervisedUserDisplayName); | 146 FillNewUserData(kTestSupervisedUserDisplayName); |
147 | 147 |
148 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); | 148 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); |
149 EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1); | 149 EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1); |
150 | 150 |
151 JSEval("$('managed-user-creation-next-button').click()"); | 151 JSEval("$('managed-user-creation-next-button').click()"); |
152 | 152 |
153 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); | 153 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); |
154 | 154 |
155 EXPECT_TRUE(registration_utility_stub_->register_was_called()); | 155 EXPECT_TRUE(registration_utility_stub_->register_was_called()); |
156 EXPECT_EQ(registration_utility_stub_->display_name(), | 156 EXPECT_EQ(registration_utility_stub_->display_name(), |
157 base::UTF8ToUTF16(kTestSupervisedUserDisplayName)); | 157 base::UTF8ToUTF16(kTestSupervisedUserDisplayName)); |
158 | 158 |
159 std::string user_id = registration_utility_stub_->managed_user_id(); | 159 std::string user_id = registration_utility_stub_->managed_user_id(); |
160 | 160 |
161 // Make sure user is already in list. | 161 // Make sure user is already in list. |
162 ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size()); | 162 ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size()); |
163 | 163 |
164 // We wait for token now. Press cancel button at this point. | 164 // We wait for token now. Press cancel button at this point. |
165 JSEval("$('cancel-add-user-button').click()"); | 165 JSEval("$('cancel-add-user-button').click()"); |
166 } | 166 } |
167 | 167 |
168 IN_PROC_BROWSER_TEST_( | 168 IN_PROC_BROWSER_TEST_( |
169 SupervisedUserTransactionCleanupTest, | 169 SupervisedUserTransactionCleanupTest, |
170 CreateAndCancelSupervisedUser, | 170 DISABLED_CreateAndCancelSupervisedUser, |
171 SupervisedUserTransactionCleanupTest2, | 171 SupervisedUserTransactionCleanupTest2, |
172 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { | 172 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { |
173 // Make sure there is no supervised user in list. | 173 // Make sure there is no supervised user in list. |
174 ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size()); | 174 ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size()); |
175 } | 175 } |
176 | 176 |
177 } // namespace chromeos | 177 } // namespace chromeos |
OLD | NEW |