Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2024-08-29 17:02:08 +02:00
parent 2ddf495802
commit 167cb5d494
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
View File

@@ -25,6 +25,8 @@ import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* AOP-specific tests for {@link ClassUtils}.
*
* @author Colin Sampaleanu * @author Colin Sampaleanu
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Rob Harrop * @author Rob Harrop

7
spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
View File

@@ -998,7 +998,6 @@ class ClassUtilsTests {
private interface MethodsInterface { private interface MethodsInterface {
default void defaultPrint() { default void defaultPrint() {
} }
void print(String messages); void print(String messages);
@@ -1009,15 +1008,12 @@ class ClassUtilsTests {
@Override @Override
public void print(String message) { public void print(String message) {
} }
protected void protectedPrint() { protected void protectedPrint() {
} }
void packageAccessiblePrint() { void packageAccessiblePrint() {
} }
} }
@@ -1026,14 +1022,11 @@ class ClassUtilsTests {
@Override @Override
protected void protectedPrint() { protected void protectedPrint() {
} }
@Override @Override
public void packageAccessiblePrint() { public void packageAccessiblePrint() {
} }
} }
private interface PrivateInterface { private interface PrivateInterface {

10
spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
View File

@@ -175,9 +175,9 @@ class Jaxb2RootElementHttpMessageConverterTests {
]> ]>
<rootElement><external>&lol9;</external></rootElement>"""; <rootElement><external>&lol9;</external></rootElement>""";
MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8)); MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() -> assertThatExceptionOfType(HttpMessageNotReadableException.class)
this.converter.read(RootElement.class, inputMessage)) .isThrownBy(() -> this.converter.read(RootElement.class, inputMessage))
.withMessageContaining("DOCTYPE"); .withMessageContaining("DOCTYPE");
} }
@Test @Test
@@ -188,13 +188,13 @@ class Jaxb2RootElementHttpMessageConverterTests {
.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML); .as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
DifferenceEvaluator ev = chain(Default, downgradeDifferencesToEqual(XML_STANDALONE)); DifferenceEvaluator ev = chain(Default, downgradeDifferencesToEqual(XML_STANDALONE));
assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8))) assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
.isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev); .isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev);
} }
@Test @Test
void writeJaxbElementRootElement() throws Exception { void writeJaxbElementRootElement() throws Exception {
MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
JAXBElement jaxbElement = new JAXBElement<>(new QName("custom"), MyCustomElement.class, new MyCustomElement("field1", "field2")); JAXBElement<?> jaxbElement = new JAXBElement<>(new QName("custom"), MyCustomElement.class, new MyCustomElement("field1", "field2"));
converter.write(jaxbElement, null, outputMessage); converter.write(jaxbElement, null, outputMessage);
assertThat(outputMessage.getHeaders().getContentType()) assertThat(outputMessage.getHeaders().getContentType())
.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML); .as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);