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

Side by Side Diff: mojo/edk/test/multiprocess_test_helper_unittest.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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
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/edk/test/multiprocess_test_helper.h" 5 #include "mojo/edk/test/multiprocess_test_helper.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 helper.StartChild("ChildTestFailsAssert"); 134 helper.StartChild("ChildTestFailsAssert");
135 EXPECT_FALSE(helper.WaitForChildTestShutdown()); 135 EXPECT_FALSE(helper.WaitForChildTestShutdown());
136 } 136 }
137 137
138 MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestFailsAssert) { 138 MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestFailsAssert) {
139 ASSERT_FALSE(MultiprocessTestHelper::client_platform_handle.is_valid()) 139 ASSERT_FALSE(MultiprocessTestHelper::client_platform_handle.is_valid())
140 << "DISREGARD: Expected failure in child process"; 140 << "DISREGARD: Expected failure in child process";
141 ASSERT_FALSE( 141 ASSERT_FALSE(
142 IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get())) 142 IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get()))
143 << "Not reached"; 143 << "Not reached";
144 CHECK(false) << "Not reached"; 144 // Not reached
145 CHECK(false);
145 } 146 }
146 147
147 TEST_F(MultiprocessTestHelperTest, ChildTestFailsExpect) { 148 TEST_F(MultiprocessTestHelperTest, ChildTestFailsExpect) {
148 MultiprocessTestHelper helper; 149 MultiprocessTestHelper helper;
149 EXPECT_TRUE(helper.server_platform_handle.is_valid()); 150 EXPECT_TRUE(helper.server_platform_handle.is_valid());
150 helper.StartChild("ChildTestFailsExpect"); 151 helper.StartChild("ChildTestFailsExpect");
151 EXPECT_FALSE(helper.WaitForChildTestShutdown()); 152 EXPECT_FALSE(helper.WaitForChildTestShutdown());
152 } 153 }
153 154
154 MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestFailsExpect) { 155 MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestFailsExpect) {
155 EXPECT_FALSE(MultiprocessTestHelper::client_platform_handle.is_valid()) 156 EXPECT_FALSE(MultiprocessTestHelper::client_platform_handle.is_valid())
156 << "DISREGARD: Expected failure #1 in child process"; 157 << "DISREGARD: Expected failure #1 in child process";
157 EXPECT_FALSE( 158 EXPECT_FALSE(
158 IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get())) 159 IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get()))
159 << "DISREGARD: Expected failure #2 in child process"; 160 << "DISREGARD: Expected failure #2 in child process";
160 } 161 }
161 162
162 } // namespace 163 } // namespace
163 } // namespace test 164 } // namespace test
164 } // namespace edk 165 } // namespace edk
165 } // namespace mojo 166 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698