Skip to content

GitLab

T
tangled
Commit b47197cc authored by Yukawa@chromium.org's avatar Yukawa@chromium.org
Browse files
Options

Style fix of TSFTextStoreTest 

This CL revises TSFTextStoreTest as follows.
- Initialize variables
- Declare types in anonymous namespace when possible 
- Use DISALLOW_COPY_AND_ASSIGN when appropriate
- Use scoped_refptr when appropriate

There is no behavioral change.

BUG=none
TEST=ran test

Review URL: https://chromiumcodereview.appspot.com/23548030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222249 0039d316-1c4b-4281-b951-d872f2087c98
parent d7c6ccc7
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 81 deletions
ui/base/ime/win/tsf_text_store_unittest.cc
View file @ b47197cc
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "ui/base/ime/win/tsf_text_store.h" #include "ui/base/ime/win/tsf_text_store.h"
#include "base/memory/ref_counted.h"
#include "base/win/scoped_com_initializer.h" #include "base/win/scoped_com_initializer.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
...@@ -15,7 +16,6 @@ using testing::Invoke; ...@@ -15,7 +16,6 @@ using testing::Invoke;
using testing::Return; using testing::Return;
namespace ui { namespace ui {
namespace { namespace {
class MockTextInputClient : public TextInputClient { class MockTextInputClient : public TextInputClient {
...@@ -48,8 +48,7 @@ class MockTextInputClient : public TextInputClient { ...@@ -48,8 +48,7 @@ class MockTextInputClient : public TextInputClient {
class MockStoreACPSink : public ITextStoreACPSink { class MockStoreACPSink : public ITextStoreACPSink {
public: public:
MockStoreACPSink() : ref_count_(0) { MockStoreACPSink() : ref_count_(0) {}
}
// IUnknown // IUnknown
virtual ULONG STDMETHODCALLTYPE AddRef() OVERRIDE { virtual ULONG STDMETHODCALLTYPE AddRef() OVERRIDE {
...@@ -94,36 +93,36 @@ class MockStoreACPSink : public ITextStoreACPSink { ...@@ -94,36 +93,36 @@ class MockStoreACPSink : public ITextStoreACPSink {
HRESULT()); HRESULT());
private: private:
~MockStoreACPSink() { virtual ~MockStoreACPSink() {}
}
volatile LONG ref_count_; volatile LONG ref_count_;
}; };
const HWND kWindowHandle = reinterpret_cast<HWND>(1);
} // namespace } // namespace
class TSFTextStoreTest : public testing::Test { class TSFTextStoreTest : public testing::Test {
protected: protected:
virtual void SetUp() OVERRIDE { virtual void SetUp() OVERRIDE {
text_store_ = new TSFTextStore(); text_store_ = new TSFTextStore();
text_store_->AddRef();
sink_ = new MockStoreACPSink(); sink_ = new MockStoreACPSink();
sink_->AddRef();
EXPECT_EQ(S_OK, text_store_->AdviseSink(IID_ITextStoreACPSink, EXPECT_EQ(S_OK, text_store_->AdviseSink(IID_ITextStoreACPSink,
sink_, TS_AS_ALL_SINKS)); sink_, TS_AS_ALL_SINKS));
text_store_->SetFocusedTextInputClient(0, &text_input_client_); text_store_->SetFocusedTextInputClient(kWindowHandle,
&text_input_client_);
} }
virtual void TearDown() OVERRIDE { virtual void TearDown() OVERRIDE {
EXPECT_EQ(S_OK, text_store_->UnadviseSink(sink_)); EXPECT_EQ(S_OK, text_store_->UnadviseSink(sink_));
sink_->Release(); sink_ = NULL;
text_store_->Release(); text_store_ = NULL;
} }
base::win::ScopedCOMInitializer com_initializer_; base::win::ScopedCOMInitializer com_initializer_;
MockTextInputClient text_input_client_; MockTextInputClient text_input_client_;
TSFTextStore* text_store_; scoped_refptr<TSFTextStore> text_store_;
MockStoreACPSink* sink_; scoped_refptr<MockStoreACPSink> sink_;
}; };
class TSFTextStoreTestCallback { class TSFTextStoreTestCallback {
...@@ -161,8 +160,8 @@ class TSFTextStoreTestCallback { ...@@ -161,8 +160,8 @@ class TSFTextStoreTestCallback {
bool HasReadWriteLock() const { return text_store_->HasReadWriteLock(); } bool HasReadWriteLock() const { return text_store_->HasReadWriteLock(); }
void GetSelectionTest(LONG expected_acp_start, LONG expected_acp_end) { void GetSelectionTest(LONG expected_acp_start, LONG expected_acp_end) {
TS_SELECTION_ACP selection; TS_SELECTION_ACP selection = {};
ULONG fetched; ULONG fetched = 0;
EXPECT_EQ(S_OK, text_store_->GetSelection(0, 1, &selection, &fetched)); EXPECT_EQ(S_OK, text_store_->GetSelection(0, 1, &selection, &fetched));
EXPECT_EQ(1, fetched); EXPECT_EQ(1, fetched);
EXPECT_EQ(expected_acp_start, selection.acpStart); EXPECT_EQ(expected_acp_start, selection.acpStart);
...@@ -170,7 +169,7 @@ class TSFTextStoreTestCallback { ...@@ -170,7 +169,7 @@ class TSFTextStoreTestCallback {
} }
void SetSelectionTest(LONG acp_start, LONG acp_end, HRESULT expected_result) { void SetSelectionTest(LONG acp_start, LONG acp_end, HRESULT expected_result) {
TS_SELECTION_ACP selection; TS_SELECTION_ACP selection = {};
selection.acpStart = acp_start; selection.acpStart = acp_start;
selection.acpEnd = acp_end; selection.acpEnd = acp_end;
selection.style.ase = TS_AE_NONE; selection.style.ase = TS_AE_NONE;
...@@ -183,7 +182,7 @@ class TSFTextStoreTestCallback { ...@@ -183,7 +182,7 @@ class TSFTextStoreTestCallback {
void SetTextTest(LONG acp_start, LONG acp_end, void SetTextTest(LONG acp_start, LONG acp_end,
const string16& text, HRESULT error_code) { const string16& text, HRESULT error_code) {
TS_TEXTCHANGE change; TS_TEXTCHANGE change = {};
ASSERT_EQ(error_code, ASSERT_EQ(error_code,
text_store_->SetText(0, acp_start, acp_end, text_store_->SetText(0, acp_start, acp_end,
text.c_str(), text.size(), &change)); text.c_str(), text.size(), &change));
...@@ -197,11 +196,11 @@ class TSFTextStoreTestCallback { ...@@ -197,11 +196,11 @@ class TSFTextStoreTestCallback {
void GetTextTest(LONG acp_start, LONG acp_end, void GetTextTest(LONG acp_start, LONG acp_end,
const string16& expected_string, const string16& expected_string,
LONG expected_next_acp) { LONG expected_next_acp) {
wchar_t buffer[1024]; wchar_t buffer[1024] = {};
ULONG text_buffer_copied; ULONG text_buffer_copied = 0;
TS_RUNINFO run_info; TS_RUNINFO run_info = {};
ULONG run_info_buffer_copied; ULONG run_info_buffer_copied = 0;
LONG next_acp; LONG next_acp = 0;
ASSERT_EQ(S_OK, ASSERT_EQ(S_OK,
text_store_->GetText(acp_start, acp_end, buffer, 1024, text_store_->GetText(acp_start, acp_end, buffer, 1024,
&text_buffer_copied, &text_buffer_copied,
...@@ -216,11 +215,11 @@ class TSFTextStoreTestCallback { ...@@ -216,11 +215,11 @@ class TSFTextStoreTestCallback {
} }
void GetTextErrorTest(LONG acp_start, LONG acp_end, HRESULT error_code) { void GetTextErrorTest(LONG acp_start, LONG acp_end, HRESULT error_code) {
wchar_t buffer[1024]; wchar_t buffer[1024] = {};
ULONG text_buffer_copied; ULONG text_buffer_copied = 0;
TS_RUNINFO run_info; TS_RUNINFO run_info = {};
ULONG run_info_buffer_copied; ULONG run_info_buffer_copied = 0;
LONG next_acp; LONG next_acp = 0;
EXPECT_EQ(error_code, EXPECT_EQ(error_code,
text_store_->GetText(acp_start, acp_end, buffer, 1024, text_store_->GetText(acp_start, acp_end, buffer, 1024,
&text_buffer_copied, &text_buffer_copied,
...@@ -233,8 +232,9 @@ class TSFTextStoreTestCallback { ...@@ -233,8 +232,9 @@ class TSFTextStoreTestCallback {
LONG expected_change_start, LONG expected_change_start,
LONG expected_change_old_end, LONG expected_change_old_end,
LONG expected_change_new_end) { LONG expected_change_new_end) {
LONG start, end; LONG start = 0;
TS_TEXTCHANGE change; LONG end = 0;
TS_TEXTCHANGE change = {};
EXPECT_EQ(S_OK, EXPECT_EQ(S_OK,
text_store_->InsertTextAtSelection(0, buffer, buffer_size, text_store_->InsertTextAtSelection(0, buffer, buffer_size,
&start, &end, &change)); &start, &end, &change));
...@@ -249,7 +249,8 @@ class TSFTextStoreTestCallback { ...@@ -249,7 +249,8 @@ class TSFTextStoreTestCallback {
ULONG buffer_size, ULONG buffer_size,
LONG expected_start, LONG expected_start,
LONG expected_end) { LONG expected_end) {
LONG start, end; LONG start = 0;
LONG end = 0;
EXPECT_EQ(S_OK, EXPECT_EQ(S_OK,
text_store_->InsertTextAtSelection(TS_IAS_QUERYONLY, buffer, text_store_->InsertTextAtSelection(TS_IAS_QUERYONLY, buffer,
buffer_size, &start, &end, buffer_size, &start, &end,
...@@ -261,8 +262,8 @@ class TSFTextStoreTestCallback { ...@@ -261,8 +262,8 @@ class TSFTextStoreTestCallback {
void GetTextExtTest(TsViewCookie view_cookie, LONG acp_start, LONG acp_end, void GetTextExtTest(TsViewCookie view_cookie, LONG acp_start, LONG acp_end,
LONG expected_left, LONG expected_top, LONG expected_left, LONG expected_top,
LONG expected_right, LONG expected_bottom) { LONG expected_right, LONG expected_bottom) {
RECT rect; RECT rect = {};
BOOL clipped; BOOL clipped = FALSE;
EXPECT_EQ(S_OK, text_store_->GetTextExt(view_cookie, acp_start, acp_end, EXPECT_EQ(S_OK, text_store_->GetTextExt(view_cookie, acp_start, acp_end,
&rect, &clipped)); &rect, &clipped));
EXPECT_EQ(expected_left, rect.left); EXPECT_EQ(expected_left, rect.left);
...@@ -274,29 +275,34 @@ class TSFTextStoreTestCallback { ...@@ -274,29 +275,34 @@ class TSFTextStoreTestCallback {
void GetTextExtNoLayoutTest(TsViewCookie view_cookie, LONG acp_start, void GetTextExtNoLayoutTest(TsViewCookie view_cookie, LONG acp_start,
LONG acp_end) { LONG acp_end) {
RECT rect; RECT rect = {};
BOOL clipped; BOOL clipped = FALSE;
EXPECT_EQ(TS_E_NOLAYOUT, EXPECT_EQ(TS_E_NOLAYOUT,
text_store_->GetTextExt(view_cookie, acp_start, acp_end, text_store_->GetTextExt(view_cookie, acp_start, acp_end,
&rect, &clipped)); &rect, &clipped));
} }
TSFTextStore* text_store_; scoped_refptr<TSFTextStore> text_store_;
private:
DISALLOW_COPY_AND_ASSIGN(TSFTextStoreTestCallback);
}; };
namespace {
const HRESULT kInvalidResult = 0x12345678;
TEST_F(TSFTextStoreTest, GetStatusTest) { TEST_F(TSFTextStoreTest, GetStatusTest) {
TS_STATUS status; TS_STATUS status = {};
EXPECT_EQ(S_OK, text_store_->GetStatus(&status)); EXPECT_EQ(S_OK, text_store_->GetStatus(&status));
EXPECT_EQ(0, status.dwDynamicFlags); EXPECT_EQ(0, status.dwDynamicFlags);
EXPECT_EQ(TS_SS_TRANSITORY | TS_SS_NOHIDDENTEXT, status.dwStaticFlags); EXPECT_EQ(TS_SS_TRANSITORY | TS_SS_NOHIDDENTEXT, status.dwStaticFlags);
} }
class SyncRequestLockTestCallback : public TSFTextStoreTestCallback { class SyncRequestLockTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit SyncRequestLockTestCallback(TSFTextStore* text_store) explicit SyncRequestLockTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store) { : TSFTextStoreTestCallback(text_store) {}
}
HRESULT LockGranted1(DWORD flags) { HRESULT LockGranted1(DWORD flags) {
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
...@@ -313,7 +319,7 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -313,7 +319,7 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback {
HRESULT LockGranted3(DWORD flags) { HRESULT LockGranted3(DWORD flags) {
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_FALSE(HasReadWriteLock()); EXPECT_FALSE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result));
EXPECT_EQ(TS_E_SYNCHRONOUS, result); EXPECT_EQ(TS_E_SYNCHRONOUS, result);
return S_OK; return S_OK;
...@@ -322,7 +328,7 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -322,7 +328,7 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback {
HRESULT LockGranted4(DWORD flags) { HRESULT LockGranted4(DWORD flags) {
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_FALSE(HasReadWriteLock()); EXPECT_FALSE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, EXPECT_EQ(S_OK,
text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result)); text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result));
EXPECT_EQ(TS_E_SYNCHRONOUS, result); EXPECT_EQ(TS_E_SYNCHRONOUS, result);
...@@ -332,7 +338,7 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -332,7 +338,7 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback {
HRESULT LockGranted5(DWORD flags) { HRESULT LockGranted5(DWORD flags) {
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_TRUE(HasReadWriteLock()); EXPECT_TRUE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result));
EXPECT_EQ(TS_E_SYNCHRONOUS, result); EXPECT_EQ(TS_E_SYNCHRONOUS, result);
return S_OK; return S_OK;
...@@ -341,12 +347,15 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -341,12 +347,15 @@ class SyncRequestLockTestCallback : public TSFTextStoreTestCallback {
HRESULT LockGranted6(DWORD flags) { HRESULT LockGranted6(DWORD flags) {
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_TRUE(HasReadWriteLock()); EXPECT_TRUE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, EXPECT_EQ(S_OK,
text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result)); text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result));
EXPECT_EQ(TS_E_SYNCHRONOUS, result); EXPECT_EQ(TS_E_SYNCHRONOUS, result);
return S_OK; return S_OK;
} }
private:
DISALLOW_COPY_AND_ASSIGN(SyncRequestLockTestCallback);
}; };
TEST_F(TSFTextStoreTest, SynchronousRequestLockTest) { TEST_F(TSFTextStoreTest, SynchronousRequestLockTest) {
...@@ -359,21 +368,25 @@ TEST_F(TSFTextStoreTest, SynchronousRequestLockTest) { ...@@ -359,21 +368,25 @@ TEST_F(TSFTextStoreTest, SynchronousRequestLockTest) {
.WillOnce(Invoke(&callback, &SyncRequestLockTestCallback::LockGranted5)) .WillOnce(Invoke(&callback, &SyncRequestLockTestCallback::LockGranted5))
.WillOnce(Invoke(&callback, &SyncRequestLockTestCallback::LockGranted6)); .WillOnce(Invoke(&callback, &SyncRequestLockTestCallback::LockGranted6));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
result = kInvalidResult;
EXPECT_EQ(S_OK, EXPECT_EQ(S_OK,
text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result)); text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ | TS_LF_SYNC, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
result = kInvalidResult;
EXPECT_EQ(S_OK, EXPECT_EQ(S_OK,
text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result)); text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
result = kInvalidResult;
EXPECT_EQ(S_OK, EXPECT_EQ(S_OK,
text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result)); text_store_->RequestLock(TS_LF_READWRITE | TS_LF_SYNC, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
...@@ -383,15 +396,14 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -383,15 +396,14 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit AsyncRequestLockTestCallback(TSFTextStore* text_store) explicit AsyncRequestLockTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store), : TSFTextStoreTestCallback(text_store),
state_(0) { state_(0) {}
}
HRESULT LockGranted1(DWORD flags) { HRESULT LockGranted1(DWORD flags) {
EXPECT_EQ(0, state_); EXPECT_EQ(0, state_);
state_ = 1; state_ = 1;
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_FALSE(HasReadWriteLock()); EXPECT_FALSE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
EXPECT_EQ(TS_S_ASYNC, result); EXPECT_EQ(TS_S_ASYNC, result);
EXPECT_EQ(1, state_); EXPECT_EQ(1, state_);
...@@ -403,7 +415,7 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -403,7 +415,7 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback {
EXPECT_EQ(2, state_); EXPECT_EQ(2, state_);
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_FALSE(HasReadWriteLock()); EXPECT_FALSE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(TS_S_ASYNC, result); EXPECT_EQ(TS_S_ASYNC, result);
EXPECT_EQ(2, state_); EXPECT_EQ(2, state_);
...@@ -415,7 +427,7 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -415,7 +427,7 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback {
EXPECT_EQ(3, state_); EXPECT_EQ(3, state_);
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_TRUE(HasReadWriteLock()); EXPECT_TRUE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(TS_S_ASYNC, result); EXPECT_EQ(TS_S_ASYNC, result);
EXPECT_EQ(3, state_); EXPECT_EQ(3, state_);
...@@ -427,7 +439,7 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -427,7 +439,7 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback {
EXPECT_EQ(4, state_); EXPECT_EQ(4, state_);
EXPECT_TRUE(HasReadLock()); EXPECT_TRUE(HasReadLock());
EXPECT_TRUE(HasReadWriteLock()); EXPECT_TRUE(HasReadWriteLock());
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
EXPECT_EQ(TS_S_ASYNC, result); EXPECT_EQ(TS_S_ASYNC, result);
EXPECT_EQ(4, state_); EXPECT_EQ(4, state_);
...@@ -445,6 +457,8 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback { ...@@ -445,6 +457,8 @@ class AsyncRequestLockTestCallback : public TSFTextStoreTestCallback {
private: private:
int state_; int state_;
DISALLOW_COPY_AND_ASSIGN(AsyncRequestLockTestCallback);
}; };
TEST_F(TSFTextStoreTest, AsynchronousRequestLockTest) { TEST_F(TSFTextStoreTest, AsynchronousRequestLockTest) {
...@@ -456,7 +470,7 @@ TEST_F(TSFTextStoreTest, AsynchronousRequestLockTest) { ...@@ -456,7 +470,7 @@ TEST_F(TSFTextStoreTest, AsynchronousRequestLockTest) {
.WillOnce(Invoke(&callback, &AsyncRequestLockTestCallback::LockGranted4)) .WillOnce(Invoke(&callback, &AsyncRequestLockTestCallback::LockGranted4))
.WillOnce(Invoke(&callback, &AsyncRequestLockTestCallback::LockGranted5)); .WillOnce(Invoke(&callback, &AsyncRequestLockTestCallback::LockGranted5));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
} }
...@@ -465,8 +479,7 @@ class RequestLockTextChangeTestCallback : public TSFTextStoreTestCallback { ...@@ -465,8 +479,7 @@ class RequestLockTextChangeTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit RequestLockTextChangeTestCallback(TSFTextStore* text_store) explicit RequestLockTextChangeTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store), : TSFTextStoreTestCallback(text_store),
state_(0) { state_(0) {}
}
HRESULT LockGranted1(DWORD flags) { HRESULT LockGranted1(DWORD flags) {
EXPECT_EQ(0, state_); EXPECT_EQ(0, state_);
...@@ -499,7 +512,7 @@ class RequestLockTextChangeTestCallback : public TSFTextStoreTestCallback { ...@@ -499,7 +512,7 @@ class RequestLockTextChangeTestCallback : public TSFTextStoreTestCallback {
HRESULT OnTextChange(DWORD flags, const TS_TEXTCHANGE* change) { HRESULT OnTextChange(DWORD flags, const TS_TEXTCHANGE* change) {
EXPECT_EQ(4, state_); EXPECT_EQ(4, state_);
HRESULT result; HRESULT result = kInvalidResult;
state_ = 5; state_ = 5;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
...@@ -518,6 +531,8 @@ class RequestLockTextChangeTestCallback : public TSFTextStoreTestCallback { ...@@ -518,6 +531,8 @@ class RequestLockTextChangeTestCallback : public TSFTextStoreTestCallback {
private: private:
int state_; int state_;
DISALLOW_COPY_AND_ASSIGN(RequestLockTextChangeTestCallback);
}; };
TEST_F(TSFTextStoreTest, RequestLockOnTextChangeTest) { TEST_F(TSFTextStoreTest, RequestLockOnTextChangeTest) {
...@@ -542,7 +557,7 @@ TEST_F(TSFTextStoreTest, RequestLockOnTextChangeTest) { ...@@ -542,7 +557,7 @@ TEST_F(TSFTextStoreTest, RequestLockOnTextChangeTest) {
.WillOnce(Invoke(&callback, .WillOnce(Invoke(&callback,
&RequestLockTextChangeTestCallback::SetCompositionText)); &RequestLockTextChangeTestCallback::SetCompositionText));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(S_OK, result); EXPECT_EQ(S_OK, result);
} }
...@@ -550,8 +565,7 @@ TEST_F(TSFTextStoreTest, RequestLockOnTextChangeTest) { ...@@ -550,8 +565,7 @@ TEST_F(TSFTextStoreTest, RequestLockOnTextChangeTest) {
class SelectionTestCallback : public TSFTextStoreTestCallback { class SelectionTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit SelectionTestCallback(TSFTextStore* text_store) explicit SelectionTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store) { : TSFTextStoreTestCallback(text_store) {}
}
HRESULT ReadLockGranted(DWORD flags) { HRESULT ReadLockGranted(DWORD flags) {
SetInternalState(L"", 0, 0, 0); SetInternalState(L"", 0, 0, 0);
...@@ -631,23 +645,21 @@ TEST_F(TSFTextStoreTest, SetGetSelectionTest) { ...@@ -631,23 +645,21 @@ TEST_F(TSFTextStoreTest, SetGetSelectionTest) {
.WillOnce(Invoke(&callback, .WillOnce(Invoke(&callback,
&SelectionTestCallback::ReadWriteLockGranted)); &SelectionTestCallback::ReadWriteLockGranted));
TS_SELECTION_ACP selection_buffer; TS_SELECTION_ACP selection_buffer = {};
ULONG fetched_count; ULONG fetched_count = 0;
EXPECT_EQ(TS_E_NOLOCK, EXPECT_EQ(TS_E_NOLOCK,
text_store_->GetSelection(0, 1, &selection_buffer, text_store_->GetSelection(0, 1, &selection_buffer,
&fetched_count)); &fetched_count));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
} }
class SetGetTextTestCallback : public TSFTextStoreTestCallback { class SetGetTextTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit SetGetTextTestCallback(TSFTextStore* text_store) explicit SetGetTextTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store) { : TSFTextStoreTestCallback(text_store) {}
}
HRESULT ReadLockGranted(DWORD flags) { HRESULT ReadLockGranted(DWORD flags) {
SetTextTest(0, 0, L"", TF_E_NOLOCK); SetTextTest(0, 0, L"", TF_E_NOLOCK);
...@@ -820,6 +832,9 @@ class SetGetTextTestCallback : public TSFTextStoreTestCallback { ...@@ -820,6 +832,9 @@ class SetGetTextTestCallback : public TSFTextStoreTestCallback {
return S_OK; return S_OK;
} }
private:
DISALLOW_COPY_AND_ASSIGN(SetGetTextTestCallback);
}; };
TEST_F(TSFTextStoreTest, SetGetTextTest) { TEST_F(TSFTextStoreTest, SetGetTextTest) {
...@@ -829,19 +844,19 @@ TEST_F(TSFTextStoreTest, SetGetTextTest) { ...@@ -829,19 +844,19 @@ TEST_F(TSFTextStoreTest, SetGetTextTest) {
.WillOnce(Invoke(&callback, .WillOnce(Invoke(&callback,
&SetGetTextTestCallback::ReadWriteLockGranted)); &SetGetTextTestCallback::ReadWriteLockGranted));
wchar_t buffer[1024]; wchar_t buffer[1024] = {};
ULONG text_buffer_copied; ULONG text_buffer_copied = 0;
TS_RUNINFO run_info; TS_RUNINFO run_info = {};
ULONG run_info_buffer_copied; ULONG run_info_buffer_copied = 0;
LONG next_acp; LONG next_acp = 0;
EXPECT_EQ(TF_E_NOLOCK, EXPECT_EQ(TF_E_NOLOCK,
text_store_->GetText(0, -1, buffer, 1024, &text_buffer_copied, text_store_->GetText(0, -1, buffer, 1024, &text_buffer_copied,
&run_info, 1, &run_info_buffer_copied, &run_info, 1, &run_info_buffer_copied,
&next_acp)); &next_acp));
TS_TEXTCHANGE change; TS_TEXTCHANGE change = {};
EXPECT_EQ(TF_E_NOLOCK, text_store_->SetText(0, 0, 0, L"abc", 3, &change)); EXPECT_EQ(TF_E_NOLOCK, text_store_->SetText(0, 0, 0, L"abc", 3, &change));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
} }
...@@ -849,8 +864,7 @@ TEST_F(TSFTextStoreTest, SetGetTextTest) { ...@@ -849,8 +864,7 @@ TEST_F(TSFTextStoreTest, SetGetTextTest) {
class InsertTextAtSelectionTestCallback : public TSFTextStoreTestCallback { class InsertTextAtSelectionTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit InsertTextAtSelectionTestCallback(TSFTextStore* text_store) explicit InsertTextAtSelectionTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store) { : TSFTextStoreTestCallback(text_store) {}
}
HRESULT ReadLockGranted(DWORD flags) { HRESULT ReadLockGranted(DWORD flags) {
const wchar_t kBuffer[] = L"0123456789"; const wchar_t kBuffer[] = L"0123456789";
...@@ -865,8 +879,9 @@ class InsertTextAtSelectionTestCallback : public TSFTextStoreTestCallback { ...@@ -865,8 +879,9 @@ class InsertTextAtSelectionTestCallback : public TSFTextStoreTestCallback {
GetSelectionTest(2, 5); GetSelectionTest(2, 5);
InsertTextAtSelectionQueryOnlyTest(kBuffer, 0, 2, 5); InsertTextAtSelectionQueryOnlyTest(kBuffer, 0, 2, 5);
LONG start, end; LONG start = 0;
TS_TEXTCHANGE change; LONG end = 0;
TS_TEXTCHANGE change = {};
EXPECT_EQ(TS_E_NOLOCK, EXPECT_EQ(TS_E_NOLOCK,
text_store_->InsertTextAtSelection(0, kBuffer, 10, text_store_->InsertTextAtSelection(0, kBuffer, 10,
&start, &end, &change)); &start, &end, &change));
...@@ -908,6 +923,9 @@ class InsertTextAtSelectionTestCallback : public TSFTextStoreTestCallback { ...@@ -908,6 +923,9 @@ class InsertTextAtSelectionTestCallback : public TSFTextStoreTestCallback {
return S_OK; return S_OK;
} }
private:
DISALLOW_COPY_AND_ASSIGN(InsertTextAtSelectionTestCallback);
}; };
TEST_F(TSFTextStoreTest, InsertTextAtSelectionTest) { TEST_F(TSFTextStoreTest, InsertTextAtSelectionTest) {
...@@ -919,16 +937,18 @@ TEST_F(TSFTextStoreTest, InsertTextAtSelectionTest) { ...@@ -919,16 +937,18 @@ TEST_F(TSFTextStoreTest, InsertTextAtSelectionTest) {
Invoke(&callback, Invoke(&callback,
&InsertTextAtSelectionTestCallback::ReadWriteLockGranted)); &InsertTextAtSelectionTestCallback::ReadWriteLockGranted));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
EXPECT_EQ(S_OK, result);
result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(S_OK, result);
} }
class ScenarioTestCallback : public TSFTextStoreTestCallback { class ScenarioTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit ScenarioTestCallback(TSFTextStore* text_store) explicit ScenarioTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store) { : TSFTextStoreTestCallback(text_store) {}
}
HRESULT LockGranted1(DWORD flags) { HRESULT LockGranted1(DWORD flags) {
SetSelectionTest(0, 0, S_OK); SetSelectionTest(0, 0, S_OK);
...@@ -1023,6 +1043,9 @@ class ScenarioTestCallback : public TSFTextStoreTestCallback { ...@@ -1023,6 +1043,9 @@ class ScenarioTestCallback : public TSFTextStoreTestCallback {
EXPECT_EQ(0, composition.selection.end()); EXPECT_EQ(0, composition.selection.end());
EXPECT_EQ(0, composition.underlines.size()); EXPECT_EQ(0, composition.underlines.size());
} }
private:
DISALLOW_COPY_AND_ASSIGN(ScenarioTestCallback);
}; };
TEST_F(TSFTextStoreTest, ScenarioTest) { TEST_F(TSFTextStoreTest, ScenarioTest) {
...@@ -1053,24 +1076,28 @@ TEST_F(TSFTextStoreTest, ScenarioTest) { ...@@ -1053,24 +1076,28 @@ TEST_F(TSFTextStoreTest, ScenarioTest) {
EXPECT_CALL(*sink_, OnTextChange(_, _)) EXPECT_CALL(*sink_, OnTextChange(_, _))
.WillOnce(Return(S_OK)); .WillOnce(Return(S_OK));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(S_OK, result);
result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(S_OK, result);
result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READWRITE, &result));
EXPECT_EQ(S_OK, result);
} }
class GetTextExtTestCallback : public TSFTextStoreTestCallback { class GetTextExtTestCallback : public TSFTextStoreTestCallback {
public: public:
explicit GetTextExtTestCallback(TSFTextStore* text_store) explicit GetTextExtTestCallback(TSFTextStore* text_store)
: TSFTextStoreTestCallback(text_store), : TSFTextStoreTestCallback(text_store),
layout_prepared_character_num_(0) { layout_prepared_character_num_(0) {}
}
HRESULT LockGranted(DWORD flags) { HRESULT LockGranted(DWORD flags) {
SetInternalState(L"0123456789012", 0, 0, 0); SetInternalState(L"0123456789012", 0, 0, 0);
layout_prepared_character_num_ = 13; layout_prepared_character_num_ = 13;
TsViewCookie view_cookie; TsViewCookie view_cookie = 0;
EXPECT_EQ(S_OK, text_store_->GetActiveView(&view_cookie)); EXPECT_EQ(S_OK, text_store_->GetActiveView(&view_cookie));
GetTextExtTest(view_cookie, 0, 0, 11, 12, 11, 20); GetTextExtTest(view_cookie, 0, 0, 11, 12, 11, 20);
GetTextExtTest(view_cookie, 0, 1, 11, 12, 20, 20); GetTextExtTest(view_cookie, 0, 1, 11, 12, 20, 20);
...@@ -1125,6 +1152,8 @@ class GetTextExtTestCallback : public TSFTextStoreTestCallback { ...@@ -1125,6 +1152,8 @@ class GetTextExtTestCallback : public TSFTextStoreTestCallback {
private: private:
uint32 layout_prepared_character_num_; uint32 layout_prepared_character_num_;
DISALLOW_COPY_AND_ASSIGN(GetTextExtTestCallback);
}; };
TEST_F(TSFTextStoreTest, GetTextExtTest) { TEST_F(TSFTextStoreTest, GetTextExtTest) {
...@@ -1141,8 +1170,10 @@ TEST_F(TSFTextStoreTest, GetTextExtTest) { ...@@ -1141,8 +1170,10 @@ TEST_F(TSFTextStoreTest, GetTextExtTest) {
EXPECT_CALL(*sink_, OnLockGranted(_)) EXPECT_CALL(*sink_, OnLockGranted(_))
.WillOnce(Invoke(&callback, &GetTextExtTestCallback::LockGranted)); .WillOnce(Invoke(&callback, &GetTextExtTestCallback::LockGranted));
HRESULT result; HRESULT result = kInvalidResult;
EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result)); EXPECT_EQ(S_OK, text_store_->RequestLock(TS_LF_READ, &result));
EXPECT_EQ(S_OK, result);
} }
} // namespace
} // namespace ui } // namespace ui
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment