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

Side by Side Diff: webrtc/base/win32window_unittest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 months 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 | « webrtc/base/win32window.cc ('k') | webrtc/base/winping.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 21 matching lines...) Expand all
32 destroyed_ = true; 32 destroyed_ = true;
33 } 33 }
34 34
35 private: 35 private:
36 MSG msg_; 36 MSG msg_;
37 bool destroyed_; 37 bool destroyed_;
38 }; 38 };
39 39
40 TEST(Win32WindowTest, Basics) { 40 TEST(Win32WindowTest, Basics) {
41 TestWindow wnd; 41 TestWindow wnd;
42 EXPECT_TRUE(wnd.handle() == NULL); 42 EXPECT_TRUE(wnd.handle() == nullptr);
43 EXPECT_FALSE(wnd.destroyed()); 43 EXPECT_FALSE(wnd.destroyed());
44 EXPECT_TRUE(wnd.Create(0, L"Test", 0, 0, 0, 0, 100, 100)); 44 EXPECT_TRUE(wnd.Create(0, L"Test", 0, 0, 0, 0, 100, 100));
45 EXPECT_TRUE(wnd.handle() != NULL); 45 EXPECT_TRUE(wnd.handle() != nullptr);
46 EXPECT_EQ(kDummyResult, ::SendMessage(wnd.handle(), WM_USER, 1, 2)); 46 EXPECT_EQ(kDummyResult, ::SendMessage(wnd.handle(), WM_USER, 1, 2));
47 EXPECT_EQ(static_cast<UINT>(WM_USER), wnd.msg().message); 47 EXPECT_EQ(static_cast<UINT>(WM_USER), wnd.msg().message);
48 EXPECT_EQ(1u, wnd.msg().wParam); 48 EXPECT_EQ(1u, wnd.msg().wParam);
49 EXPECT_EQ(2l, wnd.msg().lParam); 49 EXPECT_EQ(2l, wnd.msg().lParam);
50 wnd.Destroy(); 50 wnd.Destroy();
51 EXPECT_TRUE(wnd.handle() == NULL); 51 EXPECT_TRUE(wnd.handle() == nullptr);
52 EXPECT_TRUE(wnd.destroyed()); 52 EXPECT_TRUE(wnd.destroyed());
53 } 53 }
54 54
55 TEST(Win32WindowTest, MultipleWindows) { 55 TEST(Win32WindowTest, MultipleWindows) {
56 TestWindow wnd1, wnd2; 56 TestWindow wnd1, wnd2;
57 EXPECT_TRUE(wnd1.Create(0, L"Test", 0, 0, 0, 0, 100, 100)); 57 EXPECT_TRUE(wnd1.Create(0, L"Test", 0, 0, 0, 0, 100, 100));
58 EXPECT_TRUE(wnd2.Create(0, L"Test", 0, 0, 0, 0, 100, 100)); 58 EXPECT_TRUE(wnd2.Create(0, L"Test", 0, 0, 0, 0, 100, 100));
59 EXPECT_TRUE(wnd1.handle() != NULL); 59 EXPECT_TRUE(wnd1.handle() != nullptr);
60 EXPECT_TRUE(wnd2.handle() != NULL); 60 EXPECT_TRUE(wnd2.handle() != nullptr);
61 wnd1.Destroy(); 61 wnd1.Destroy();
62 wnd2.Destroy(); 62 wnd2.Destroy();
63 EXPECT_TRUE(wnd2.handle() == NULL); 63 EXPECT_TRUE(wnd2.handle() == nullptr);
64 EXPECT_TRUE(wnd1.handle() == NULL); 64 EXPECT_TRUE(wnd1.handle() == nullptr);
65 } 65 }
OLDNEW
« no previous file with comments | « webrtc/base/win32window.cc ('k') | webrtc/base/winping.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698