Skip to content

consistency in tests in regards to usage of POST #385

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
timea-solid merged 3 commits into from
Mar 27, 2023
Merged

consistency in tests in regards to usage of POST #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8600a0
consistency in tests in regards to POST
timea-solid Mar 27, 2023
66f9059
Merge branch 'main' into postImprovements
timea-solid Mar 27, 2023
2879a7c
Merge branch 'main' into postImprovements
timea-solid Mar 27, 2023
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
6 changes: 3 additions & 3 deletions core/src/test/java/com/inrupt/client/core/DefaultClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ void testOfStringPublisherUmaSession() throws IOException, InterruptedException
final String token = generateIdToken(claims);

final Request request = Request.newBuilder()
.uri(URI.create(baseUri.get() + "/postString"))
.uri(URI.create(baseUri.get() + "/postStringContainer/"))
.header("Content-Type", "text/plain")
.POST(Request.BodyPublishers.ofString("Test String 1"))
.build();
Expand All @@ -356,7 +356,7 @@ void testOfStringPublisherUmaSession() throws IOException, InterruptedException
@Test
void testOfStringPublisherUmaAnonSession() throws IOException, InterruptedException {
final Request request = Request.newBuilder()
.uri(URI.create(baseUri.get() + "/postString"))
.uri(URI.create(baseUri.get() + "/postStringContainer/"))
.header("Content-Type", "text/plain")
.POST(Request.BodyPublishers.ofString("Test String 1"))
.build();
Expand Down Expand Up @@ -387,7 +387,7 @@ void testUmaSessionExpiredIdToken() throws Exception {
await().atMost(5, SECONDS).until(() -> !s.getCredential(OpenIdSession.ID_TOKEN, null).isPresent());

final Request request = Request.newBuilder()
.uri(URI.create(baseUri.get() + "/postString"))
.uri(URI.create(baseUri.get() + "/postStringContainer/"))
.header("Content-Type", "text/plain")
.POST(Request.BodyPublishers.ofString("Test String 1"))
.build();
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/com/inrupt/client/core/MockHttpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private void setupMocks() {
.withStatus(401)
.withHeader("WWW-Authenticate", "Bearer,DPoP algs=\"ES256\"")));

wireMockServer.stubFor(post(urlEqualTo("/postString"))
wireMockServer.stubFor(post(urlEqualTo("/postStringContainer/"))
.atPriority(1)
.withHeader("User-Agent", equalTo(USER_AGENT))
.withRequestBody(matching("Test String 1"))
Expand All @@ -138,7 +138,7 @@ private void setupMocks() {
.willReturn(aResponse()
.withStatus(201)));

wireMockServer.stubFor(post(urlEqualTo("/postString"))
wireMockServer.stubFor(post(urlEqualTo("/postStringContainer/"))
.atPriority(2)
.withHeader("User-Agent", equalTo(USER_AGENT))
.willReturn(aResponse()
Expand Down
2 changes: 1 addition & 1 deletion test/src/main/java/com/inrupt/client/test/HttpMockService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private void setupMocks() {
.withHeader(CONTENT_TYPE, TEXT_TURTLE)
.withBodyFile("profileExample.ttl")));

wireMockServer.stubFor(post(urlEqualTo("/rdf"))
wireMockServer.stubFor(post(urlEqualTo("/rdf/"))
.withRequestBody(equalTo(
"<http://example.test/s> " +
"<http://example.test/p> \"object\" ."))
Expand Down
2 changes: 1 addition & 1 deletion test/src/main/java/com/inrupt/client/test/HttpServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void testSendRequestImage() throws IOException {

@Test
void testPostTriple() throws IOException {
final URI uri = URI.create(config.get(HTTP_URI) + "/rdf");
final URI uri = URI.create(config.get(HTTP_URI) + "/rdf/");
final String triple = "<http://example.test/s> <http://example.test/p> \"object\" .";
final Request request = Request.newBuilder()
.uri(uri)
Expand Down