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

Side by Side Diff: content/public/test/browser_test.h

Issue 629203002: Replace OVERRIDE and FINAL with override and final in content/public/[a-s]* (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
« no previous file with comments | « content/public/renderer/render_view_observer.h ('k') | content/public/test/browser_test_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_TEST_BROWSER_TEST_H_ 5 #ifndef CONTENT_TEST_BROWSER_TEST_H_
6 #define CONTENT_TEST_BROWSER_TEST_H_ 6 #define CONTENT_TEST_BROWSER_TEST_H_
7 7
8 // We only want to use InProcessBrowserTest in test targets which properly 8 // We only want to use InProcessBrowserTest in test targets which properly
9 // isolate each test case by running each test in a separate process. 9 // isolate each test case by running each test in a separate process.
10 // This way if a test hangs the test launcher can reliably terminate it. 10 // This way if a test hangs the test launcher can reliably terminate it.
11 // 11 //
12 // InProcessBrowserTest cannot be run more than once in the same address space 12 // InProcessBrowserTest cannot be run more than once in the same address space
13 // anyway - otherwise the second test crashes. 13 // anyway - otherwise the second test crashes.
14 #if defined(HAS_OUT_OF_PROC_TEST_RUNNER) 14 #if defined(HAS_OUT_OF_PROC_TEST_RUNNER)
15 15
16 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 #define IN_PROC_BROWSER_TEST_(test_case_name, test_name, parent_class,\ 19 #define IN_PROC_BROWSER_TEST_(test_case_name, test_name, parent_class,\
20 parent_id)\ 20 parent_id)\
21 class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\ 21 class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
22 public:\ 22 public:\
23 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\ 23 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
24 protected:\ 24 protected:\
25 virtual void RunTestOnMainThread() OVERRIDE;\ 25 virtual void RunTestOnMainThread() override;\
26 private:\ 26 private:\
27 virtual void TestBody() OVERRIDE {}\ 27 virtual void TestBody() override {}\
28 static ::testing::TestInfo* const test_info_;\ 28 static ::testing::TestInfo* const test_info_;\
29 GTEST_DISALLOW_COPY_AND_ASSIGN_(\ 29 GTEST_DISALLOW_COPY_AND_ASSIGN_(\
30 GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\ 30 GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
31 };\ 31 };\
32 \ 32 \
33 ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\ 33 ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\
34 ::test_info_ =\ 34 ::test_info_ =\
35 ::testing::internal::MakeAndRegisterTestInfo(\ 35 ::testing::internal::MakeAndRegisterTestInfo(\
36 #test_case_name, #test_name, "", "", \ 36 #test_case_name, #test_name, "", "", \
37 (parent_id), \ 37 (parent_id), \
38 parent_class::SetUpTestCase, \ 38 parent_class::SetUpTestCase, \
39 parent_class::TearDownTestCase, \ 39 parent_class::TearDownTestCase, \
40 new ::testing::internal::TestFactoryImpl<\ 40 new ::testing::internal::TestFactoryImpl<\
41 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\ 41 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
42 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread() 42 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
43 43
44 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\ 44 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
45 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\ 45 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
46 ::testing::internal::GetTypeId<test_fixture>()) 46 ::testing::internal::GetTypeId<test_fixture>())
47 47
48 #define IN_PROC_BROWSER_TEST_P_(test_case_name, test_name) \ 48 #define IN_PROC_BROWSER_TEST_P_(test_case_name, test_name) \
49 class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ 49 class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
50 : public test_case_name { \ 50 : public test_case_name { \
51 public: \ 51 public: \
52 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \ 52 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
53 protected: \ 53 protected: \
54 virtual void RunTestOnMainThread() OVERRIDE; \ 54 virtual void RunTestOnMainThread() override; \
55 private: \ 55 private: \
56 virtual void TestBody() OVERRIDE {} \ 56 virtual void TestBody() override {} \
57 static int AddToRegistry() { \ 57 static int AddToRegistry() { \
58 ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ 58 ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
59 GetTestCasePatternHolder<test_case_name>(\ 59 GetTestCasePatternHolder<test_case_name>(\
60 #test_case_name, __FILE__, __LINE__)->AddTestPattern(\ 60 #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
61 #test_case_name, \ 61 #test_case_name, \
62 #test_name, \ 62 #test_name, \
63 new ::testing::internal::TestMetaFactory< \ 63 new ::testing::internal::TestMetaFactory< \
64 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \ 64 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
65 return 0; \ 65 return 0; \
66 } \ 66 } \
67 static int gtest_registering_dummy_; \ 67 static int gtest_registering_dummy_; \
68 GTEST_DISALLOW_COPY_AND_ASSIGN_(\ 68 GTEST_DISALLOW_COPY_AND_ASSIGN_(\
69 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \ 69 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
70 }; \ 70 }; \
71 int GTEST_TEST_CLASS_NAME_(test_case_name, \ 71 int GTEST_TEST_CLASS_NAME_(test_case_name, \
72 test_name)::gtest_registering_dummy_ = \ 72 test_name)::gtest_registering_dummy_ = \
73 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \ 73 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
74 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread() 74 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
75 75
76 // Wrap the real macro with an outer macro to ensure that the parameters are 76 // Wrap the real macro with an outer macro to ensure that the parameters are
77 // evaluated (e.g., if |test_name| is prefixed with MAYBE_). 77 // evaluated (e.g., if |test_name| is prefixed with MAYBE_).
78 #define IN_PROC_BROWSER_TEST_P(test_case_name, test_name) \ 78 #define IN_PROC_BROWSER_TEST_P(test_case_name, test_name) \
79 IN_PROC_BROWSER_TEST_P_(test_case_name, test_name) 79 IN_PROC_BROWSER_TEST_P_(test_case_name, test_name)
80 80
81 #endif // defined(HAS_OUT_OF_PROC_TEST_RUNNER) 81 #endif // defined(HAS_OUT_OF_PROC_TEST_RUNNER)
82 82
83 #endif // CONTENT_TEST_BROWSER_TEST_H_ 83 #endif // CONTENT_TEST_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « content/public/renderer/render_view_observer.h ('k') | content/public/test/browser_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698