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

Side by Side Diff: base/test/gtest_util.h

Issue 2162053006: Move EXPECT_DCHECK_DEATH from base/task_scheduler and use it in relevant base/ tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef BASE_TEST_GTEST_UTIL_H_ 5 #ifndef BASE_TEST_GTEST_UTIL_H_
6 #define BASE_TEST_GTEST_UTIL_H_ 6 #define BASE_TEST_GTEST_UTIL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/logging.h"
14 #include "build/build_config.h"
15 #include "testing/gtest/include/gtest/gtest.h"
16
17 // EXPECT/ASSERT_DCHECK_DEATH is intended to replace EXPECT/ASSERT_DEBUG_DEATH
18 // when the death is expected to be caused by a DCHECK. Contrary to
19 // EXPECT/ASSERT_DEBUG_DEATH however, it doesn't execute the statement in non-
20 // dcheck builds as DCHECKs are intended to catch things that should never
21 // happen and as such executing the statement results in undefined behavior.
22 // Death tests misbehave on Android.
danakj 2016/07/20 19:33:45 Can you point to a bug or write something more abo
gab 2016/07/20 21:21:08 I don't know either, but a few did mentioned this.
23 #if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
24 #define EXPECT_DCHECK_DEATH(statement, regex) EXPECT_DEATH(statement, regex)
25 #define ASSERT_DCHECK_DEATH(statement, regex) ASSERT_DEATH(statement, regex)
26 #else
27 #define EXPECT_DCHECK_DEATH(statement, regex)
28 #define ASSERT_DCHECK_DEATH(statement, regex)
29 #endif
13 30
14 namespace base { 31 namespace base {
15 32
16 class FilePath; 33 class FilePath;
17 34
18 struct TestIdentifier { 35 struct TestIdentifier {
19 TestIdentifier(); 36 TestIdentifier();
20 TestIdentifier(const TestIdentifier& other); 37 TestIdentifier(const TestIdentifier& other);
21 38
22 std::string test_case_name; 39 std::string test_case_name;
(...skipping 17 matching lines...) Expand all
40 57
41 // Reads the list of gtest-based tests from |path| into |output|. 58 // Reads the list of gtest-based tests from |path| into |output|.
42 // Returns true on success. 59 // Returns true on success.
43 bool ReadTestNamesFromFile( 60 bool ReadTestNamesFromFile(
44 const FilePath& path, 61 const FilePath& path,
45 std::vector<TestIdentifier>* output) WARN_UNUSED_RESULT; 62 std::vector<TestIdentifier>* output) WARN_UNUSED_RESULT;
46 63
47 } // namespace base 64 } // namespace base
48 65
49 #endif // BASE_TEST_GTEST_UTIL_H_ 66 #endif // BASE_TEST_GTEST_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698