From 25c9c2be246312460f8270f25230c090db701373 Mon Sep 17 00:00:00 2001
From: Dmitriy Dubson <d.dubson@gmail.com>
Date: Wed, 2 Aug 2023 10:15:54 -0400
Subject: [PATCH] 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