Skip to content

Commit b9ebb54

Browse files
committed
Fix RequestBuilderTest#testAddOrReplaceCookies
1 parent 3bae974 commit b9ebb54

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> h
186186
List<Cookie> cookies = config.getCookieStore().get(request.getUri());
187187
if (!cookies.isEmpty()) {
188188
RequestBuilder requestBuilder = new RequestBuilder(request);
189-
for (Cookie cookie : cookies)
189+
for (Cookie cookie : cookies) {
190190
requestBuilder.addOrReplaceCookie(cookie);
191-
191+
}
192192
request = requestBuilder.build();
193193
}
194194
} catch (Exception e) {

client/src/main/java/org/asynchttpclient/RequestBuilderBase.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,11 @@ public T addCookie(Cookie cookie) {
306306
return asDerivedType();
307307
}
308308

309+
/**
310+
* Add/replace a cookie based on its name
311+
* @param cookie the new cookie
312+
* @return this
313+
*/
309314
public T addOrReplaceCookie(Cookie cookie) {
310315
String cookieKey = cookie.name();
311316
boolean replace = false;

client/src/test/java/org/asynchttpclient/RequestBuilderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void testSetHeaders() {
132132
assertEquals(requestBuilder.headers.get("Content-Type"), "application/json", "header value incorrect");
133133
}
134134

135-
@Test(enabled = false)
135+
@Test
136136
public void testAddOrReplaceCookies() {
137137
RequestBuilder requestBuilder = new RequestBuilder();
138138
Cookie cookie = new DefaultCookie("name", "value");
@@ -156,7 +156,7 @@ public void testAddOrReplaceCookies() {
156156
assertEquals(requestBuilder.cookies.size(), 1, "cookies size should remain 1 as we just replaced a cookie with same name");
157157
assertEquals(requestBuilder.cookies.get(0), cookie2, "cookie does not match");
158158

159-
Cookie cookie3 = new DefaultCookie("name", "value");
159+
Cookie cookie3 = new DefaultCookie("name2", "value");
160160
cookie3.setDomain("google.com");
161161
cookie3.setPath("/");
162162
cookie3.setMaxAge(1000);

0 commit comments

Comments
 (0)