Skip to content

GitLab

T
tangled
Commit d5813383 authored by Mike Dougherty's avatar Mike Dougherty Committed by Commit Bot
Browse files
Options

[iOS] Replace web::HttpServer in CookiesTestCase 

Changes being made in crrev.com/c/2353092 are breaking these cookie
tests when using web::HttpServer. Since
net::http_server::EmbeddedTestServer supports setting cookie, these
tests can be updated to use the now recommended EmbeddedTestServer and
default handlers.

Bug: 891834
Change-Id: I08bdb620ad15b640c0beae22d712cca9fc5c7407
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363390Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799905}
parent 287097ab
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 93 deletions
ios/chrome/browser/net/BUILD.gn
View file @ d5813383
...@@ -83,7 +83,7 @@ source_set("eg2_tests") { ...@@ -83,7 +83,7 @@ source_set("eg2_tests") {
"//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/testing/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
"//ios/web/public/test/http_server", "//net:test_support",
"//ui/base", "//ui/base",
"//url", "//url",
] ]
......
ios/chrome/browser/net/cookies_egtest.mm
View file @ d5813383
...@@ -8,16 +8,13 @@ ...@@ -8,16 +8,13 @@
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#include "base/ios/ios_util.h" #include "base/strings/stringprintf.h"
#include "base/mac/foundation_util.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h" #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_test_case.h" #import "ios/chrome/test/earl_grey/chrome_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h" #import "ios/testing/earl_grey/earl_grey_test.h"
#include "ios/web/public/test/http_server/html_response_provider.h" #include "net/test/embedded_test_server/default_handlers.h"
#import "ios/web/public/test/http_server/http_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "ios/web/public/test/http_server/http_server_util.h"
#include "ios/web/public/test/http_server/response_provider.h"
#include "url/gurl.h" #include "url/gurl.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
...@@ -26,17 +23,24 @@ ...@@ -26,17 +23,24 @@
namespace { namespace {
const char kTestUrlNormalBrowsing[] = "http://choux/normal/browsing";
const char kTestUrlNormalSetCookie[] = "http://choux/normal/set_cookie";
const char kTestUrlIncognitoBrowsing[] = "http://choux/incognito/browsing";
const char kTestUrlIncognitoSetCookie[] = "http://choux/incognito/set_cookie";
const char kTestResponse[] = "fleur";
NSString* const kNormalCookieName = @"request"; NSString* const kNormalCookieName = @"request";
NSString* const kNormalCookieValue = @"pony"; NSString* const kNormalCookieValue = @"pony";
NSString* const kIncognitoCookieName = @"secret"; NSString* const kIncognitoCookieName = @"secret";
NSString* const kIncognitoCookieValue = @"rainbow"; NSString* const kIncognitoCookieValue = @"rainbow";
std::string CookiePath() {
return base::StringPrintf(
"/set-cookie?%s=%s", base::SysNSStringToUTF8(kNormalCookieName).c_str(),
base::SysNSStringToUTF8(kNormalCookieValue).c_str());
}
std::string IncognitoCookiePath() {
return base::StringPrintf(
"/set-cookie?%s=%s",
base::SysNSStringToUTF8(kIncognitoCookieName).c_str(),
base::SysNSStringToUTF8(kIncognitoCookieValue).c_str());
}
} // namespace } // namespace
@interface CookiesTestCase : ChromeTestCase @interface CookiesTestCase : ChromeTestCase
...@@ -44,52 +48,15 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -44,52 +48,15 @@ NSString* const kIncognitoCookieValue = @"rainbow";
@implementation CookiesTestCase @implementation CookiesTestCase
#pragma mark - Overrides superclass - (void)setUp {
#if defined(CHROME_EARL_GREY_2)
+ (void)setUpForTestCase {
[super setUpForTestCase];
[self setUpHelper];
}
#elif defined(CHROME_EARL_GREY_1)
+ (void)setUp {
[super setUp]; [super setUp];
[self setUpHelper]; net::test_server::RegisterDefaultHandlers(self.testServer);
} GREYAssertTrue(self.testServer->Start(), @"Server did not start.");
#else
#error Not an EarlGrey Test
#endif
+ (void)setUpHelper {
// Creates a map of canned responses and set up the test HTML server.
// |kTestUrlNormalSetCookie| and |kTestUrlIncognitoSetCookie| always sets
// cookie in response header while |kTestUrlNormalBrowsing| and
// |kTestUrlIncognitoBrowsing| doesn't.
std::map<GURL, std::pair<std::string, std::string>> responses;
NSString* normalCookie = [NSString
stringWithFormat:@"%@=%@", kNormalCookieName, kNormalCookieValue];
NSString* incognitoCookie = [NSString
stringWithFormat:@"%@=%@", kIncognitoCookieName, kIncognitoCookieValue];
responses[web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)] =
std::pair<std::string, std::string>("", kTestResponse);
responses[web::test::HttpServer::MakeUrl(kTestUrlNormalSetCookie)] =
std::pair<std::string, std::string>(base::SysNSStringToUTF8(normalCookie),
kTestResponse);
responses[web::test::HttpServer::MakeUrl(kTestUrlIncognitoBrowsing)] =
std::pair<std::string, std::string>("", kTestResponse);
responses[web::test::HttpServer::MakeUrl(kTestUrlIncognitoSetCookie)] =
std::pair<std::string, std::string>(
base::SysNSStringToUTF8(incognitoCookie), kTestResponse);
web::test::SetUpSimpleHttpServerWithSetCookies(responses);
} }
// Clear cookies to make sure that tests do not interfere each other. // Clear cookies to make sure that tests do not interfere each other.
- (void)tearDown { - (void)tearDown {
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
NSString* const clearCookieScript = NSString* const clearCookieScript =
@"var cookies = document.cookie.split(';');" @"var cookies = document.cookie.split(';');"
"for (var i = 0; i < cookies.length; i++) {" "for (var i = 0; i < cookies.length; i++) {"
...@@ -112,8 +79,7 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -112,8 +79,7 @@ NSString* const kIncognitoCookieValue = @"rainbow";
- (void)testClearIncognitoFromMain { - (void)testClearIncognitoFromMain {
// Loads a dummy page in normal tab. Sets a normal test cookie. Verifies that // Loads a dummy page in normal tab. Sets a normal test cookie. Verifies that
// the incognito test cookie is not found. // the incognito test cookie is not found.
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL(CookiePath())];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalSetCookie)];
NSDictionary* cookies = [ChromeEarlGrey cookies]; NSDictionary* cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName], GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName],
@"Failed to set normal cookie in normal mode."); @"Failed to set normal cookie in normal mode.");
...@@ -123,19 +89,17 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -123,19 +89,17 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Opens an incognito tab, loads the dummy page, and sets incognito test // Opens an incognito tab, loads the dummy page, and sets incognito test
// cookie. // cookie.
[ChromeEarlGrey openNewIncognitoTab]; [ChromeEarlGrey openNewIncognitoTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL(IncognitoCookiePath())];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoSetCookie)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName], GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName],
@"Failed to set incognito cookie in incognito mode."); @"Failed to set incognito cookie in incognito mode.");
GREYAssertEqual(1U, cookies.count, GREYAssertEqual(1U, cookies.count,
@"Only one cookie should be found in incognito mode."); @"Only one cookie should be found in incognito mode.");
// Switches back to normal profile by opening up a new tab. Test cookie // Switches back to normal profile by opening up a new tab. Only normal cookie
// should not be found. // should be found.
[ChromeEarlGrey openNewTab]; [ChromeEarlGrey openNewTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName], GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName],
@"Normal cookie should still exist in normal mode."); @"Normal cookie should still exist in normal mode.");
...@@ -146,11 +110,12 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -146,11 +110,12 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Checks that incognito cookie is gone. // Checks that incognito cookie is gone.
[ChromeEarlGrey closeAllIncognitoTabs]; [ChromeEarlGrey closeAllIncognitoTabs];
[ChromeEarlGrey openNewTab]; [ChromeEarlGrey openNewTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqual(0U, cookies.count, GREYAssertEqual(1U, cookies.count,
@"Incognito cookie should be gone from normal mode."); @"Incognito cookie should be gone from normal mode.");
GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName],
@"Failed to set normal cookie in normal mode.");
} }
// Tests that a cookie set in incognito tab is removed after closing all // Tests that a cookie set in incognito tab is removed after closing all
...@@ -158,13 +123,11 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -158,13 +123,11 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// not reappear. // not reappear.
- (void)testClearIncognitoFromIncognito { - (void)testClearIncognitoFromIncognito {
// Loads a page in normal tab. // Loads a page in normal tab.
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
// Opens an incognito tab, loads a page, and sets an incognito cookie. // Opens an incognito tab, loads a page, and sets an incognito cookie.
[ChromeEarlGrey openNewIncognitoTab]; [ChromeEarlGrey openNewIncognitoTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL(IncognitoCookiePath())];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoSetCookie)];
NSDictionary* cookies = [ChromeEarlGrey cookies]; NSDictionary* cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName], GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName],
@"Failed to set incognito cookie in incognito mode."); @"Failed to set incognito cookie in incognito mode.");
...@@ -174,21 +137,18 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -174,21 +137,18 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Closes all incognito tabs and switch back to a normal tab. // Closes all incognito tabs and switch back to a normal tab.
[ChromeEarlGrey closeAllIncognitoTabs]; [ChromeEarlGrey closeAllIncognitoTabs];
[ChromeEarlGrey openNewTab]; [ChromeEarlGrey openNewTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
// Opens a new incognito tab and verify that the previously set cookie // Opens a new incognito tab and verify that the previously set cookie
// is no longer there. // is no longer there.
[ChromeEarlGrey openNewIncognitoTab]; [ChromeEarlGrey openNewIncognitoTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqual(0U, cookies.count, GREYAssertEqual(0U, cookies.count,
@"Incognito cookie should be gone from incognito mode."); @"Incognito cookie should be gone from incognito mode.");
// Verifies that new incognito cookies can be set. // Verifies that new incognito cookies can be set.
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL(IncognitoCookiePath())];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoSetCookie)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName], GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName],
@"Failed to set incognito cookie in incognito mode."); @"Failed to set incognito cookie in incognito mode.");
...@@ -199,8 +159,7 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -199,8 +159,7 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Tests that a cookie set in normal tab is not available in an incognito tab. // Tests that a cookie set in normal tab is not available in an incognito tab.
- (void)testSwitchToIncognito { - (void)testSwitchToIncognito {
// Sets cookie in normal tab. // Sets cookie in normal tab.
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL(CookiePath())];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalSetCookie)];
NSDictionary* cookies = [ChromeEarlGrey cookies]; NSDictionary* cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName], GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName],
@"Normal cookie should still exist in normal mode."); @"Normal cookie should still exist in normal mode.");
...@@ -209,8 +168,7 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -209,8 +168,7 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Switches to a new incognito tab and verifies that cookie is not there. // Switches to a new incognito tab and verifies that cookie is not there.
[ChromeEarlGrey openNewIncognitoTab]; [ChromeEarlGrey openNewIncognitoTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqual(0U, cookies.count, GREYAssertEqual(0U, cookies.count,
@"Normal cookie should not be found in incognito mode."); @"Normal cookie should not be found in incognito mode.");
...@@ -219,8 +177,7 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -219,8 +177,7 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// that the cookie set earlier is still there. // that the cookie set earlier is still there.
[ChromeEarlGrey closeAllIncognitoTabs]; [ChromeEarlGrey closeAllIncognitoTabs];
[ChromeEarlGrey openNewTab]; [ChromeEarlGrey openNewTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects( GREYAssertEqualObjects(
kNormalCookieValue, cookies[kNormalCookieName], kNormalCookieValue, cookies[kNormalCookieName],
...@@ -234,11 +191,9 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -234,11 +191,9 @@ NSString* const kIncognitoCookieValue = @"rainbow";
- (void)testSwitchToMain { - (void)testSwitchToMain {
// Loads a page in normal tab and then switches to a new incognito tab. Sets // Loads a page in normal tab and then switches to a new incognito tab. Sets
// cookie in incognito tab. // cookie in incognito tab.
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
[ChromeEarlGrey openNewIncognitoTab]; [ChromeEarlGrey openNewIncognitoTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL(IncognitoCookiePath())];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoSetCookie)];
NSDictionary* cookies = [ChromeEarlGrey cookies]; NSDictionary* cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName], GREYAssertEqualObjects(kIncognitoCookieValue, cookies[kIncognitoCookieName],
@"Failed to set incognito cookie in incognito mode."); @"Failed to set incognito cookie in incognito mode.");
...@@ -248,16 +203,14 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -248,16 +203,14 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Switches back to a normal tab and verifies that cookie set in incognito tab // Switches back to a normal tab and verifies that cookie set in incognito tab
// is not available. // is not available.
[ChromeEarlGrey openNewTab]; [ChromeEarlGrey openNewTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqual(0U, cookies.count, GREYAssertEqual(0U, cookies.count,
@"Incognito cookie should not be found in normal mode."); @"Incognito cookie should not be found in normal mode.");
// Returns back to Incognito tab and cookie is still there. // Returns back to Incognito tab and cookie is still there.
[ChromeEarlGrey openNewIncognitoTab]; [ChromeEarlGrey openNewIncognitoTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlIncognitoBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects( GREYAssertEqualObjects(
kIncognitoCookieValue, cookies[kIncognitoCookieName], kIncognitoCookieValue, cookies[kIncognitoCookieName],
...@@ -269,8 +222,7 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -269,8 +222,7 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Tests that a cookie set in a normal tab can be found in another normal tab. // Tests that a cookie set in a normal tab can be found in another normal tab.
- (void)testShareCookiesBetweenTabs { - (void)testShareCookiesBetweenTabs {
// Loads page and sets cookie in first normal tab. // Loads page and sets cookie in first normal tab.
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL(CookiePath())];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalSetCookie)];
NSDictionary* cookies = [ChromeEarlGrey cookies]; NSDictionary* cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName], GREYAssertEqualObjects(kNormalCookieValue, cookies[kNormalCookieName],
@"Failed to set normal cookie in normal mode."); @"Failed to set normal cookie in normal mode.");
...@@ -279,8 +231,7 @@ NSString* const kIncognitoCookieValue = @"rainbow"; ...@@ -279,8 +231,7 @@ NSString* const kIncognitoCookieValue = @"rainbow";
// Creates another normal tab and verifies that the cookie is also there. // Creates another normal tab and verifies that the cookie is also there.
[ChromeEarlGrey openNewTab]; [ChromeEarlGrey openNewTab];
[ChromeEarlGrey [ChromeEarlGrey loadURL:self.testServer->GetURL("/echo")];
loadURL:web::test::HttpServer::MakeUrl(kTestUrlNormalBrowsing)];
cookies = [ChromeEarlGrey cookies]; cookies = [ChromeEarlGrey cookies];
GREYAssertEqualObjects( GREYAssertEqualObjects(
kNormalCookieValue, cookies[kNormalCookieName], kNormalCookieValue, cookies[kNormalCookieName],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment