Skip to content

Commit 7fe9b6d

Browse files
rob-bygraverob-bygrave
authored
Merge pull request #224 from avaje/feature/update-tests-httpclient
Update the tests to use HttpClient (from HttpClientContext)
2 parents 6870b33 + d31af6a commit 7fe9b6d

File tree

13 files changed

+47
-50
lines changed

13 files changed

+47
-50
lines changed

‎http-client/src/test/java/io/avaje/http/client/AsyncTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
class AsyncTest extends BaseWebTest {
1515

16-
final HttpClientContext clientContext = client();
16+
final HttpClient clientContext = client();
1717

1818
@Test
19-
void waitForAsync() {
19+
void waitForAsync() {
2020
final CompletableFuture<HttpResponse<Stream<String>>> future = clientContext.request()
2121
.path("hello").path("stream")
2222
.GET()

‎http-client/src/test/java/io/avaje/http/client/AuthTokenTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public AuthToken obtainToken(HttpClientRequest tokenRequest) {
4545
@Test
4646
void sendEmail() {
4747

48-
HttpClientContext ctx = HttpClientContext.builder()
48+
var ctx = HttpClient.builder()
4949
.baseUrl("https://foo")
5050
.bodyAdapter(new JacksonBodyAdapter(objectMapper))
5151
.authTokenProvider(new MyAuthTokenProvider())

‎http-client/src/test/java/io/avaje/http/client/BaseWebTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.avaje.http.client;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import org.example.webserver.App;
54
import io.javalin.Javalin;
5+
import org.example.webserver.App;
66
import org.junit.jupiter.api.AfterAll;
77
import org.junit.jupiter.api.BeforeAll;
88

@@ -25,8 +25,8 @@ public static void shutdown() {
2525
webServer.stop();
2626
}
2727

28-
public static HttpClientContext client() {
29-
return HttpClientContext.builder()
28+
public static HttpClient client() {
29+
return HttpClient.builder()
3030
.baseUrl(baseUrl)
3131
.connectionTimeout(Duration.ofSeconds(1))
3232
.requestTimeout(Duration.ofSeconds(1))

‎http-client/src/test/java/io/avaje/http/client/BasicAuthInterceptTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void encode() {
1818
void beforeRequest() {
1919
// setup
2020
final BasicAuthIntercept intercept = new BasicAuthIntercept("Aladdin", "open sesame");
21-
final HttpClientContext ctx = HttpClientContext.builder().baseUrl("junk").build();
21+
final var ctx = HttpClient.builder().baseUrl("junk").build();
2222

2323
// act
2424
final HttpClientRequest request = ctx.request();

‎http-client/src/test/java/io/avaje/http/client/DHttpApiTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import io.avaje.jsonb.Jsonb;
44
import org.example.github.Repo;
5+
import org.example.github.RepoJsonAdapter;
56
import org.example.github.Simple;
67
import org.example.github.httpclient.Simple$HttpClient;
7-
import org.example.github.RepoJsonAdapter;
88
import org.junit.jupiter.api.Disabled;
99
import org.junit.jupiter.api.Test;
1010

@@ -18,7 +18,7 @@ class DHttpApiTest {
1818
@Test
1919
void test_github_listRepos() {
2020

21-
final HttpClientContext clientContext = HttpClientContext.builder()
21+
final var clientContext = HttpClient.builder()
2222
.baseUrl("https://api.github.com")
2323
.bodyAdapter(new JacksonBodyAdapter())
2424
.build();

‎http-client/src/test/java/io/avaje/http/client/HelloBasicAuthTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
class HelloBasicAuthTest extends BaseWebTest {
1111

12-
final HttpClientContext clientContext = client();
12+
final HttpClient clientContext = client();
1313

14-
public static HttpClientContext client() {
15-
return HttpClientContext.builder()
14+
public static HttpClient client() {
15+
return HttpClient.builder()
1616
.baseUrl(baseUrl)
1717
.bodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
1818
.requestIntercept(new BasicAuthIntercept("rob", "bot"))

‎http-client/src/test/java/io/avaje/http/client/HelloControllerTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class HelloControllerTest extends BaseWebTest {
3030

3131
private static final ObjectMapper objectMapper = new ObjectMapper();
3232

33-
final HttpClientContext clientContext = client();
33+
final HttpClient clientContext = client();
3434

3535
@Test
3636
void newClientTest() {
@@ -77,7 +77,7 @@ void queryParamMap() {
7777
assertThat(hres.statusCode()).isEqualTo(200);
7878
assertThat(hres.uri().toString()).isEqualTo("http://localhost:8889/hello/message?A=a&B=b");
7979

80-
HttpClientContext.Metrics metrics = clientContext.metrics();
80+
HttpClient.Metrics metrics = clientContext.metrics();
8181
assertThat(metrics.totalCount()).isEqualTo(1);
8282
assertThat(metrics.errorCount()).isEqualTo(0);
8383
assertThat(metrics.responseBytes()).isGreaterThan(0);
@@ -116,7 +116,7 @@ void asLines_async() throws ExecutionException, InterruptedException {
116116

117117
assertThat(lines).hasSize(4);
118118
assertThat(lines.get(0)).contains("{\"id\":1, \"name\":\"one\"}");
119-
HttpClientContext.Metrics metrics = clientContext.metrics();
119+
HttpClient.Metrics metrics = clientContext.metrics();
120120
assertThat(metrics.totalCount()).isEqualTo(1);
121121
assertThat(metrics.errorCount()).isEqualTo(0);
122122
assertThat(metrics.responseBytes()).isEqualTo(0);
@@ -281,7 +281,7 @@ void get_stream_NotFoundException() {
281281

282282
assertThat(httpException.statusCode()).isEqualTo(404);
283283
assertThat(httpException.httpResponse().statusCode()).isEqualTo(404);
284-
HttpClientContext.Metrics metrics = clientContext.metrics(true);
284+
HttpClient.Metrics metrics = clientContext.metrics(true);
285285
assertThat(metrics.totalCount()).isEqualTo(1);
286286
assertThat(metrics.errorCount()).isEqualTo(1);
287287
assertThat(metrics.responseBytes()).isEqualTo(0);
@@ -475,7 +475,7 @@ void get_notFound() {
475475

476476
assertThat(hres.statusCode()).isEqualTo(404);
477477
assertThat(hres.body()).contains("Not Found");
478-
HttpClientContext.Metrics metrics = clientContext.metrics(true);
478+
HttpClient.Metrics metrics = clientContext.metrics(true);
479479
assertThat(metrics.totalCount()).isEqualTo(1);
480480
assertThat(metrics.errorCount()).isEqualTo(1);
481481
assertThat(metrics.responseBytes()).isGreaterThan(0);
@@ -506,11 +506,11 @@ void asPlainString_200() {
506506
void asPlainString_throwingHttpException() {
507507
final HttpException httpException = assertThrows(HttpException.class, () ->
508508
clientContext.request()
509-
.path("hello/saveform3")
510-
.formParam("name", "Bax")
511-
.formParam("email", "notValidEmail")
512-
.POST()
513-
.asPlainString());
509+
.path("hello/saveform3")
510+
.formParam("name", "Bax")
511+
.formParam("email", "notValidEmail")
512+
.POST()
513+
.asPlainString());
514514

515515
assertThat(httpException.statusCode()).isEqualTo(422);
516516

@@ -532,7 +532,7 @@ void asString_readInvalidResponse() {
532532
assertThat(hres.statusCode()).isEqualTo(422);
533533

534534
// convert json error response body to a bean
535-
final ErrorResponse errorResponse = clientContext.converters()
535+
final ErrorResponse errorResponse = clientContext.bodyAdapter()
536536
.beanReader(ErrorResponse.class).readBody(hres.body());
537537

538538
final Map<String, String> errorMap = errorResponse.getErrors();
@@ -936,7 +936,7 @@ void async_whenComplete_throwingHttpException() {
936936
} catch (CompletionException e) {
937937
assertThat(e.getCause()).isSameAs(causeRef.get());
938938
}
939-
HttpClientContext.Metrics metrics = clientContext.metrics(true);
939+
HttpClient.Metrics metrics = clientContext.metrics(true);
940940
assertThat(metrics.totalCount()).isEqualTo(1);
941941
assertThat(metrics.errorCount()).isEqualTo(1);
942942
assertThat(metrics.responseBytes()).isGreaterThan(0);
@@ -981,8 +981,8 @@ void post_bean_returningBean_usingExplicitConverters() {
981981

982982
HelloDto dto = new HelloDto(12, "rob", "other");
983983

984-
final BodyWriter from = clientContext.converters().beanWriter(HelloDto.class);
985-
final BodyReader<HelloDto> toDto = clientContext.converters().beanReader(HelloDto.class);
984+
final BodyWriter from = clientContext.bodyAdapter().beanWriter(HelloDto.class);
985+
final BodyReader<HelloDto> toDto = clientContext.bodyAdapter().beanReader(HelloDto.class);
986986

987987
final HelloDto bean = clientContext.request()
988988
.path("hello")

‎http-client/src/test/java/io/avaje/http/client/RequestListenerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public void response(Event event) {
3232
}
3333
}
3434

35-
private HttpClientContext createClient(TDRequestListener tdRequestListener) {
36-
return HttpClientContext.builder()
35+
private HttpClient createClient(TDRequestListener tdRequestListener) {
36+
return HttpClient.builder()
3737
.baseUrl(baseUrl)
3838
.requestLogging(false)
3939
.requestListener(new RequestLogger())
@@ -45,7 +45,7 @@ private HttpClientContext createClient(TDRequestListener tdRequestListener) {
4545
@Test
4646
void get_no_request_body() {
4747
final TDRequestListener tdRequestListener = new TDRequestListener(false);
48-
final HttpClientContext client = createClient(tdRequestListener);
48+
final HttpClient client = createClient(tdRequestListener);
4949

5050
final HttpResponse<String> hres = client.request()
5151
.path("hello").path("message")
@@ -58,7 +58,7 @@ void get_no_request_body() {
5858
@Test
5959
void post() {
6060
final TDRequestListener tdRequestListener = new TDRequestListener(true);
61-
final HttpClientContext client = createClient(tdRequestListener);
61+
final HttpClient client = createClient(tdRequestListener);
6262

6363
final HttpResponse<String> hres = client.request()
6464
.path("post")

‎http-client/src/test/java/io/avaje/http/client/RetryTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
class RetryTest extends BaseWebTest {
1010

1111

12-
HttpClientContext initClientWithRetry(MyIntercept myIntercept, RetryHandler retryHandler) {
13-
return HttpClientContext.builder()
12+
HttpClient initClientWithRetry(MyIntercept myIntercept, RetryHandler retryHandler) {
13+
return HttpClient.builder()
1414
.baseUrl("http://localhost:8889")
1515
.bodyAdapter(new JacksonBodyAdapter())
1616
.retryHandler(retryHandler)
@@ -21,18 +21,18 @@ HttpClientContext initClientWithRetry(MyIntercept myIntercept, RetryHandler retr
2121
@Test
2222
void retryTest() {
2323
final MyIntercept myIntercept = new MyIntercept();
24-
final HttpClientContext clientContext = initClientWithRetry(myIntercept, new SimpleRetryHandler(4, 1));
24+
final HttpClient clientContext = initClientWithRetry(myIntercept, new SimpleRetryHandler(4, 1));
2525
performGetRequestAndAssert(myIntercept, clientContext);
2626
}
2727

2828
@Test
2929
void retryWithGitterTest() {
3030
final MyIntercept myIntercept = new MyIntercept();
31-
final HttpClientContext clientContext = initClientWithRetry(myIntercept, new SimpleRetryHandler(4, 10, 20));
31+
final HttpClient clientContext = initClientWithRetry(myIntercept, new SimpleRetryHandler(4, 10, 20));
3232
performGetRequestAndAssert(myIntercept, clientContext);
3333
}
3434

35-
private void performGetRequestAndAssert(MyIntercept myIntercept, HttpClientContext clientContext) {
35+
private void performGetRequestAndAssert(MyIntercept myIntercept, HttpClient clientContext) {
3636
HttpResponse<String> res = clientContext.request()
3737
.label("http_client_hello_retry")
3838
.path("hello/retry")

‎http-client/src/test/java/io/avaje/http/client/VerbTest.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,20 @@
33
import org.junit.jupiter.api.Disabled;
44
import org.junit.jupiter.api.Test;
55

6-
import java.io.InputStream;
76
import java.net.URI;
87
import java.net.URISyntaxException;
98
import java.net.URL;
109
import java.net.http.HttpRequest;
1110
import java.net.http.HttpResponse;
1211
import java.nio.charset.StandardCharsets;
1312
import java.nio.file.Path;
14-
import java.util.function.Supplier;
1513

1614
import static org.assertj.core.api.Assertions.assertThat;
1715
import static org.junit.jupiter.api.Assertions.assertThrows;
18-
import static org.junit.jupiter.api.Assertions.fail;
1916

2017
public class VerbTest extends BaseWebTest {
2118

22-
private final HttpClientContext clientContext = client();
19+
private final HttpClient clientContext = client();
2320

2421
@Test
2522
void post() {
@@ -148,9 +145,9 @@ void delete_with_body_Path_NotFound_expects_IllegalArgumentException() {
148145
@Test
149146
void delete_with_body_InputStream() {
150147
HttpResponse<String> res = clientContext.request()
151-
.path("delete")
152-
.body(() -> getClass().getResourceAsStream("/dummy.txt"))
153-
.DELETE().asString();
148+
.path("delete")
149+
.body(() -> getClass().getResourceAsStream("/dummy.txt"))
150+
.DELETE().asString();
154151

155152
assertThat(res.body()).isEqualTo("delete body[dummyFileContent]");
156153
}
@@ -183,7 +180,7 @@ void get_BodyHandler_null_expect() {
183180

184181
HttpResponse<String> res = clientContext.request()
185182
.path("post")
186-
.body((HttpRequest.BodyPublisher)null)
183+
.body((HttpRequest.BodyPublisher) null)
187184
.POST().asString();
188185

189186
assertThat(res.body()).isEqualTo("post");

0 commit comments

Comments
 (0)