bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make CEF compliant with Google/Chromium style (issue #473).

Browse Source 
- Add a new check_style tool based on Google's cpplint that can be used to verify compliance of pending changes and specific files/directories.
- Update existing CEF source code to be compliant with the style requirements.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@463 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-01-09 23:46:23 +00:00
parent 9cc61f448b
commit 1073577d03
558 changed files with 9002 additions and 10977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

297
tests/unittests/web_urlrequest_unittest.cc
View File

@@ -3,16 +3,17 @@
// can be found in the LICENSE file.
#include "include/cef_web_urlrequest.h"
#include "test_handler.h"
#include "tests/unittests/test_handler.h"
//#define WEB_URLREQUEST_DEBUG
// #define WEB_URLREQUEST_DEBUG
class TestResults
{
public:
class TestResults {
public:
TestResults()
: errorCode(0), contentLength(0), statusCode(0), redirectCount(0)
{
: errorCode(0),
contentLength(0),
statusCode(0),
redirectCount(0) {
}
int errorCode;
@@ -25,29 +26,29 @@ public:
int redirectCount;
TrackCallback
TrackCallback
got_redirect,
got_deleted,
got_started,
got_headers,
got_loading,
got_started,
got_headers,
got_loading,
got_done,
got_progress,
got_progress,
got_abort,
got_error;
};
class BrowserTestHandler : public TestHandler
{
public:
// Cancel at state WUR_STATE_UNSENT means that no cancellation
class BrowserTestHandler : public TestHandler {
public:
// Cancel at state WUR_STATE_UNSENT means that no cancellation
// will occur since that state change is never fired.
BrowserTestHandler(TestResults &tr,
cef_weburlrequest_state_t cancelAtState = WUR_STATE_UNSENT):
cancelAtState_(cancelAtState), test_results_(tr) { }
BrowserTestHandler(TestResults &tr,
cef_weburlrequest_state_t cancelAtState = WUR_STATE_UNSENT)
: cancelAtState_(cancelAtState),
test_results_(tr) {
}
virtual void RunTest() OVERRIDE
{
virtual void RunTest() OVERRIDE {
std::stringstream testHtml;
testHtml <<
"<html><body>"
@@ -60,16 +61,14 @@ public:
virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int httpStatusCode)
{
int httpStatusCode) {
StartTest();
}
void TestCompleted()
{
void TestCompleted() {
DestroyTest();
}
virtual void StartTest() = 0;
cef_weburlrequest_state_t cancelAtState_;
@@ -77,22 +76,20 @@ public:
TestResults& test_results_;
};
class TestWebURLRequestClient : public CefWebURLRequestClient
{
public:
TestWebURLRequestClient(TestResults& tr, BrowserTestHandler* browser):
test_results_(tr), cancelAtState_(WUR_STATE_UNSENT), browser_(browser)
{
class TestWebURLRequestClient : public CefWebURLRequestClient {
public:
TestWebURLRequestClient(TestResults& tr, BrowserTestHandler* browser)
: test_results_(tr),
cancelAtState_(WUR_STATE_UNSENT),
browser_(browser) {
}
virtual ~TestWebURLRequestClient()
{
virtual ~TestWebURLRequestClient() {
test_results_.got_deleted.yes();
}
bool MaybeCancelRequest(CefRefPtr<CefWebURLRequest> requester,
RequestState state)
{
bool MaybeCancelRequest(CefRefPtr<CefWebURLRequest> requester,
RequestState state) {
if (cancelAtState_ == state) {
#ifdef WEB_URLREQUEST_DEBUG
printf(" Cancelling at state %d\n", cancelAtState_);
@@ -103,14 +100,13 @@ public:
return false;
}
void OnStateChange(CefRefPtr<CefWebURLRequest> requester,
RequestState state)
{
void OnStateChange(CefRefPtr<CefWebURLRequest> requester,
RequestState state) {
#ifdef WEB_URLREQUEST_DEBUG
printf("OnStateChange(0x%p, %d)\n", requester.get(), state);
#endif
if (MaybeCancelRequest(requester, state))
if (MaybeCancelRequest(requester, state))
return;
switch (state) {
@@ -143,12 +139,11 @@ public:
}
}
void OnRedirect(CefRefPtr<CefWebURLRequest> requester,
CefRefPtr<CefRequest> request,
CefRefPtr<CefResponse> response)
{
void OnRedirect(CefRefPtr<CefWebURLRequest> requester,
CefRefPtr<CefRequest> request,
CefRefPtr<CefResponse> response) {
#ifdef WEB_URLREQUEST_DEBUG
printf("OnRedirect(0x%p, 0x%p, 0x%p)\n",
printf("OnRedirect(0x%p, 0x%p, 0x%p)\n",
requester.get(), request.get(), response.get());
#endif
test_results_.got_redirect.yes();
@@ -160,42 +155,38 @@ public:
#endif
}
void OnHeadersReceived(CefRefPtr<CefWebURLRequest> requester,
CefRefPtr<CefResponse> response)
{
void OnHeadersReceived(CefRefPtr<CefWebURLRequest> requester,
CefRefPtr<CefResponse> response) {
#ifdef WEB_URLREQUEST_DEBUG
printf("OnHeadersReceived(0x%p, 0x%p)\n", requester.get(), response.get());
#endif
test_results_.statusCode = response->GetStatus();
test_results_.statusText = response->GetStatusText();
test_results_.contentLengthHeader = response->GetHeader( "Content-Length" );
test_results_.contentLengthHeader = response->GetHeader("Content-Length");
response->GetHeaderMap(test_results_.headerMap);
}
void OnData(CefRefPtr<CefWebURLRequest> requester, const void *data,
int dataLength)
{
void OnData(CefRefPtr<CefWebURLRequest> requester, const void *data,
int dataLength) {
#ifdef WEB_URLREQUEST_DEBUG
printf("OnData(0x%p, 0x%p, %d)\n", requester.get(), data, dataLength);
#endif
// Add data to buffer, create if not already
contents_.append( (const char *) data, dataLength);
contents_.append(static_cast<const char*>(data), dataLength);
}
void TestCompleted()
{
void TestCompleted() {
browser_->TestCompleted();
browser_ = NULL;
requester_ = NULL;
Release();
}
void OnProgress(CefRefPtr<CefWebURLRequest> requester,
uint64 bytesSent,
uint64 totalBytesToBeSent)
{
void OnProgress(CefRefPtr<CefWebURLRequest> requester,
uint64 bytesSent,
uint64 totalBytesToBeSent) {
#ifdef WEB_URLREQUEST_DEBUG
printf("OnProgress(0x%p, %d, %d)\n", requester.get(),
(unsigned int)bytesSent, (unsigned int)totalBytesToBeSent);
@@ -203,9 +194,8 @@ public:
test_results_.got_progress.yes();
}
void OnError(CefRefPtr<CefWebURLRequest> requester,
CefWebURLRequestClient::ErrorCode errorCode)
{
void OnError(CefRefPtr<CefWebURLRequest> requester,
CefWebURLRequestClient::ErrorCode errorCode) {
#ifdef WEB_URLREQUEST_DEBUG
printf("Error(0x%p, %d)\n", requester.get(), errorCode);
#endif
@@ -214,9 +204,8 @@ public:
TestCompleted();
}
bool Run(CefRefPtr<CefRequest> req, RequestState
cancelAtState=WUR_STATE_UNSENT)
{
bool Run(CefRefPtr<CefRequest> req, RequestState
cancelAtState = WUR_STATE_UNSENT) {
if ( requester_.get() )
return false;
@@ -226,7 +215,7 @@ public:
// Keep ourselves alive... blanced in TestCompleted() when done.
AddRef();
requester_ = CefWebURLRequest::CreateWebURLRequest(request_, this);
requester_ = CefWebURLRequest::CreateWebURLRequest(request_, this);
#ifdef WEB_URLREQUEST_DEBUG
printf("Created requester at address 0x%p\n", requester_.get());
#endif
@@ -234,8 +223,8 @@ public:
return requester_.get() != NULL;
}
protected:
TestResults &test_results_;
protected:
TestResults& test_results_;
RequestState cancelAtState_;
CefRefPtr<BrowserTestHandler> browser_;
@@ -246,33 +235,30 @@ protected:
IMPLEMENT_REFCOUNTING(TestWebURLRequestClient);
};
TEST(WebURLRequestTest, GET)
{
class BrowserForTest : public BrowserTestHandler
{
public:
BrowserForTest(TestResults &tr): BrowserTestHandler(tr) { }
TEST(WebURLRequestTest, GET) {
class BrowserForTest : public BrowserTestHandler {
public:
explicit BrowserForTest(TestResults &tr) : BrowserTestHandler(tr) { }
void StartTest()
{
void StartTest() {
CefRefPtr<CefRequest> req;
CefRefPtr<CefPostData> postdata;
CefRequest::HeaderMap headers;
req = CefRequest::CreateRequest();
CefString url(
"http://search.twitter.com/search.json?result_type=popular&q=webkit");
CefString method("GET");
req->Set(url, method, postdata, headers);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
req->SetFlags((CefRequest::RequestFlags)(
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_REPORT_RAW_HEADERS |
WUR_FLAG_REPORT_UPLOAD_PROGRESS));
@@ -293,29 +279,26 @@ TEST(WebURLRequestTest, GET)
EXPECT_FALSE(tr.got_error);
EXPECT_FALSE(tr.got_redirect);
EXPECT_FALSE(tr.got_progress);
EXPECT_GT((int)tr.contentLength, 0);
EXPECT_GT(tr.contentLength, static_cast<size_t>(0));
EXPECT_EQ(200, tr.statusCode);
}
TEST(WebURLRequestTest, POST)
{
class BrowserForTest : public BrowserTestHandler
{
public:
BrowserForTest(TestResults &tr): BrowserTestHandler(tr) { }
TEST(WebURLRequestTest, POST) {
class BrowserForTest : public BrowserTestHandler {
public:
explicit BrowserForTest(TestResults &tr) : BrowserTestHandler(tr) { }
void StartTest()
{
void StartTest() {
CefRefPtr<CefRequest> req;
CefRefPtr<CefPostData> postdata;
CefRefPtr<CefPostDataElement> postitem;
CefRequest::HeaderMap headers;
headers.insert(std::make_pair("Content-Type",
headers.insert(std::make_pair("Content-Type",
"application/x-www-form-urlencoded"));
req = CefRequest::CreateRequest();
CefString url("http://pastebin.com/api_public.php");
CefString method("POST");
@@ -323,23 +306,24 @@ TEST(WebURLRequestTest, POST)
postitem = CefPostDataElement::CreatePostDataElement();
static char posttext[] =
"paste_name=CEF%20Test%20Post&paste_code=testing a post call.&paste_expire_date=10M";
"paste_name=CEF%20Test%20Post&paste_code=testing a post call."
"&paste_expire_date=10M";
postitem->SetToBytes(strlen(posttext), posttext);
postdata->AddElement(postitem);
req->Set(url, method, postdata, headers);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
req->SetFlags((CefRequest::RequestFlags)(
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_REPORT_RAW_HEADERS |
WUR_FLAG_REPORT_UPLOAD_PROGRESS));
ASSERT_TRUE(handler->Run(req));
ASSERT_TRUE(handler->Run(req));
}
};
@@ -356,37 +340,34 @@ TEST(WebURLRequestTest, POST)
EXPECT_TRUE(tr.got_progress);
EXPECT_FALSE(tr.got_error);
EXPECT_FALSE(tr.got_abort);
EXPECT_GT((int)tr.contentLength, 0);
EXPECT_GT(tr.contentLength, static_cast<size_t>(0));
EXPECT_EQ(200, tr.statusCode);
}
TEST(WebURLRequestTest, BADHOST)
{
class BrowserForTest : public BrowserTestHandler
{
public:
BrowserForTest(TestResults &tr): BrowserTestHandler(tr) { }
TEST(WebURLRequestTest, BADHOST) {
class BrowserForTest : public BrowserTestHandler {
public:
explicit BrowserForTest(TestResults &tr) : BrowserTestHandler(tr) { }
void StartTest()
{
void StartTest() {
CefRefPtr<CefRequest> req;
CefRefPtr<CefPostData> postdata;
CefRefPtr<CefPostDataElement> postitem;
CefRequest::HeaderMap headers;
req = CefRequest::CreateRequest();
CefString url("http://this.host.does.not.exist/not/really/here");
CefString method("GET");
req->Set(url, method, postdata, headers);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
req->SetFlags((CefRequest::RequestFlags)(
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_REPORT_RAW_HEADERS |
WUR_FLAG_REPORT_UPLOAD_PROGRESS));
@@ -398,7 +379,7 @@ TEST(WebURLRequestTest, BADHOST)
CefRefPtr<BrowserTestHandler> browser = new BrowserForTest(tr);
browser->ExecuteTest();
// NOTE: THIS TEST WILL FAIL IF YOUR ISP REDIRECTS YOU TO
// NOTE: THIS TEST WILL FAIL IF YOUR ISP REDIRECTS YOU TO
// THEIR SEARCH PAGE ON NXDOMAIN ERRORS.
EXPECT_TRUE(tr.got_started);
EXPECT_FALSE(tr.got_headers);
@@ -410,43 +391,39 @@ TEST(WebURLRequestTest, BADHOST)
EXPECT_FALSE(tr.got_abort);
EXPECT_TRUE(tr.got_error);
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, tr.errorCode);
EXPECT_EQ(0, (int)tr.contentLength);
EXPECT_EQ(static_cast<size_t>(0), tr.contentLength);
EXPECT_EQ(0, tr.statusCode);
}
#define COUNTOF_(ar) (sizeof(ar)/sizeof(ar[0]))
TEST(WebURLRequestTest, CANCEL)
{
class BrowserForTest : public BrowserTestHandler
{
public:
TEST(WebURLRequestTest, CANCEL) {
class BrowserForTest : public BrowserTestHandler {
public:
BrowserForTest(TestResults &tr, cef_weburlrequest_state_t cancelAtState)
: BrowserTestHandler(tr, cancelAtState)
{
: BrowserTestHandler(tr, cancelAtState) {
}
void StartTest()
{
void StartTest() {
CefRefPtr<CefRequest> req;
CefRefPtr<CefPostData> postdata;
CefRefPtr<CefPostDataElement> postitem;
CefRequest::HeaderMap headers;
req = CefRequest::CreateRequest();
CefString url(
"http://search.twitter.com/search.json?result_type=popular&q=webkit");
CefString method("GET");
req->Set(url, method, postdata, headers);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
req->SetFlags((CefRequest::RequestFlags)(
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_REPORT_RAW_HEADERS |
WUR_FLAG_REPORT_UPLOAD_PROGRESS));
@@ -455,25 +432,23 @@ TEST(WebURLRequestTest, CANCEL)
};
cef_weburlrequest_state_t cancelAt[] = {
WUR_STATE_STARTED,
WUR_STATE_HEADERS_RECEIVED
WUR_STATE_STARTED,
WUR_STATE_HEADERS_RECEIVED
};
for (unsigned int i=0; i < COUNTOF_(cancelAt); ++i) {
for (unsigned int i = 0; i < COUNTOF_(cancelAt); ++i) {
TestResults tr;
CefRefPtr<BrowserTestHandler> browser = new BrowserForTest(tr, cancelAt[i]);
browser->ExecuteTest();
EXPECT_TRUE(tr.got_abort) << "i = " << i;
EXPECT_TRUE(tr.got_deleted);
}
}
// Enable this test if you have installed the php test page.
#if 0
TEST(WebURLRequestTest, REDIRECT)
{
TEST(WebURLRequestTest, REDIRECT) {
/* // PHP Script for a local server to test this:
// You can run a zwamp server on windows to run this.
// http://sourceforge.net/projects/zwamp/
@@ -498,33 +473,31 @@ else
*/
class BrowserForTest : public BrowserTestHandler
{
class BrowserForTest : public BrowserTestHandler {
public:
BrowserForTest(TestResults &tr): BrowserTestHandler(tr) { }
explicit BrowserForTest(TestResults &tr) : BrowserTestHandler(tr) { }
void StartTest()
{
void StartTest() {
CefRefPtr<CefRequest> req;
CefRefPtr<CefPostData> postdata;
CefRefPtr<CefPostDataElement> postitem;
CefRequest::HeaderMap headers;
req = CefRequest::CreateRequest();
CefString url("http://localhost/cef/redirect.php?max=4");
CefString method("GET");
req->Set(url, method, postdata, headers);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
CefRefPtr<TestWebURLRequestClient> handler =
new TestWebURLRequestClient(test_results_, this);
req->SetFlags((CefRequest::RequestFlags)(
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_REPORT_RAW_HEADERS |
WUR_FLAG_REPORT_UPLOAD_PROGRESS));
WUR_FLAG_SKIP_CACHE |
WUR_FLAG_REPORT_LOAD_TIMING |
WUR_FLAG_REPORT_RAW_HEADERS |
WUR_FLAG_REPORT_UPLOAD_PROGRESS));
ASSERT_TRUE(handler->Run(req, cancelAtState_));
}
@@ -542,9 +515,9 @@ else
EXPECT_FALSE(tr.got_progress);
EXPECT_FALSE(tr.got_error);
EXPECT_FALSE(tr.got_abort);
EXPECT_GT((int)tr.contentLength, 0);
EXPECT_GT(tr.contentLength, static_cast<size_t>(0));
EXPECT_EQ(200, tr.statusCode);
EXPECT_EQ(3, tr.redirectCount);
}
#endif // 0
#endif // 0