From 25c9c2be246312460f8270f25230c090db701373 Mon Sep 17 00:00:00 2001 From: Dmitriy Dubson Date: Wed, 2 Aug 2023 10:15:54 -0400 Subject: [PATCH 1/2] Fix samples test suite execution and failing tests Closes gh-1324 --- .../samples-demo-authorizationserver.gradle | 4 ++++ .../java/sample/DemoAuthorizationServerApplicationTests.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle b/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle index f7eac0a7..2beea056 100644 --- a/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle +++ b/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle @@ -30,3 +30,7 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter" testImplementation "net.sourceforge.htmlunit:htmlunit" } + +test { + useJUnitPlatform() +} diff --git a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java index 92a3bc5c..76cc4318 100644 --- a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java +++ b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java @@ -75,7 +75,8 @@ public class DemoAuthorizationServerApplicationTests { this.webClient.getOptions().setThrowExceptionOnFailingStatusCode(false); WebResponse signInResponse = signIn(page, "user1", "password").getWebResponse(); - assertThat(signInResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND.value()); // there is no "default" index page + + assertThat(signInResponse.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST.value()); // there is no "default" index page } @Test @@ -86,7 +87,7 @@ public class DemoAuthorizationServerApplicationTests { HtmlElement alert = loginErrorPage.querySelector("div[role=\"alert\"]"); assertThat(alert).isNotNull(); - assertThat(alert.getTextContent()).isEqualTo("Bad credentials"); + assertThat(alert.asNormalizedText()).isEqualTo("Invalid username or password."); } @Test From b94ca93216b46c56f5577676439d8cc7f9690b01 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Wed, 16 Aug 2023 09:31:32 -0400 Subject: [PATCH 2/2] Polish gh-1325 --- .../samples-default-authorizationserver.gradle | 4 ++++ .../samples-demo-authorizationserver.gradle | 2 +- .../java/sample/DemoAuthorizationServerApplicationTests.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/samples/default-authorizationserver/samples-default-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle index 3dea316f..e84b55ea 100644 --- a/samples/default-authorizationserver/samples-default-authorizationserver.gradle +++ b/samples/default-authorizationserver/samples-default-authorizationserver.gradle @@ -25,3 +25,7 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter" testImplementation "net.sourceforge.htmlunit:htmlunit" } + +tasks.named("test") { + useJUnitPlatform() +} diff --git a/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle b/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle index 2beea056..34dc9405 100644 --- a/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle +++ b/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle @@ -31,6 +31,6 @@ dependencies { testImplementation "net.sourceforge.htmlunit:htmlunit" } -test { +tasks.named("test") { useJUnitPlatform() } diff --git a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java index 76cc4318..36d121f0 100644 --- a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java +++ b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java @@ -68,7 +68,7 @@ public class DemoAuthorizationServerApplicationTests { } @Test - public void whenLoginSuccessfulThenDisplayNotFoundError() throws IOException { + public void whenLoginSuccessfulThenDisplayBadRequestError() throws IOException { HtmlPage page = this.webClient.getPage("/"); assertLoginPage(page);