From 1be016ae024e3ff22ab47d69f4695823b8d6742e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Gielen?= <rgielen@apache.org>
Date: Thu, 8 Mar 2007 01:07:38 +0000
Subject: [PATCH] WW-1747: - updated test to show number formatting issue
 pointed out by Mike Baroukh - fixed issue by preventing freemarker from
 formatting numbers for this template

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@515872 13f79535-47bb-0310-9956-ffa450edef68
---
 core/src/main/resources/template/simple/select.ftl            | 1 +
 .../test/java/org/apache/struts2/views/jsp/ui/SelectTest.java | 4 ++--
 .../resources/org/apache/struts2/views/jsp/ui/Select-12.txt   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/resources/template/simple/select.ftl b/core/src/main/resources/template/simple/select.ftl
index d0d23fc16..dd62a9df9 100644
--- a/core/src/main/resources/template/simple/select.ftl
+++ b/core/src/main/resources/template/simple/select.ftl
@@ -1,3 +1,4 @@
+<#setting number_format="#">
 <select<#rt/>
  name="${parameters.name?default("")?html}"<#rt/>
 <#if parameters.get("size")?exists>
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
index 95bf35d57..dfcefa0e6 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
@@ -275,13 +275,13 @@ public class SelectTest extends AbstractUITagTest {
         Collection collection = new ArrayList(2);
 
         collection.add(1l);
-        collection.add(3l);
+        collection.add(300000000l);
         testAction.setCollection(collection);
 
         List selectList = new ArrayList();
         selectList.add(new LongObject(1l, "foo"));
         selectList.add(new LongObject(2l, "bar"));
-        selectList.add(new LongObject(3l, "foobar"));
+        selectList.add(new LongObject(300000000l, "foobar"));
         testAction.setList2(selectList);
 
         SelectTag tag = new SelectTag();
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
index 4e913b273..a3b44f18b 100755
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
@@ -3,6 +3,6 @@
     <td><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="1" selected="selected">foo</option>
     <option value="2">bar</option>
-    <option value="3" selected="selected">foobar</option>
+    <option value="300000000" selected="selected">foobar</option>
 </select></td>
 </tr>