From 5dc314ecf97866ea44bf446905354e5a75cb4900 Mon Sep 17 00:00:00 2001 From: "kkania@chromium.org" Date: Thu, 8 Mar 2012 21:57:40 +0000 Subject: [chromedriver] Use carriage return + newline on windows when logging. Also, change log character limit from 40 to 100. BUG=none TEST=none Review URL: http://codereview.chromium.org/9617028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125695 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/webdriver/webdriver_logging.cc | 9 +++++++-- chrome/test/webdriver/webdriver_util.cc | 9 +++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/chrome/test/webdriver/webdriver_logging.cc b/chrome/test/webdriver/webdriver_logging.cc index 2819421..26f5bb5 100644 --- a/chrome/test/webdriver/webdriver_logging.cc +++ b/chrome/test/webdriver/webdriver_logging.cc @@ -12,6 +12,7 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/time.h" +#include "build/build_config.h" using base::DictionaryValue; using base::ListValue; @@ -124,8 +125,12 @@ void FileLog::Log(LogLevel level, const base::Time& time, if (pad_length < 1) pad_length = 1; std::string padding(pad_length, ' '); - entry += base::StringPrintf( - "%s%s\n", padding.c_str(), message.c_str()); + entry += padding + message; +#if defined(OS_WIN) + entry += "\r\n"; +#else + entry += "\n"; +#endif base::AutoLock auto_lock(lock_); fprintf(file_.get(), "%s", entry.c_str()); diff --git a/chrome/test/webdriver/webdriver_util.cc b/chrome/test/webdriver/webdriver_util.cc index 44f7caf..200ecc0 100644 --- a/chrome/test/webdriver/webdriver_util.cc +++ b/chrome/test/webdriver/webdriver_util.cc @@ -398,12 +398,13 @@ std::string JsonStringify(const Value* value) { namespace { -// Truncates the given string to 40 characters, adding an ellipsis if +// Truncates the given string to 100 characters, adding an ellipsis if // truncation was necessary. void TruncateString(std::string* data) { - if (data->length() > 40) { - data->resize(40); - data->replace(37, 3, "..."); + const size_t kMaxLength = 100; + if (data->length() > kMaxLength) { + data->resize(kMaxLength); + data->replace(kMaxLength - 3, 3, "..."); } } -- cgit v1.1