Skip to content

Use HeaderName in TestServer #28943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebyhr merged 1 commit into from
Mar 31, 2026
Merged

Use HeaderName in TestServer #28943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions testing/trino-tests/src/test/java/io/trino/tests/TestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ public void testFirstResponseColumns()
{
List<QueryResults> queryResults = postQuery(request -> request
.setBodyGenerator(createStaticBodyGenerator("show catalogs", UTF_8))
.setHeader(TRINO_HEADERS.requestCatalog(), "catalog")
.setHeader(TRINO_HEADERS.requestSchema(), "schema")
.setHeader(TRINO_HEADERS.requestPath(), "path"))
.setHeader(HeaderName.of(TRINO_HEADERS.requestCatalog()), "catalog")
.setHeader(HeaderName.of(TRINO_HEADERS.requestSchema()), "schema")
.setHeader(HeaderName.of(TRINO_HEADERS.requestPath()), "path"))
.map(JsonResponse::getValue)
.collect(toImmutableList());

Expand Down Expand Up @@ -207,13 +207,13 @@ public void testQuery()
ImmutableList.Builder<List<Object>> data = ImmutableList.builder();
QueryResults queryResults = postQuery(request -> request
.setBodyGenerator(createStaticBodyGenerator("show catalogs", UTF_8))
.setHeader(TRINO_HEADERS.requestCatalog(), "catalog")
.setHeader(TRINO_HEADERS.requestSchema(), "schema")
.setHeader(TRINO_HEADERS.requestPath(), "path")
.setHeader(TRINO_HEADERS.requestClientInfo(), "{\"clientVersion\":\"testVersion\"}")
.addHeader(TRINO_HEADERS.requestSession(), QUERY_MAX_MEMORY + "=1GB")
.addHeader(TRINO_HEADERS.requestSession(), JOIN_DISTRIBUTION_TYPE + "=partitioned," + MAX_HASH_PARTITION_COUNT + " = 43")
.addHeader(TRINO_HEADERS.requestPreparedStatement(), "foo=select * from bar"))
.setHeader(HeaderName.of(TRINO_HEADERS.requestCatalog()), "catalog")
.setHeader(HeaderName.of(TRINO_HEADERS.requestSchema()), "schema")
.setHeader(HeaderName.of(TRINO_HEADERS.requestPath()), "path")
.setHeader(HeaderName.of(TRINO_HEADERS.requestClientInfo()), "{\"clientVersion\":\"testVersion\"}")
.addHeader(HeaderName.of(TRINO_HEADERS.requestSession()), QUERY_MAX_MEMORY + "=1GB")
.addHeader(HeaderName.of(TRINO_HEADERS.requestSession()), JOIN_DISTRIBUTION_TYPE + "=partitioned," + MAX_HASH_PARTITION_COUNT + " = 43")
.addHeader(HeaderName.of(TRINO_HEADERS.requestPreparedStatement()), "foo=select * from bar"))
.map(JsonResponse::getValue)
.peek(result -> assertThat(result.getError()).isNull())
.peek(results -> {
Expand Down Expand Up @@ -253,10 +253,10 @@ public void testTransactionSupport()
{
JsonResponse<QueryResults> queryResults = postQuery(request -> request
.setBodyGenerator(createStaticBodyGenerator("start transaction", UTF_8))
.setHeader(TRINO_HEADERS.requestTransactionId(), "none"))
.setHeader(HeaderName.of(TRINO_HEADERS.requestTransactionId()), "none"))
.peek(result -> assertThat(result.getValue().getError()).isNull())
.collect(last());
assertThat(queryResults.getHeader(TRINO_HEADERS.responseStartedTransactionId())).isNotNull();
assertThat(queryResults.getHeader(HeaderName.of(TRINO_HEADERS.responseStartedTransactionId()))).isNotNull();
}

@Test
Expand Down Expand Up @@ -374,7 +374,7 @@ public void testStatusPing()
{
Request request = prepareHead()
.setUri(uriFor("/v1/status"))
.setHeader(TRINO_HEADERS.requestUser(), "unknown")
.setHeader(HeaderName.of(TRINO_HEADERS.requestUser()), "unknown")
.setFollowRedirects(false)
.build();
StatusResponse response = client.execute(request, createStatusResponseHandler());
Expand Down Expand Up @@ -422,8 +422,8 @@ private Stream<JsonResponse<QueryResults>> postQuery(Function<Request.Builder, R
{
Request.Builder request = preparePost()
.setUri(uriFor("/v1/statement"))
.setHeader(TRINO_HEADERS.requestUser(), "user")
.setHeader(TRINO_HEADERS.requestSource(), "source");
.setHeader(HeaderName.of(TRINO_HEADERS.requestUser()), "user")
.setHeader(HeaderName.of(TRINO_HEADERS.requestSource()), "source");
request = requestConfigurer.apply(request);
JsonResponse<QueryResults> queryResults = client.execute(request.build(), createFullJsonResponseHandler(QUERY_RESULTS_CODEC));
return Streams.stream(new QueryResultsIterator(client, queryResults));
Expand Down