Restore Original Tests in JdbcJsonAttributeTests

Author: rwinch

spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java

@@ -1,13 +1,9 @@
 package sample;
 
-import java.sql.Types;
 import java.util.Base64;
-import java.util.List;
-import java.util.Map;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.Cookie;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -51,11 +47,20 @@ void setup() {
 
 	@Test
 	void loginShouldSaveSecurityContextAsJson() throws Exception {
-		Cookie sessionCookie = this.mvc.perform(formLogin().user("rüdiger").password("password"))
-			.andExpect(authenticated())
-			.andReturn()
-			.getResponse()
-			.getCookie("SESSION");
+		loginShouldSaveSecurityContextAsJson("user");
+	}
+
+	@Test
+	void loginShouldSaveSecurityContextAsJsonWhenSpecialCharacters() throws Exception {
+		loginShouldSaveSecurityContextAsJson("rüdiger");
+	}
+
+	private void loginShouldSaveSecurityContextAsJson(String username) throws Exception {
+		Cookie sessionCookie = this.mvc.perform(formLogin().user(username).password("password"))
+				.andExpect(authenticated())
+				.andReturn()
+				.getResponse()
+				.getCookie("SESSION");
 		String sessionId = new String(Base64.getDecoder().decode(sessionCookie.getValue()));
 		Object attributeBytes = this.jdbcClient.sql("""
 				SELECT attribute_bytes::text FROM spring_session_attributes
@@ -66,20 +71,29 @@ void loginShouldSaveSecurityContextAsJson() throws Exception {
 		SecurityContext securityContext = this.objectMapperWithModules.readValue((String) attributeBytes,
 				SecurityContext.class);
 		assertThat(securityContext).isNotNull();
-		assertThat(securityContext.getAuthentication().getName()).isEqualTo("rüdiger");
+		assertThat(securityContext.getAuthentication().getName()).isEqualTo(username);
 	}
 
 	@Test
 	void loginWhenQueryUsingJsonbOperatorThenReturns() throws Exception {
-		this.mvc.perform(formLogin().user("rüdiger").password("password")).andExpect(authenticated());
+		loginWhenQueryUsingJsonbOperatorThenReturns("user");
+	}
+
+	@Test
+	void loginWhenQueryUsingJsonbOperatorThenReturnsWhenSpecialCharacters() throws Exception {
+		loginWhenQueryUsingJsonbOperatorThenReturns("rüdiger");
+	}
+
+	private void loginWhenQueryUsingJsonbOperatorThenReturns(String username) throws Exception {
+		this.mvc.perform(formLogin().user(username).password("password")).andExpect(authenticated());
 		Object attributeBytes = this.jdbcClient.sql("""
 				SELECT attribute_bytes::text FROM spring_session_attributes
-				WHERE attribute_bytes -> 'authentication' -> 'principal' ->> 'username' = 'rüdiger'
-				""").query().singleValue();
+				WHERE attribute_bytes -> 'authentication' -> 'principal' ->> 'username' = '%s'
+				""".formatted(username)).query().singleValue();
 		SecurityContext securityContext = this.objectMapperWithModules.readValue((String) attributeBytes,
 				SecurityContext.class);
 		assertThat(securityContext).isNotNull();
-		assertThat(securityContext.getAuthentication().getName()).isEqualTo("rüdiger");
+		assertThat(securityContext.getAuthentication().getName()).isEqualTo(username);
 	}
 
 }