OLD | NEW |
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 CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 5 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
7 | 7 |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
11 #include "content/public/test/javascript_test_observer.h" | 11 #include "content/public/test/javascript_test_observer.h" |
12 | 12 |
13 // A helper base class that decodes structured automation messages of the form: | 13 // A helper base class that decodes structured automation messages of the form: |
14 // {"type": type_name, ...} | 14 // {"type": type_name, ...} |
15 class StructuredMessageHandler : public content::TestMessageHandler { | 15 class StructuredMessageHandler : public content::TestMessageHandler { |
16 public: | 16 public: |
17 virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE; | 17 virtual MessageResponse HandleMessage(const std::string& json) override; |
18 | 18 |
19 // This method provides a higher-level interface for handling JSON messages | 19 // This method provides a higher-level interface for handling JSON messages |
20 // from the DOM automation controler. Instead of handling a string | 20 // from the DOM automation controler. Instead of handling a string |
21 // containing a JSON-encoded object, this specialization of TestMessageHandler | 21 // containing a JSON-encoded object, this specialization of TestMessageHandler |
22 // decodes the string into a dictionary. This makes it easier to send and | 22 // decodes the string into a dictionary. This makes it easier to send and |
23 // receive structured messages. It is assumed the dictionary will always have | 23 // receive structured messages. It is assumed the dictionary will always have |
24 // a "type" field that indicates the nature of message. | 24 // a "type" field that indicates the nature of message. |
25 virtual MessageResponse HandleStructuredMessage( | 25 virtual MessageResponse HandleStructuredMessage( |
26 const std::string& type, | 26 const std::string& type, |
27 base::DictionaryValue* msg) = 0; | 27 base::DictionaryValue* msg) = 0; |
(...skipping 10 matching lines...) Expand all Loading... |
38 | 38 |
39 // A simple structured message handler for tests that load nexes. | 39 // A simple structured message handler for tests that load nexes. |
40 class LoadTestMessageHandler : public StructuredMessageHandler { | 40 class LoadTestMessageHandler : public StructuredMessageHandler { |
41 public: | 41 public: |
42 LoadTestMessageHandler(); | 42 LoadTestMessageHandler(); |
43 | 43 |
44 void Log(const std::string& type, const std::string& message); | 44 void Log(const std::string& type, const std::string& message); |
45 | 45 |
46 virtual MessageResponse HandleStructuredMessage( | 46 virtual MessageResponse HandleStructuredMessage( |
47 const std::string& type, | 47 const std::string& type, |
48 base::DictionaryValue* msg) OVERRIDE; | 48 base::DictionaryValue* msg) override; |
49 | 49 |
50 bool test_passed() const { | 50 bool test_passed() const { |
51 return test_passed_; | 51 return test_passed_; |
52 } | 52 } |
53 | 53 |
54 private: | 54 private: |
55 bool test_passed_; | 55 bool test_passed_; |
56 | 56 |
57 DISALLOW_COPY_AND_ASSIGN(LoadTestMessageHandler); | 57 DISALLOW_COPY_AND_ASSIGN(LoadTestMessageHandler); |
58 }; | 58 }; |
59 | 59 |
60 class NaClBrowserTestBase : public InProcessBrowserTest { | 60 class NaClBrowserTestBase : public InProcessBrowserTest { |
61 public: | 61 public: |
62 NaClBrowserTestBase(); | 62 NaClBrowserTestBase(); |
63 virtual ~NaClBrowserTestBase(); | 63 virtual ~NaClBrowserTestBase(); |
64 | 64 |
65 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; | 65 virtual void SetUpCommandLine(base::CommandLine* command_line) override; |
66 | 66 |
67 virtual void SetUpOnMainThread() OVERRIDE; | 67 virtual void SetUpOnMainThread() override; |
68 | 68 |
69 // What variant are we running - newlib, glibc, pnacl, etc? | 69 // What variant are we running - newlib, glibc, pnacl, etc? |
70 // This is used to compute what directory we're pulling data from, but it can | 70 // This is used to compute what directory we're pulling data from, but it can |
71 // also be used to affect the behavior of the test. | 71 // also be used to affect the behavior of the test. |
72 virtual base::FilePath::StringType Variant() = 0; | 72 virtual base::FilePath::StringType Variant() = 0; |
73 | 73 |
74 // Where are the files for this class of test located on disk? | 74 // Where are the files for this class of test located on disk? |
75 virtual bool GetDocumentRoot(base::FilePath* document_root); | 75 virtual bool GetDocumentRoot(base::FilePath* document_root); |
76 | 76 |
77 virtual bool IsAPnaclTest(); | 77 virtual bool IsAPnaclTest(); |
(...skipping 24 matching lines...) Expand all Loading... |
102 bool full_url = false); | 102 bool full_url = false); |
103 | 103 |
104 private: | 104 private: |
105 bool StartTestServer(); | 105 bool StartTestServer(); |
106 | 106 |
107 scoped_ptr<net::SpawnedTestServer> test_server_; | 107 scoped_ptr<net::SpawnedTestServer> test_server_; |
108 }; | 108 }; |
109 | 109 |
110 class NaClBrowserTestNewlib : public NaClBrowserTestBase { | 110 class NaClBrowserTestNewlib : public NaClBrowserTestBase { |
111 public: | 111 public: |
112 virtual base::FilePath::StringType Variant() OVERRIDE; | 112 virtual base::FilePath::StringType Variant() override; |
113 }; | 113 }; |
114 | 114 |
115 class NaClBrowserTestGLibc : public NaClBrowserTestBase { | 115 class NaClBrowserTestGLibc : public NaClBrowserTestBase { |
116 public: | 116 public: |
117 virtual base::FilePath::StringType Variant() OVERRIDE; | 117 virtual base::FilePath::StringType Variant() override; |
118 }; | 118 }; |
119 | 119 |
120 class NaClBrowserTestPnacl : public NaClBrowserTestBase { | 120 class NaClBrowserTestPnacl : public NaClBrowserTestBase { |
121 public: | 121 public: |
122 virtual base::FilePath::StringType Variant() OVERRIDE; | 122 virtual base::FilePath::StringType Variant() override; |
123 | 123 |
124 virtual bool IsAPnaclTest() OVERRIDE; | 124 virtual bool IsAPnaclTest() override; |
125 }; | 125 }; |
126 | 126 |
127 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase { | 127 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase { |
128 public: | 128 public: |
129 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; | 129 virtual void SetUpCommandLine(base::CommandLine* command_line) override; |
130 virtual base::FilePath::StringType Variant() OVERRIDE; | 130 virtual base::FilePath::StringType Variant() override; |
131 }; | 131 }; |
132 | 132 |
133 class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase { | 133 class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase { |
134 public: | 134 public: |
135 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; | 135 virtual void SetUpCommandLine(base::CommandLine* command_line) override; |
136 virtual base::FilePath::StringType Variant() OVERRIDE; | 136 virtual base::FilePath::StringType Variant() override; |
137 }; | 137 }; |
138 | 138 |
139 // A NaCl browser test only using static files. | 139 // A NaCl browser test only using static files. |
140 class NaClBrowserTestStatic : public NaClBrowserTestBase { | 140 class NaClBrowserTestStatic : public NaClBrowserTestBase { |
141 public: | 141 public: |
142 virtual base::FilePath::StringType Variant() OVERRIDE; | 142 virtual base::FilePath::StringType Variant() override; |
143 virtual bool GetDocumentRoot(base::FilePath* document_root) OVERRIDE; | 143 virtual bool GetDocumentRoot(base::FilePath* document_root) override; |
144 }; | 144 }; |
145 | 145 |
146 // A NaCl browser test that loads from an unpacked chrome extension. | 146 // A NaCl browser test that loads from an unpacked chrome extension. |
147 // The directory of the unpacked extension files is determined by | 147 // The directory of the unpacked extension files is determined by |
148 // the tester's document root. | 148 // the tester's document root. |
149 class NaClBrowserTestNewlibExtension : public NaClBrowserTestNewlib { | 149 class NaClBrowserTestNewlibExtension : public NaClBrowserTestNewlib { |
150 public: | 150 public: |
151 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; | 151 virtual void SetUpCommandLine(base::CommandLine* command_line) override; |
152 }; | 152 }; |
153 | 153 |
154 class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc { | 154 class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc { |
155 public: | 155 public: |
156 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; | 156 virtual void SetUpCommandLine(base::CommandLine* command_line) override; |
157 }; | 157 }; |
158 | 158 |
159 // PNaCl tests take a long time on windows debug builds | 159 // PNaCl tests take a long time on windows debug builds |
160 // and sometimes time out. Disable until it is made faster: | 160 // and sometimes time out. Disable until it is made faster: |
161 // https://code.google.com/p/chromium/issues/detail?id=177555 | 161 // https://code.google.com/p/chromium/issues/detail?id=177555 |
162 #if (defined(OS_WIN) && !defined(NDEBUG)) | 162 #if (defined(OS_WIN) && !defined(NDEBUG)) |
163 # define MAYBE_PNACL(test_name) DISABLED_##test_name | 163 # define MAYBE_PNACL(test_name) DISABLED_##test_name |
164 #else | 164 #else |
165 # define MAYBE_PNACL(test_name) test_name | 165 # define MAYBE_PNACL(test_name) test_name |
166 #endif | 166 #endif |
(...skipping 25 matching lines...) Expand all Loading... |
192 | 192 |
193 #define NACL_BROWSER_TEST_F(suite, name, body) \ | 193 #define NACL_BROWSER_TEST_F(suite, name, body) \ |
194 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ | 194 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ |
195 body \ | 195 body \ |
196 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ | 196 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ |
197 body \ | 197 body \ |
198 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ | 198 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ |
199 body | 199 body |
200 | 200 |
201 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 201 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
OLD | NEW |