From aef1c6aaf67430b0cadd9b30e529d6ddf6f633df Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 6 Apr 2012 15:56:45 +0000
Subject: [PATCH] WW-3174 additional test case for Dynamic Attributes support

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1310417 13f79535-47bb-0310-9956-ffa450edef68
---
 core/src/main/java/org/apache/struts2/components/UIBean.java  | 4 ++--
 .../apache/struts2/views/freemarker/FreeMarkerResultTest.java | 4 +++-
 .../org/apache/struts2/views/freemarker/dynaAttributes.ftl    | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
index c3b06f997..76b542bb7 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -1203,7 +1203,7 @@ public abstract class UIBean extends Component {
 
 	public void setDynamicAttributes(Map<String, Object> dynamicAttributes) {
 		this.dynamicAttributes.putAll(dynamicAttributes);
-}
+    }
 
 	@Override
 	/**
@@ -1221,7 +1221,7 @@ public abstract class UIBean extends Component {
             }
         }
 	}
-	
+
 	protected Set<String> getStandardAttributes() {
         Class clz = getClass();
         Set<String> standardAttributes = standardAttributesMap.get(clz);
diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
index 60e945437..f858b2dfc 100644
--- a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
+++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
@@ -214,7 +214,9 @@ public class FreeMarkerResultTest extends StrutsTestCase {
         Dispatcher dispatcher = Dispatcher.getInstance();
         ActionMapping mapping = dispatcher.getContainer().getInstance(ActionMapper.class).getMapping(request, dispatcher.getConfigurationManager());
         dispatcher.serviceAction(request, response, servletContext, mapping);
-        assertEquals("<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>", stringWriter.toString());
+        String expected = "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>"
+                + "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>";
+        assertEquals(expected, stringWriter.toString());
     }
 
     protected void setUp() throws Exception {
diff --git a/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl b/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl
index 4bfd79902..3c80da3fb 100644
--- a/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl
+++ b/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl
@@ -20,4 +20,5 @@
  * under the License.
  */
 -->
-<@s.textfield name="test" dynamicAttributes={"placeholder":"input","foo":"bar"}/>
\ No newline at end of file
+<@s.textfield name="test" dynamicAttributes={"placeholder":"input","foo":"bar"}/>
+<@s.textfield name="test" placeholder="input" foo="bar"/>
\ No newline at end of file