Skip to content

GitLab

T
tangled
Commit d91dd011 authored by dhnishi@chromium.org's avatar dhnishi@chromium.org
Browse files
Options

Move more Sockets browser tests into app_shell_browsertests tests. 

BUG=388893

Review URL: https://codereview.chromium.org/456863003

Cr-Commit-Position: refs/heads/master@{#289018}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289018 0039d316-1c4b-4281-b951-d872f2087c98
parent b4b1aea8
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 79 deletions
chrome/browser/extensions/api/socket/socket_apitest.cc
View file @ d91dd011
......@@ -5,7 +5,6 @@
#include "base/memory/ref_counted.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_test_message_listener.h"
#include "chrome/browser/ui/browser.h"
......@@ -20,8 +19,6 @@
using extensions::Extension;
namespace utils = extension_function_test_utils;
namespace {
const std::string kHostname = "127.0.0.1";
......@@ -56,60 +53,6 @@ class SocketApiTest : public ExtensionApiTest {
} // namespace
IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPCreateGood) {
scoped_refptr<extensions::SocketCreateFunction> socket_create_function(
new extensions::SocketCreateFunction());
scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
socket_create_function->set_extension(empty_extension.get());
socket_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[\"udp\"]", browser(), utils::NONE));
ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
base::DictionaryValue *value =
static_cast<base::DictionaryValue*>(result.get());
int socket_id = -1;
EXPECT_TRUE(value->GetInteger("socketId", &socket_id));
EXPECT_GT(socket_id, 0);
}
IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPCreateGood) {
scoped_refptr<extensions::SocketCreateFunction> socket_create_function(
new extensions::SocketCreateFunction());
scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
socket_create_function->set_extension(empty_extension.get());
socket_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[\"tcp\"]", browser(), utils::NONE));
ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
base::DictionaryValue *value =
static_cast<base::DictionaryValue*>(result.get());
int socket_id = -1;
EXPECT_TRUE(value->GetInteger("socketId", &socket_id));
ASSERT_GT(socket_id, 0);
}
IN_PROC_BROWSER_TEST_F(SocketApiTest, GetNetworkList) {
scoped_refptr<extensions::SocketGetNetworkListFunction> socket_function(
new extensions::SocketGetNetworkListFunction());
scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
socket_function->set_extension(empty_extension.get());
socket_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
socket_function.get(), "[]", browser(), utils::NONE));
ASSERT_EQ(base::Value::TYPE_LIST, result->GetType());
// If we're invoking socket tests, all we can confirm is that we have at
// least one address, but not what it is.
base::ListValue *value = static_cast<base::ListValue*>(result.get());
ASSERT_GT(value->GetSize(), 0U);
}
IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPExtension) {
scoped_ptr<net::SpawnedTestServer> test_server(
new net::SpawnedTestServer(
......
chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc
View file @ d91dd011
......@@ -6,7 +6,6 @@
#include "base/path_service.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_test_message_listener.h"
#include "chrome/browser/ui/browser.h"
......@@ -23,8 +22,6 @@
using extensions::Extension;
namespace utils = extension_function_test_utils;
namespace {
// TODO(jschuh): Hanging plugin tests. crbug.com/244653
......@@ -66,25 +63,6 @@ class SocketsUdpApiTest : public ExtensionApiTest {
} // namespace
IN_PROC_BROWSER_TEST_F(SocketsUdpApiTest, SocketsUdpCreateGood) {
scoped_refptr<extensions::core_api::SocketsUdpCreateFunction>
socket_create_function(
new extensions::core_api::SocketsUdpCreateFunction());
scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
socket_create_function->set_extension(empty_extension.get());
socket_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[]", browser(), utils::NONE));
ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
base::DictionaryValue *value =
static_cast<base::DictionaryValue*>(result.get());
int socketId = -1;
EXPECT_TRUE(value->GetInteger("socketId", &socketId));
EXPECT_TRUE(socketId > 0);
}
IN_PROC_BROWSER_TEST_F(SocketsUdpApiTest, SocketsUdpExtension) {
scoped_ptr<net::SpawnedTestServer> test_server(
new net::SpawnedTestServer(
......
extensions/browser/api/socket/socket_apitest.cc 0 → 100644
View file @ d91dd011
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "extensions/browser/api/dns/host_resolver_wrapper.h"
#include "extensions/browser/api/dns/mock_host_resolver_creator.h"
#include "extensions/browser/api/socket/socket_api.h"
#include "extensions/browser/api_test_utils.h"
#include "extensions/common/extension.h"
#include "extensions/common/test_util.h"
#include "extensions/shell/test/shell_test.h"
using extensions::api_test_utils::RunFunctionAndReturnSingleResult;
namespace extensions {
class SocketApiTest : public AppShellTest {};
IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPCreateGood) {
scoped_refptr<extensions::SocketCreateFunction> socket_create_function(
new extensions::SocketCreateFunction());
scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
socket_create_function->set_extension(empty_extension.get());
socket_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[\"udp\"]", browser_context()));
base::DictionaryValue* value = NULL;
ASSERT_TRUE(result->GetAsDictionary(&value));
int socket_id = -1;
EXPECT_TRUE(value->GetInteger("socketId", &socket_id));
EXPECT_GT(socket_id, 0);
}
IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPCreateGood) {
scoped_refptr<extensions::SocketCreateFunction> socket_create_function(
new extensions::SocketCreateFunction());
scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
socket_create_function->set_extension(empty_extension.get());
socket_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[\"tcp\"]", browser_context()));
base::DictionaryValue* value = NULL;
ASSERT_TRUE(result->GetAsDictionary(&value));
int socket_id = -1;
EXPECT_TRUE(value->GetInteger("socketId", &socket_id));
ASSERT_GT(socket_id, 0);
}
IN_PROC_BROWSER_TEST_F(SocketApiTest, GetNetworkList) {
scoped_refptr<extensions::SocketGetNetworkListFunction> socket_function(
new extensions::SocketGetNetworkListFunction());
scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
socket_function->set_extension(empty_extension.get());
socket_function->set_has_callback(true);
scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
socket_function.get(), "[]", browser_context()));
// If we're invoking socket tests, all we can confirm is that we have at
// least one address, but not what it is.
base::ListValue* value = NULL;
ASSERT_TRUE(result->GetAsList(&value));
ASSERT_GT(value->GetSize(), 0U);
}
} // namespace extensions
extensions/browser/api/sockets_udp/sockets_udp_apitest.cc 0 → 100644
View file @ d91dd011
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "extensions/browser/api/dns/host_resolver_wrapper.h"
#include "extensions/browser/api/dns/mock_host_resolver_creator.h"
#include "extensions/browser/api/sockets_udp/sockets_udp_api.h"
#include "extensions/browser/api_test_utils.h"
#include "extensions/common/extension.h"
#include "extensions/common/test_util.h"
#include "extensions/shell/test/shell_test.h"
using extensions::api_test_utils::RunFunctionAndReturnSingleResult;
namespace extensions {
class SocketsUdpApiTest : public AppShellTest {};
IN_PROC_BROWSER_TEST_F(SocketsUdpApiTest, SocketsUdpCreateGood) {
scoped_refptr<extensions::core_api::SocketsUdpCreateFunction>
socket_create_function(
new extensions::core_api::SocketsUdpCreateFunction());
scoped_refptr<Extension> empty_extension = test_util::CreateEmptyExtension();
socket_create_function->set_extension(empty_extension.get());
socket_create_function->set_has_callback(true);
scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
socket_create_function.get(), "[]", browser_context()));
base::DictionaryValue* value = NULL;
ASSERT_TRUE(result->GetAsDictionary(&value));
int socketId = -1;
EXPECT_TRUE(value->GetInteger("socketId", &socketId));
ASSERT_TRUE(socketId > 0);
}
} // namespace extensions
extensions/shell/app_shell.gyp
View file @ d91dd011
......@@ -158,7 +158,9 @@
# TODO(yoz): Something is off here; should this .gyp file be
# in the parent directory? Test target extensions_browsertests?
'../browser/api/dns/dns_apitest.cc',
'../browser/api/socket/socket_apitest.cc',
'../browser/api/sockets_tcp/sockets_tcp_apitest.cc',
'../browser/api/sockets_udp/sockets_udp_apitest.cc',
'browser/shell_browsertest.cc',
'test/shell_test.h',
'test/shell_test.cc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment