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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: mojo/system/dispatcher_unittest.cc

Issue 597413002: Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« mojo/embedder/embedder_unittest.cc ('K') | « mojo/system/dispatcher.cc ('k') | mojo/system/entrypoints.cc » ('j') | mojo/system/local_data_pipe_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "mojo/system/dispatcher.h" 5 #include "mojo/system/dispatcher.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/synchronization/waitable_event.h" 10 #include "base/synchronization/waitable_event.h"
(...skipping 27 matching lines...) Expand all
38 DISALLOW_COPY_AND_ASSIGN(TrivialDispatcher); 38 DISALLOW_COPY_AND_ASSIGN(TrivialDispatcher);
39 }; 39 };
40 40
41 TEST(DispatcherTest, Basic) { 41 TEST(DispatcherTest, Basic) {
42 scoped_refptr<Dispatcher> d(new TrivialDispatcher()); 42 scoped_refptr<Dispatcher> d(new TrivialDispatcher());
43 43
44 EXPECT_EQ(Dispatcher::kTypeUnknown, d->GetType()); 44 EXPECT_EQ(Dispatcher::kTypeUnknown, d->GetType());
45 45
46 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, 46 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
47 d->WriteMessage( 47 d->WriteMessage(
48 NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE)); 48 NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
49 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, 49 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
50 d->ReadMessage(NullUserPointer(), 50 d->ReadMessage(NullUserPointer(),
51 NullUserPointer(), 51 NullUserPointer(),
52 NULL, 52 nullptr,
53 NULL, 53 nullptr,
54 MOJO_WRITE_MESSAGE_FLAG_NONE)); 54 MOJO_WRITE_MESSAGE_FLAG_NONE));
55 EXPECT_EQ( 55 EXPECT_EQ(
56 MOJO_RESULT_INVALID_ARGUMENT, 56 MOJO_RESULT_INVALID_ARGUMENT,
57 d->WriteData( 57 d->WriteData(
58 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE)); 58 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE));
59 EXPECT_EQ( 59 EXPECT_EQ(
60 MOJO_RESULT_INVALID_ARGUMENT, 60 MOJO_RESULT_INVALID_ARGUMENT,
61 d->BeginWriteData( 61 d->BeginWriteData(
62 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE)); 62 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE));
63 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndWriteData(0)); 63 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndWriteData(0));
(...skipping 20 matching lines...) Expand all
84 EXPECT_EQ(0u, hss.satisfiable_signals); 84 EXPECT_EQ(0u, hss.satisfiable_signals);
85 hss = HandleSignalsState(); 85 hss = HandleSignalsState();
86 d->RemoveWaiter(&w, &hss); 86 d->RemoveWaiter(&w, &hss);
87 EXPECT_EQ(0u, hss.satisfied_signals); 87 EXPECT_EQ(0u, hss.satisfied_signals);
88 EXPECT_EQ(0u, hss.satisfiable_signals); 88 EXPECT_EQ(0u, hss.satisfiable_signals);
89 89
90 EXPECT_EQ(MOJO_RESULT_OK, d->Close()); 90 EXPECT_EQ(MOJO_RESULT_OK, d->Close());
91 91
92 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, 92 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
93 d->WriteMessage( 93 d->WriteMessage(
94 NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE)); 94 NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
95 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, 95 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
96 d->ReadMessage(NullUserPointer(), 96 d->ReadMessage(NullUserPointer(),
97 NullUserPointer(), 97 NullUserPointer(),
98 NULL, 98 nullptr,
99 NULL, 99 nullptr,
100 MOJO_WRITE_MESSAGE_FLAG_NONE)); 100 MOJO_WRITE_MESSAGE_FLAG_NONE));
101 EXPECT_EQ( 101 EXPECT_EQ(
102 MOJO_RESULT_INVALID_ARGUMENT, 102 MOJO_RESULT_INVALID_ARGUMENT,
103 d->WriteData( 103 d->WriteData(
104 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE)); 104 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE));
105 EXPECT_EQ( 105 EXPECT_EQ(
106 MOJO_RESULT_INVALID_ARGUMENT, 106 MOJO_RESULT_INVALID_ARGUMENT,
107 d->BeginWriteData( 107 d->BeginWriteData(
108 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE)); 108 NullUserPointer(), NullUserPointer(), MOJO_WRITE_DATA_FLAG_NONE));
109 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndWriteData(0)); 109 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndWriteData(0));
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 case CLOSE: { 168 case CLOSE: {
169 MojoResult r = dispatcher_->Close(); 169 MojoResult r = dispatcher_->Close();
170 EXPECT_TRUE(r == MOJO_RESULT_OK || r == MOJO_RESULT_INVALID_ARGUMENT) 170 EXPECT_TRUE(r == MOJO_RESULT_OK || r == MOJO_RESULT_INVALID_ARGUMENT)
171 << "Result: " << r; 171 << "Result: " << r;
172 break; 172 break;
173 } 173 }
174 case WRITE_MESSAGE: 174 case WRITE_MESSAGE:
175 EXPECT_EQ( 175 EXPECT_EQ(
176 MOJO_RESULT_INVALID_ARGUMENT, 176 MOJO_RESULT_INVALID_ARGUMENT,
177 dispatcher_->WriteMessage( 177 dispatcher_->WriteMessage(
178 NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE)); 178 NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
179 break; 179 break;
180 case READ_MESSAGE: 180 case READ_MESSAGE:
181 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, 181 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
182 dispatcher_->ReadMessage(NullUserPointer(), 182 dispatcher_->ReadMessage(NullUserPointer(),
183 NullUserPointer(), 183 NullUserPointer(),
184 NULL, 184 nullptr,
185 NULL, 185 nullptr,
186 MOJO_WRITE_MESSAGE_FLAG_NONE)); 186 MOJO_WRITE_MESSAGE_FLAG_NONE));
187 break; 187 break;
188 case WRITE_DATA: 188 case WRITE_DATA:
189 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, 189 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
190 dispatcher_->WriteData(NullUserPointer(), 190 dispatcher_->WriteData(NullUserPointer(),
191 NullUserPointer(), 191 NullUserPointer(),
192 MOJO_WRITE_DATA_FLAG_NONE)); 192 MOJO_WRITE_DATA_FLAG_NONE));
193 break; 193 break;
194 case BEGIN_WRITE_DATA: 194 case BEGIN_WRITE_DATA:
195 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, 195 EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 event.Signal(); 317 event.Signal();
318 } // Joins all the threads. 318 } // Joins all the threads.
319 319
320 EXPECT_EQ(MOJO_RESULT_OK, d->Close()); 320 EXPECT_EQ(MOJO_RESULT_OK, d->Close());
321 } 321 }
322 } 322 }
323 323
324 } // namespace 324 } // namespace
325 } // namespace system 325 } // namespace system
326 } // namespace mojo 326 } // namespace mojo
OLDNEW
« mojo/embedder/embedder_unittest.cc ('K') | « mojo/system/dispatcher.cc ('k') | mojo/system/entrypoints.cc » ('j') | mojo/system/local_data_pipe_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698