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

136
tests/unittests/stream_unittest.cc
View File

@@ -6,8 +6,7 @@
#include "testing/gtest/include/gtest/gtest.h"
static void VerifyStreamReadBehavior(CefRefPtr<CefStreamReader> stream,
const std::string& contents)
{
const std::string& contents) {
int contentSize = static_cast<int>(contents.size());
const char* contentStr = contents.c_str();
@@ -27,12 +26,12 @@ static void VerifyStreamReadBehavior(CefRefPtr<CefStreamReader> stream,
char buff[10];
int res, read, offset = 0;
do {
read = std::min((int)sizeof(buff), contentSize-offset);
read = std::min(static_cast<int>(sizeof(buff)), contentSize-offset);
res = stream->Read(buff, 1, read);
ASSERT_EQ(read, res);
ASSERT_TRUE(!memcmp(contentStr+offset, buff, res));
offset += res;
} while(offset < contentSize);
} while (offset < contentSize);
// Read past the end of the file
stream->Read(buff, 1, 1);
@@ -40,8 +39,7 @@ static void VerifyStreamReadBehavior(CefRefPtr<CefStreamReader> stream,
}
static void VerifyStreamWriteBehavior(CefRefPtr<CefStreamWriter> stream,
const std::string& contents)
{
const std::string& contents) {
int contentSize = static_cast<int>(contents.size());
const char* contentStr = contents.c_str();
@@ -53,7 +51,7 @@ static void VerifyStreamWriteBehavior(CefRefPtr<CefStreamWriter> stream,
ASSERT_EQ(write, res);
offset += res;
ASSERT_EQ(offset, stream->Tell());
} while(offset < contentSize);
} while (offset < contentSize);
// Move to the beginning of the stream
ASSERT_EQ(0, stream->Seek(-contentSize, SEEK_CUR));
@@ -68,12 +66,11 @@ static void VerifyStreamWriteBehavior(CefRefPtr<CefStreamWriter> stream,
ASSERT_EQ(0, stream->Tell());
}
TEST(StreamTest, ReadFile)
{
TEST(StreamTest, ReadFile) {
const char* fileName = "StreamTest.VerifyReadFile.txt";
CefString fileNameStr = "StreamTest.VerifyReadFile.txt";
std::string contents = "This is my test\ncontents for the file";
// Create the file
FILE* f = NULL;
#ifdef _WIN32
@@ -102,19 +99,19 @@ TEST(StreamTest, ReadFile)
#endif
}
TEST(StreamTest, ReadData)
{
TEST(StreamTest, ReadData) {
std::string contents = "This is my test\ncontents for the file";
// Test the stream
CefRefPtr<CefStreamReader> stream(
CefStreamReader::CreateForData((void*)contents.c_str(), contents.size()));
CefStreamReader::CreateForData(
static_cast<void*>(const_cast<char*>(contents.c_str())),
contents.size()));
ASSERT_TRUE(stream.get() != NULL);
VerifyStreamReadBehavior(stream, contents);
}
TEST(StreamTest, WriteFile)
{
TEST(StreamTest, WriteFile) {
const char* fileName = "StreamTest.VerifyWriteFile.txt";
CefString fileNameStr = "StreamTest.VerifyWriteFile.txt";
std::string contents = "This is my test\ncontents for the file";
@@ -158,45 +155,44 @@ TEST(StreamTest, WriteFile)
bool g_ReadHandlerTesterDeleted = false;
class ReadHandlerTester : public CefReadHandler
{
public:
class ReadHandlerTester : public CefReadHandler {
public:
ReadHandlerTester()
: read_called_(false), read_ptr_(NULL), read_size_(0), read_n_(0),
seek_called_(false), seek_offset_(0), seek_whence_(0),
tell_called_(false), eof_called_(false)
{
: read_called_(false),
read_ptr_(NULL),
read_size_(0),
read_n_(0),
seek_called_(false),
seek_offset_(0),
seek_whence_(0),
tell_called_(false),
eof_called_(false) {
}
virtual ~ReadHandlerTester()
{
virtual ~ReadHandlerTester() {
g_ReadHandlerTesterDeleted = true;
}
virtual size_t Read(void* ptr, size_t size, size_t n)
{
virtual size_t Read(void* ptr, size_t size, size_t n) {
read_called_ = true;
read_ptr_ = ptr;
read_size_ = size;
read_n_ = n;
return 10;
}
virtual int Seek(long offset, int whence)
{
virtual int Seek(int64 offset, int whence) {
seek_called_ = true;
seek_offset_ = offset;
seek_whence_ = whence;
return 10;
}
virtual long Tell()
{
virtual int64 Tell() {
tell_called_ = true;
return 10;
}
virtual int Eof()
{
virtual int Eof() {
eof_called_ = true;
return 10;
}
@@ -207,21 +203,20 @@ public:
size_t read_n_;
bool seek_called_;
long seek_offset_;
int64 seek_offset_;
int seek_whence_;
bool tell_called_;
bool eof_called_;
IMPLEMENT_REFCOUNTING(ReadHandlerTester);
};
TEST(StreamTest, ReadHandler)
{
TEST(StreamTest, ReadHandler) {
ReadHandlerTester* handler = new ReadHandlerTester();
ASSERT_TRUE(handler != NULL);
CefRefPtr<CefStreamReader> stream(CefStreamReader::CreateForHandler(handler));
ASSERT_TRUE(stream.get() != NULL);
@@ -229,7 +224,8 @@ TEST(StreamTest, ReadHandler)
const char* read_ptr = "My data";
size_t read_size = sizeof(read_ptr);
size_t read_n = 1;
size_t read_res = stream->Read((void*)read_ptr, read_size, read_n);
size_t read_res = stream->Read(
static_cast<void*>(const_cast<char*>(read_ptr)), read_size, read_n);
ASSERT_TRUE(handler->read_called_);
ASSERT_EQ((size_t)10, read_res);
ASSERT_EQ(read_ptr, handler->read_ptr_);
@@ -237,7 +233,7 @@ TEST(StreamTest, ReadHandler)
ASSERT_EQ(read_n, handler->read_n_);
// CefReadHandler Seek
long seek_offset = 10;
int64 seek_offset = 10;
int seek_whence = SEEK_CUR;
int seek_res = stream->Seek(seek_offset, seek_whence);
ASSERT_TRUE(handler->seek_called_);
@@ -246,10 +242,10 @@ TEST(StreamTest, ReadHandler)
ASSERT_EQ(seek_whence, handler->seek_whence_);
// CefReadHandler Tell
long tell_res = stream->Tell();
int64 tell_res = stream->Tell();
ASSERT_TRUE(handler->tell_called_);
ASSERT_EQ(10, tell_res);
// CefReadHandler Eof
int eof_res = stream->Eof();
ASSERT_TRUE(handler->eof_called_);
@@ -264,22 +260,24 @@ TEST(StreamTest, ReadHandler)
bool g_WriteHandlerTesterDeleted = false;
class WriteHandlerTester : public CefWriteHandler
{
public:
class WriteHandlerTester : public CefWriteHandler {
public:
WriteHandlerTester()
: write_called_(false), write_ptr_(NULL), write_size_(0), write_n_(0),
seek_called_(false), seek_offset_(0), seek_whence_(0),
tell_called_(false), flush_called_(false)
{
: write_called_(false),
write_ptr_(NULL),
write_size_(0),
write_n_(0),
seek_called_(false),
seek_offset_(0),
seek_whence_(0),
tell_called_(false),
flush_called_(false) {
}
virtual ~WriteHandlerTester()
{
virtual ~WriteHandlerTester() {
g_WriteHandlerTesterDeleted = true;
}
virtual size_t Write(const void* ptr, size_t size, size_t n)
{
virtual size_t Write(const void* ptr, size_t size, size_t n) {
write_called_ = true;
write_ptr_ = ptr;
write_size_ = size;
@@ -287,22 +285,19 @@ public:
return 10;
}
virtual int Seek(long offset, int whence)
{
virtual int Seek(int64 offset, int whence) {
seek_called_ = true;
seek_offset_ = offset;
seek_whence_ = whence;
return 10;
}
virtual long Tell()
{
virtual int64 Tell() {
tell_called_ = true;
return 10;
}
virtual int Flush()
{
virtual int Flush() {
flush_called_ = true;
return 10;
}
@@ -313,21 +308,20 @@ public:
size_t write_n_;
bool seek_called_;
long seek_offset_;
int64 seek_offset_;
int seek_whence_;
bool tell_called_;
bool flush_called_;
IMPLEMENT_REFCOUNTING(WriteHandlerTester);
};
TEST(StreamTest, WriteHandler)
{
TEST(StreamTest, WriteHandler) {
WriteHandlerTester* handler = new WriteHandlerTester();
ASSERT_TRUE(handler != NULL);
CefRefPtr<CefStreamWriter> stream(CefStreamWriter::CreateForHandler(handler));
ASSERT_TRUE(stream.get() != NULL);
@@ -343,7 +337,7 @@ TEST(StreamTest, WriteHandler)
ASSERT_EQ(write_n, handler->write_n_);
// CefWriteHandler Seek
long seek_offset = 10;
int64 seek_offset = 10;
int seek_whence = SEEK_CUR;
int seek_res = stream->Seek(seek_offset, seek_whence);
ASSERT_TRUE(handler->seek_called_);
@@ -352,10 +346,10 @@ TEST(StreamTest, WriteHandler)
ASSERT_EQ(seek_whence, handler->seek_whence_);
// CefWriteHandler Tell
long tell_res = stream->Tell();
int64 tell_res = stream->Tell();
ASSERT_TRUE(handler->tell_called_);
ASSERT_EQ(10, tell_res);
// CefWriteHandler Flush
int flush_res = stream->Flush();
ASSERT_TRUE(handler->flush_called_);