Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes expected test result

Browse Source
This commit is contained in:
Lukasz Lenart
2015-10-06 15:36:28 +02:00
parent f0797388bc
commit a5812bf0b6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
+5 -4
View File
@@ -102,9 +102,10 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
// TODO lukaszlenart: remove expectedJDK15 and if() after switching to Java 1.6
String expectedJDK17 =
"<input type=\"text\" name=\"test\" value=\"\" id=\"test\" foo=\"bar\" placeholder=\"input\"/>"
+ "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" foo=\"bar\" placeholder=\"input\"/>"
+ "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" break=\"true\"/>";
"<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>"
+ "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>"
+ "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" break=\"true\"/>"
+ "<input type=\"text\" name=\"required\" value=\"\" id=\"required\" required=\"true\"/>";
String expectedJDK18 =
"<input type=\"text\" name=\"test\" value=\"\" id=\"test\" foo=\"bar\" placeholder=\"input\"/>"
+ "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" foo=\"bar\" placeholder=\"input\"/>"
@@ -113,7 +114,7 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
String result = stringWriter.toString();
if (result.contains("id=\"required\"")) {
if (result.contains("id=\"test\" foo=\"bar\"")) {
assertEquals(expectedJDK18, result);
} else {
assertEquals(expectedJDK17, result);