From 3403e9496c3f7a57fbc27c4964d0d02c19b082f0 Mon Sep 17 00:00:00 2001 From: "kkania@chromium.org" Date: Fri, 1 Mar 2013 03:22:41 +0000 Subject: [chromedriver] Rework version check and populate session capabilities. Before, chromedriver was checking the version by connecting to the first renderer and parsing the user agent via js. It is much simpler to just check via the remote debugger server handler /json/version. Move the capability info to the Session struct, and include the Chrome and ChromeDriver version for most Status errors. BUG=174905 Review URL: https://chromiumcodereview.appspot.com/12321118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185435 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/chromedriver/command_executor_impl_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/test/chromedriver/command_executor_impl_unittest.cc') diff --git a/chrome/test/chromedriver/command_executor_impl_unittest.cc b/chrome/test/chromedriver/command_executor_impl_unittest.cc index 61c7ffb..af37070 100644 --- a/chrome/test/chromedriver/command_executor_impl_unittest.cc +++ b/chrome/test/chromedriver/command_executor_impl_unittest.cc @@ -25,7 +25,7 @@ TEST(CommandExecutorImplTest, UnknownCommand) { ASSERT_TRUE(value->GetAsDictionary(&error)); std::string error_msg; ASSERT_TRUE(error->GetString("message", &error_msg)); - ASSERT_STREQ("unknown command: noSuchCommand", error_msg.c_str()); + ASSERT_NE(std::string::npos, error_msg.find("noSuchCommand")); ASSERT_STREQ("session", session_id.c_str()); } @@ -127,5 +127,5 @@ TEST(CommandExecutorImplTest, CommandThatReturnsError) { ASSERT_TRUE(value->GetAsDictionary(&error)); std::string message; ASSERT_TRUE(error->GetString("message", &message)); - ASSERT_STREQ(Status(kUnknownError).message().c_str(), message.c_str()); + ASSERT_NE(std::string::npos, message.find("unknown error")); } -- cgit v1.1