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

Remove usage of base::StringPrintf in unit tests (issue #1632)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-11-14 13:28:05 -05:00
parent 03f3900d75
commit 9ed17519a9
3 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/unittests/message_router_unittest.cc
View File

@@ -4,10 +4,9 @@
#include <cstdlib>
#include <set>
#include <sstream>
#include <vector>
#include "base/strings/stringprintf.h"
#include "include/base/cef_bind.h"
#include "include/base/cef_weak_ptr.h"
#include "include/cef_v8.h"
@@ -94,11 +93,10 @@ class MRRenderDelegate : public ClientAppRenderer::Delegate {
}
if (expected_count != actual_count) {
const std::string& exceptionStr =
base::StringPrintf("%s failed; expected %d, got %d",
message_name.c_str(), expected_count,
actual_count);
exception = exceptionStr;
std::stringstream ss;
ss << message_name << " failed; expected " << expected_count <<
", got " << actual_count;
exception = ss.str();
}
}
@@ -439,8 +437,9 @@ class SingleQueryTestHandler : public SingleLoadTestHandler {
std::string GetMainHTML() override {
std::string html;
const std::string& errorCodeStr =
base::StringPrintf("%d", kSingleQueryErrorCode);
std::stringstream ss;
ss << kSingleQueryErrorCode;
const std::string& errorCodeStr = ss.str();
html = "<html><body><script>\n"
// No requests should exist.
@@ -668,10 +667,12 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler {
std::string GetMainHTML() override {
std::string html;
const std::string& responseCountStr =
base::StringPrintf("%d", kSinglePersistentQueryResponseCount);
const std::string& errorCodeStr =
base::StringPrintf("%d", kSingleQueryErrorCode);
std::stringstream ss;
ss << kSinglePersistentQueryResponseCount;
const std::string& responseCountStr = ss.str();
ss.str("");
ss << kSingleQueryErrorCode;
const std::string& errorCodeStr = ss.str();
html = "<html><body><script>\n"
// No requests should exist.
@@ -1674,7 +1675,9 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler {
std::string GetIDString(const std::string& prefix, int index) const {
EXPECT_TRUE(!prefix.empty());
return base::StringPrintf("%s%d", prefix.c_str(), GetIDFromIndex(index));
std::stringstream ss;
ss << prefix << GetIDFromIndex(index);
return ss.str();
}
bool SplitIDString(const std::string& str,
@@ -1691,7 +1694,9 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler {
}
std::string GetIntString(int val) const {
return base::StringPrintf("%d", val);
std::stringstream ss;
ss << val;
return ss.str();
}
int GetIDFromIndex(int index) const { return id_offset_ + index; }
@@ -2010,8 +2015,9 @@ class MultiQueryMultiHandlerTestHandler :
bool persistent,
CefRefPtr<Callback> callback) override {
// Each handler only handles a single request.
const std::string& handled_request =
base::StringPrintf("%s:%d", kMultiQueryRequest, index_);
std::stringstream ss;
ss << kMultiQueryRequest << ":" << index_;
const std::string& handled_request = ss.str();
if (request != handled_request)
return false;