Merge branch '1.1.x'

Author: jgrandja

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()
+}

samples/demo-authorizationserver/samples-demo-authorizationserver.gradle

@@ -30,3 +30,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter"
 	testImplementation "net.sourceforge.htmlunit:htmlunit"
 }
+
+tasks.named("test") {
+	useJUnitPlatform()
+}

samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java

@@ -68,14 +68,15 @@ public void setUp() {
 	}
 
 	@Test
-	public void whenLoginSuccessfulThenDisplayNotFoundError() throws IOException {
+	public void whenLoginSuccessfulThenDisplayBadRequestError() throws IOException {
 		HtmlPage page = this.webClient.getPage("/");
 
 		assertLoginPage(page);
 
 		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 void whenLoginFailsThenDisplayBadCredentials() throws IOException {
 
 		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