Author: lukaszlenart
Date: Thu Nov 22 07:49:20 2012
New Revision: 1412443
URL: http://svn.apache.org/viewvc?rev=1412443&view=rev
Log:
Adjusts code base to be compliant with Java 1.5
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java?rev=1412443&r1=1412442&r2=1412443&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
Thu Nov 22 07:49:20 2012
@@ -217,10 +217,24 @@ public class FreeMarkerResultTest extend
Dispatcher dispatcher = Dispatcher.getInstance();
ActionMapping mapping =
dispatcher.getContainer().getInstance(ActionMapper.class).getMapping(request,
dispatcher.getConfigurationManager());
dispatcher.serviceAction(request, response, servletContext, mapping);
- String expected = "<input type=\"text\" name=\"test\" value=\"\"
id=\"test\" placeholder=\"input\" foo=\"bar\"/>"
+
+ // TODO lukaszlenart: remove expectedJDK15 and if() after switching to
Java 1.6
+ String expectedJDK15 =
+ "<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\"/>";
+ String expectedJDK16 =
+ "<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\"/>";
- assertEquals(expected, stringWriter.toString());
+
+ String result = stringWriter.toString();
+
+ if (result.contains("foo=\"bar\" placeholder=\"input\"")) {
+ assertEquals(expectedJDK15, result);
+ } else {
+ assertEquals(expectedJDK16, result);
+ }
}
public void testManualListInTemplate() throws Exception {
