From c5a16b584cbfa3a02b50a862e7d43bc1518a7c56 Mon Sep 17 00:00:00 2001 From: Delta456 Date: Tue, 1 Apr 2025 15:23:48 +0530 Subject: [PATCH 1/3] [java] enable safari for CookieImplementationTest --- .../selenium/CookieImplementationTest.java | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/java/test/org/openqa/selenium/CookieImplementationTest.java b/java/test/org/openqa/selenium/CookieImplementationTest.java index 148247a79113e..98d038209e9cf 100644 --- a/java/test/org/openqa/selenium/CookieImplementationTest.java +++ b/java/test/org/openqa/selenium/CookieImplementationTest.java @@ -74,7 +74,6 @@ public void setUp() { } @Test - @NotYetImplemented(SAFARI) public void testShouldGetCookieByName() { String key = generateUniqueKey(); String value = "set"; @@ -87,7 +86,6 @@ public void testShouldGetCookieByName() { } @Test - @NotYetImplemented(SAFARI) @NotWorkingInRemoteBazelBuilds(FIREFOX) public void testShouldBeAbleToAddCookie() { String key = generateUniqueKey(); @@ -104,7 +102,6 @@ public void testShouldBeAbleToAddCookie() { } @Test - @NotYetImplemented(SAFARI) public void testGetAllCookies() { String key1 = generateUniqueKey(); String key2 = generateUniqueKey(); @@ -130,7 +127,6 @@ public void testGetAllCookies() { } @Test - @NotYetImplemented(SAFARI) public void testDeleteAllCookies() { addCookieOnServerSide(new Cookie("foo", "set")); assertSomeCookiesArePresent(); @@ -144,7 +140,6 @@ public void testDeleteAllCookies() { } @Test - @NotYetImplemented(SAFARI) public void testDeleteCookieWithName() { String key1 = generateUniqueKey(); String key2 = generateUniqueKey(); @@ -166,7 +161,6 @@ public void testDeleteCookieWithName() { } @Test - @NotYetImplemented(SAFARI) public void testShouldNotDeleteCookiesWithASimilarName() { String cookieOneName = "fish"; Cookie cookie1 = new Cookie.Builder(cookieOneName, "cod").build(); @@ -187,7 +181,6 @@ public void testShouldNotDeleteCookiesWithASimilarName() { } @Test - @NotYetImplemented(SAFARI) public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() { driver.get(domainHelper.getUrlForFirstValidHostname("/common/animals")); Cookie cookie1 = new Cookie.Builder("fish", "cod").path("/common/animals").build(); @@ -224,7 +217,6 @@ public void testGetCookiesInAFrame() { } @Test - @NotYetImplemented(SAFARI) public void testCannotGetCookiesWithPathDifferingOnlyInCase() { String cookieName = "fish"; Cookie cookie = new Cookie.Builder(cookieName, "cod").path("/Common/animals").build(); @@ -235,7 +227,7 @@ public void testCannotGetCookiesWithPathDifferingOnlyInCase() { } @Test - @NotYetImplemented(SAFARI) + public void testShouldNotGetCookieOnDifferentDomain() { assumeTrue(domainHelper.checkHasValidAlternateHostname()); @@ -249,7 +241,6 @@ public void testShouldNotGetCookieOnDifferentDomain() { } @Test - @NotYetImplemented(SAFARI) @NotWorkingInRemoteBazelBuilds(FIREFOX) public void testShouldBeAbleToAddToADomainWhichIsRelatedToTheCurrentDomain() { String cookieName = "name"; @@ -289,7 +280,7 @@ void testShouldBeAbleToIncludeLeadingPeriodInDomainName() { } @Test - @NotYetImplemented(SAFARI) + @NotWorkingInRemoteBazelBuilds(FIREFOX) public void testShouldBeAbleToSetDomainToTheCurrentDomain() throws Exception { URI url = new URI(driver.getCurrentUrl()); @@ -304,7 +295,7 @@ public void testShouldBeAbleToSetDomainToTheCurrentDomain() throws Exception { } @Test - @NotYetImplemented(SAFARI) + @NotWorkingInRemoteBazelBuilds(CHROME) @NotWorkingInRemoteBazelBuilds(EDGE) @NotWorkingInRemoteBazelBuilds(FIREFOX) @@ -336,7 +327,7 @@ public void testShouldWalkThePathToDeleteACookie() { } @Test - @NotYetImplemented(SAFARI) + @NotWorkingInRemoteBazelBuilds(FIREFOX) public void testShouldIgnoreThePortNumberOfTheHostWhenSettingTheCookie() throws Exception { URI uri = new URI(driver.getCurrentUrl()); @@ -352,7 +343,7 @@ public void testShouldIgnoreThePortNumberOfTheHostWhenSettingTheCookie() throws } @Test - @NotYetImplemented(SAFARI) + @NotWorkingInRemoteBazelBuilds(CHROME) @NotWorkingInRemoteBazelBuilds(EDGE) @NotWorkingInRemoteBazelBuilds(FIREFOX) @@ -383,7 +374,7 @@ public void testCookieEqualityAfterSetAndGet() { } @Test - @NotYetImplemented(SAFARI) + public void testRetainsCookieExpiry() { Cookie addedCookie = new Cookie.Builder("fish", "cod") @@ -470,7 +461,7 @@ public void testRetainsHttpOnlyFlag() { } @Test - @NotYetImplemented(SAFARI) + public void testSettingACookieThatExpiredInThePast() { long expires = System.currentTimeMillis() - 1000; Cookie cookie = new Cookie.Builder("expired", "yes").expiresOn(new Date(expires)).build(); @@ -483,7 +474,7 @@ public void testSettingACookieThatExpiredInThePast() { } @Test - @NotYetImplemented(SAFARI) + public void testCanSetCookieWithoutOptionalFieldsSet() { String key = generateUniqueKey(); String value = "foo"; @@ -496,7 +487,7 @@ public void testCanSetCookieWithoutOptionalFieldsSet() { } @Test - @NotYetImplemented(SAFARI) + public void testDeleteNotExistedCookie() { String key = generateUniqueKey(); assertCookieIsNotPresentWithName(key); @@ -637,7 +628,7 @@ private void addCookieOnServerSide(Cookie cookie) { } @Test - @NotYetImplemented(SAFARI) + public void deleteAllCookies() { assumeTrue(domainHelper.checkHasValidAlternateHostname()); From 2c262803523e7233adef404b71919d45409f2f7b Mon Sep 17 00:00:00 2001 From: Delta456 Date: Tue, 1 Apr 2025 15:28:15 +0530 Subject: [PATCH 2/3] remove newline --- .../org/openqa/selenium/CookieImplementationTest.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/java/test/org/openqa/selenium/CookieImplementationTest.java b/java/test/org/openqa/selenium/CookieImplementationTest.java index 98d038209e9cf..426df8aabace5 100644 --- a/java/test/org/openqa/selenium/CookieImplementationTest.java +++ b/java/test/org/openqa/selenium/CookieImplementationTest.java @@ -227,7 +227,6 @@ public void testCannotGetCookiesWithPathDifferingOnlyInCase() { } @Test - public void testShouldNotGetCookieOnDifferentDomain() { assumeTrue(domainHelper.checkHasValidAlternateHostname()); @@ -280,7 +279,6 @@ void testShouldBeAbleToIncludeLeadingPeriodInDomainName() { } @Test - @NotWorkingInRemoteBazelBuilds(FIREFOX) public void testShouldBeAbleToSetDomainToTheCurrentDomain() throws Exception { URI url = new URI(driver.getCurrentUrl()); @@ -295,7 +293,6 @@ public void testShouldBeAbleToSetDomainToTheCurrentDomain() throws Exception { } @Test - @NotWorkingInRemoteBazelBuilds(CHROME) @NotWorkingInRemoteBazelBuilds(EDGE) @NotWorkingInRemoteBazelBuilds(FIREFOX) @@ -327,7 +324,6 @@ public void testShouldWalkThePathToDeleteACookie() { } @Test - @NotWorkingInRemoteBazelBuilds(FIREFOX) public void testShouldIgnoreThePortNumberOfTheHostWhenSettingTheCookie() throws Exception { URI uri = new URI(driver.getCurrentUrl()); @@ -343,7 +339,6 @@ public void testShouldIgnoreThePortNumberOfTheHostWhenSettingTheCookie() throws } @Test - @NotWorkingInRemoteBazelBuilds(CHROME) @NotWorkingInRemoteBazelBuilds(EDGE) @NotWorkingInRemoteBazelBuilds(FIREFOX) @@ -374,7 +369,6 @@ public void testCookieEqualityAfterSetAndGet() { } @Test - public void testRetainsCookieExpiry() { Cookie addedCookie = new Cookie.Builder("fish", "cod") @@ -461,7 +455,6 @@ public void testRetainsHttpOnlyFlag() { } @Test - public void testSettingACookieThatExpiredInThePast() { long expires = System.currentTimeMillis() - 1000; Cookie cookie = new Cookie.Builder("expired", "yes").expiresOn(new Date(expires)).build(); @@ -474,7 +467,6 @@ public void testSettingACookieThatExpiredInThePast() { } @Test - public void testCanSetCookieWithoutOptionalFieldsSet() { String key = generateUniqueKey(); String value = "foo"; @@ -487,7 +479,6 @@ public void testCanSetCookieWithoutOptionalFieldsSet() { } @Test - public void testDeleteNotExistedCookie() { String key = generateUniqueKey(); assertCookieIsNotPresentWithName(key); @@ -628,7 +619,6 @@ private void addCookieOnServerSide(Cookie cookie) { } @Test - public void deleteAllCookies() { assumeTrue(domainHelper.checkHasValidAlternateHostname()); From 482f199c056017305d6fbe6402a097de15369929 Mon Sep 17 00:00:00 2001 From: Delta456 Date: Tue, 1 Apr 2025 16:00:44 +0530 Subject: [PATCH 3/3] fmt --- java/test/org/openqa/selenium/CookieImplementationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java/test/org/openqa/selenium/CookieImplementationTest.java b/java/test/org/openqa/selenium/CookieImplementationTest.java index 426df8aabace5..ec1dbe3ffd2d4 100644 --- a/java/test/org/openqa/selenium/CookieImplementationTest.java +++ b/java/test/org/openqa/selenium/CookieImplementationTest.java @@ -38,7 +38,6 @@ import org.openqa.selenium.testing.JupiterTestBase; import org.openqa.selenium.testing.NeedsSecureServer; import org.openqa.selenium.testing.NotWorkingInRemoteBazelBuilds; -import org.openqa.selenium.testing.NotYetImplemented; import org.openqa.selenium.testing.SwitchToTopAfterTest; @NeedsSecureServer