Merge branch '5.6.x' into 5.7.x

marcusdacoregio · marcusdacoregio · commit 2d19d972f431 · 2022-11-16T14:51:07.000-03:00
diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java
@@ -165,7 +165,7 @@ public void doFilterWhenCharacterEncodingThenEncodeSpecialCharactersCorrectly()
 		this.filter.setMetadataFilename(testMetadataFilename);
 		this.filter.doFilter(this.request, this.response, this.chain);
 		assertThat(this.response.getCharacterEncoding()).isEqualTo(StandardCharsets.UTF_8.name());
-		assertThat(new String(this.response.getContentAsByteArray())).isEqualTo(generatedMetadata);
+		assertThat(this.response.getContentAsString(StandardCharsets.UTF_8)).isEqualTo(generatedMetadata);
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public void doFilterWhenCharacterEncodingThenEncodeSpecialCharactersCorrectly()`
`165`	`165`	`this.filter.setMetadataFilename(testMetadataFilename);`
`166`	`166`	`this.filter.doFilter(this.request, this.response, this.chain);`
`167`	`167`	`assertThat(this.response.getCharacterEncoding()).isEqualTo(StandardCharsets.UTF_8.name());`
`168`		`- assertThat(new String(this.response.getContentAsByteArray())).isEqualTo(generatedMetadata);`
	`168`	`+ assertThat(this.response.getContentAsString(StandardCharsets.UTF_8)).isEqualTo(generatedMetadata);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`@Test`