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

Side by Side Diff: ui/base/ime/win/tsf_text_store_unittest.cc

Issue 54173007: Change the behavior of TSFTextStore::QueryInsert() to support partial commit with Metro MS-IME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « ui/base/ime/win/tsf_text_store.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/base/ime/win/tsf_text_store.h" 5 #include "ui/base/ime/win/tsf_text_store.h"
6 6
7 #include <initguid.h> // for GUID_NULL and GUID_PROP_INPUTSCOPE 7 #include <initguid.h> // for GUID_NULL and GUID_PROP_INPUTSCOPE
8 #include <InputScope.h> 8 #include <InputScope.h>
9 #include <OleCtl.h> 9 #include <OleCtl.h>
10 10
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 EXPECT_EQ(E_INVALIDARG, 316 EXPECT_EQ(E_INVALIDARG,
317 text_store_->QueryInsert(0, 0, 0, NULL, &result_end)); 317 text_store_->QueryInsert(0, 0, 0, NULL, &result_end));
318 EXPECT_EQ(E_INVALIDARG, 318 EXPECT_EQ(E_INVALIDARG,
319 text_store_->QueryInsert(0, 0, 0, &result_start, NULL)); 319 text_store_->QueryInsert(0, 0, 0, &result_start, NULL));
320 EXPECT_EQ(S_OK, 320 EXPECT_EQ(S_OK,
321 text_store_->QueryInsert(0, 0, 0, &result_start, &result_end)); 321 text_store_->QueryInsert(0, 0, 0, &result_start, &result_end));
322 EXPECT_EQ(0, result_start); 322 EXPECT_EQ(0, result_start);
323 EXPECT_EQ(0, result_end); 323 EXPECT_EQ(0, result_end);
324 *string_buffer() = L"1234"; 324 *string_buffer() = L"1234";
325 *committed_size() = 1; 325 *committed_size() = 1;
326 EXPECT_EQ(E_INVALIDARG, 326 EXPECT_EQ(S_OK,
327 text_store_->QueryInsert(0, 1, 0, &result_start, &result_end)); 327 text_store_->QueryInsert(0, 1, 0, &result_start, &result_end));
328 EXPECT_EQ(1, result_start);
329 EXPECT_EQ(1, result_end);
328 EXPECT_EQ(E_INVALIDARG, 330 EXPECT_EQ(E_INVALIDARG,
329 text_store_->QueryInsert(1, 0, 0, &result_start, &result_end)); 331 text_store_->QueryInsert(1, 0, 0, &result_start, &result_end));
330 EXPECT_EQ(S_OK, 332 EXPECT_EQ(S_OK,
331 text_store_->QueryInsert(2, 2, 0, &result_start, &result_end)); 333 text_store_->QueryInsert(2, 2, 0, &result_start, &result_end));
332 EXPECT_EQ(2, result_start); 334 EXPECT_EQ(2, result_start);
333 EXPECT_EQ(2, result_end); 335 EXPECT_EQ(2, result_end);
334 EXPECT_EQ(S_OK, 336 EXPECT_EQ(S_OK,
335 text_store_->QueryInsert(2, 3, 0, &result_start, &result_end)); 337 text_store_->QueryInsert(2, 3, 0, &result_start, &result_end));
336 EXPECT_EQ(2, result_start); 338 EXPECT_EQ(2, result_start);
337 EXPECT_EQ(3, result_end); 339 EXPECT_EQ(3, result_end);
338 EXPECT_EQ(E_INVALIDARG, 340 EXPECT_EQ(E_INVALIDARG,
339 text_store_->QueryInsert(3, 2, 0, &result_start, &result_end)); 341 text_store_->QueryInsert(3, 2, 0, &result_start, &result_end));
340 EXPECT_EQ(S_OK, 342 EXPECT_EQ(S_OK,
341 text_store_->QueryInsert(3, 4, 0, &result_start, &result_end)); 343 text_store_->QueryInsert(3, 4, 0, &result_start, &result_end));
342 EXPECT_EQ(3, result_start); 344 EXPECT_EQ(3, result_start);
343 EXPECT_EQ(4, result_end); 345 EXPECT_EQ(4, result_end);
344 EXPECT_EQ(E_INVALIDARG, 346 EXPECT_EQ(S_OK,
345 text_store_->QueryInsert(3, 5, 0, &result_start, &result_end)); 347 text_store_->QueryInsert(3, 5, 0, &result_start, &result_end));
348 EXPECT_EQ(3, result_start);
349 EXPECT_EQ(4, result_end);
346 } 350 }
347 351
348 class SyncRequestLockTestCallback : public TSFTextStoreTestCallback { 352 class SyncRequestLockTestCallback : public TSFTextStoreTestCallback {
349 public: 353 public:
350 explicit SyncRequestLockTestCallback(TSFTextStore* text_store) 354 explicit SyncRequestLockTestCallback(TSFTextStore* text_store)
351 : TSFTextStoreTestCallback(text_store) {} 355 : TSFTextStoreTestCallback(text_store) {}
352 356
353 HRESULT LockGranted1(DWORD flags) { 357 HRESULT LockGranted1(DWORD flags) {
354 EXPECT_TRUE(HasReadLock()); 358 EXPECT_TRUE(HasReadLock());
355 EXPECT_FALSE(HasReadWriteLock()); 359 EXPECT_FALSE(HasReadWriteLock());
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
1286 text_store_->SetFocusedTextInputClient(NULL, NULL); 1290 text_store_->SetFocusedTextInputClient(NULL, NULL);
1287 num_copied = 0xfffffff; 1291 num_copied = 0xfffffff;
1288 TS_ATTRVAL buffer[2] = {}; 1292 TS_ATTRVAL buffer[2] = {};
1289 EXPECT_HRESULT_FAILED(text_store_->RetrieveRequestedAttrs( 1293 EXPECT_HRESULT_FAILED(text_store_->RetrieveRequestedAttrs(
1290 arraysize(buffer), buffer, &num_copied)); 1294 arraysize(buffer), buffer, &num_copied));
1291 } 1295 }
1292 } 1296 }
1293 1297
1294 } // namespace 1298 } // namespace
1295 } // namespace ui 1299 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/ime/win/tsf_text_store.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698