diff options
Diffstat (limited to 'chromium/base/win/scoped_comptr_unittest.cc')
| -rw-r--r-- | chromium/base/win/scoped_comptr_unittest.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/chromium/base/win/scoped_comptr_unittest.cc b/chromium/base/win/scoped_comptr_unittest.cc index d8d12be87df..d38752dfb9f 100644 --- a/chromium/base/win/scoped_comptr_unittest.cc +++ b/chromium/base/win/scoped_comptr_unittest.cc @@ -31,8 +31,8 @@ const IID dummy_iid = { 0x12345678u, 0x1234u, 0x5678u, 01, 23, 45, 67, 89, } // namespace TEST(ScopedComPtrTest, ScopedComPtr) { - EXPECT_TRUE(memcmp(&ScopedComPtr<IUnknown>::iid(), &IID_IUnknown, - sizeof(IID)) == 0); + EXPECT_EQ(memcmp(&ScopedComPtr<IUnknown>::iid(), &IID_IUnknown, sizeof(IID)), + 0); base::win::ScopedCOMInitializer com_initializer; EXPECT_TRUE(com_initializer.succeeded()); @@ -41,8 +41,8 @@ TEST(ScopedComPtrTest, ScopedComPtr) { EXPECT_TRUE(SUCCEEDED(unk.CreateInstance(CLSID_ShellLink))); ScopedComPtr<IUnknown> unk2; unk2.Attach(unk.Detach()); - EXPECT_TRUE(unk == NULL); - EXPECT_TRUE(unk2 != NULL); + EXPECT_TRUE(unk.get() == NULL); + EXPECT_TRUE(unk2.get() != NULL); ScopedComPtr<IMalloc> mem_alloc; EXPECT_TRUE(SUCCEEDED(CoGetMalloc(1, mem_alloc.Receive()))); @@ -55,26 +55,26 @@ TEST(ScopedComPtrTest, ScopedComPtr) { // test ScopedComPtr& constructor ScopedComPtr<IMalloc> copy1(mem_alloc); - EXPECT_TRUE(copy1.IsSameObject(mem_alloc)); - EXPECT_FALSE(copy1.IsSameObject(unk2)); // unk2 is valid but different - EXPECT_FALSE(copy1.IsSameObject(unk)); // unk is NULL + EXPECT_TRUE(copy1.IsSameObject(mem_alloc.get())); + EXPECT_FALSE(copy1.IsSameObject(unk2.get())); // unk2 is valid but different + EXPECT_FALSE(copy1.IsSameObject(unk.get())); // unk is NULL IMalloc* naked_copy = copy1.Detach(); copy1 = naked_copy; // Test the =(T*) operator. naked_copy->Release(); copy1.Release(); - EXPECT_FALSE(copy1.IsSameObject(unk2)); // unk2 is valid, copy1 is not + EXPECT_FALSE(copy1.IsSameObject(unk2.get())); // unk2 is valid, copy1 is not // test Interface* constructor - ScopedComPtr<IMalloc> copy2(static_cast<IMalloc*>(mem_alloc)); - EXPECT_TRUE(copy2.IsSameObject(mem_alloc)); + ScopedComPtr<IMalloc> copy2(static_cast<IMalloc*>(mem_alloc.get())); + EXPECT_TRUE(copy2.IsSameObject(mem_alloc.get())); - EXPECT_TRUE(SUCCEEDED(unk.QueryFrom(mem_alloc))); - EXPECT_TRUE(unk != NULL); + EXPECT_TRUE(SUCCEEDED(unk.QueryFrom(mem_alloc.get()))); + EXPECT_TRUE(unk.get() != NULL); unk.Release(); - EXPECT_TRUE(unk == NULL); - EXPECT_TRUE(unk.IsSameObject(copy1)); // both are NULL + EXPECT_TRUE(unk.get() == NULL); + EXPECT_TRUE(unk.IsSameObject(copy1.get())); // both are NULL } TEST(ScopedComPtrTest, ScopedComPtrVector) { @@ -98,7 +98,7 @@ TEST(ScopedComPtrTest, ScopedComPtrVector) { bleh.push_back(p2); EXPECT_EQ(p->adds, 4); EXPECT_EQ(p->releases, 1); - EXPECT_EQ(bleh[0], p.get()); + EXPECT_EQ(bleh[0].get(), p.get()); bleh.pop_back(); EXPECT_EQ(p->adds, 4); EXPECT_EQ(p->releases, 2); |