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

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2023-06-24 14:15:05 +02:00
parent 35667e81ea f86a69ebfb
commit 19686adc01
15 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
View File

@@ -130,8 +130,8 @@ public abstract class AbstractHtmlElementTagTests extends AbstractTagTests {
}
protected final void assertAttributeNotPresent(String output, String attributeName) {
boolean condition = !output.contains(attributeName + "=\"");
assertThat(condition).as("Unexpected attribute '" + attributeName + "' in output '" + output + "'.").isTrue();
assertThat(output).as("Unexpected attribute '" + attributeName + "' in output '" + output + "'.")
.doesNotContain(attributeName + "=\"");
}
protected final void assertBlockTagContains(String output, String desiredContents) {

3
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -103,7 +103,6 @@ public class TextareaTagTests extends AbstractFormTagTests {
assertThat(this.tag.doStartTag()).isEqualTo(Tag.SKIP_BODY);
String output = getOutput();
System.out.println(output);
assertContainsAttribute(output, "name", "name");
assertBlockTagContains(output, HTML_ESCAPED_NAME);
}