chrome/browser/extensions/extension_websocket_apitest.cc - Issue 11087027: WebSocket test server migration on ExtensionApiTest.WebSocket

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/extensions/extension_websocket_apitest.cc

Issue 11087027: WebSocket test server migration on ExtensionApiTest.WebSocket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix copyright Created 8 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 | Annotate | Revision Log

« chrome/browser/extensions/extension_apitest.h ('K') | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/test/data/extensions/api_test/websocket/test.js » ('j') | chrome/test/data/extensions/api_test/websocket/test.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "base/path_service.h"	5 #include "base/path_service.h"

6 #include "chrome/browser/extensions/extension_apitest.h"	6 #include "chrome/browser/extensions/extension_apitest.h"

7 #include "content/public/common/content_paths.h"	7 #include "content/public/common/content_paths.h"

8 #include "net/base/mock_host_resolver.h"	8 #include "net/base/mock_host_resolver.h"

9	9

10 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {	10 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {

11 FilePath websocket_root_dir;	11 ASSERT_TRUE(StartWebSocketServer(

12 ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_root_dir));	12 FilePath().AppendASCII("net/data/websocket")));
	Ryan Sleevi 2012/10/09 19:39:07 Could you explain why you're no longer using PathS Could you explain why you're no longer using PathService? Are you relying on the TestServer to have a current working directory of some value? If so, I don't think that's guaranteed by the test server. If you really did mean to do this, why not StartWebSocketServer(FILE_PATH_LITERAL("net/data/websocket")); Although AIUI, including forward slashes in literals is discouraged FilePath(FILE_PATH_LITERAL("net")) .Append(FILE_PATH_LITERAL("data")) .Append(FILE_PATH_LITERAL("websocket")); Takashi Toyoshima 2012/10/10 01:34:48 I follows BrowserTestBase::CreateTestServer() styl I follows BrowserTestBase::CreateTestServer() style here. I'm not sure why they use relative path, but this runs in the same situation, so I just keep consistency. I think we should fix them to use PathService and FilePath().Append()... style. So could you allow me to keep this as is for now? Takashi Toyoshima 2012/10/10 04:14:41 The reason of relative path exists in LocalTestSer The reason of relative path exists in LocalTestServer::Init(). There, document_root.IsAbosolute() check the specified path. So, the path should be relative here. Also, BrowserTestBase comment says it's relative to src.
13 ASSERT_TRUE(StartWebSocketServer(websocket_root_dir));

14 ASSERT_TRUE(RunExtensionTest("websocket")) << message_;	13 ASSERT_TRUE(RunExtensionTest("websocket")) << message_;

15 }	14 }

OLD	NEW