Title: [waffle-scm] [281] trunk/extensions/taglib-acceptance/src/main/webapp: acceptance test for number tag

Diff

Modified: trunk/extensions/taglib-acceptance/src/main/webapp/index.jsp (280 => 281)

--- trunk/extensions/taglib-acceptance/src/main/webapp/index.jsp	2007-07-25 15:59:18 UTC (rev 280)
+++ trunk/extensions/taglib-acceptance/src/main/webapp/index.jsp	2007-07-25 18:56:07 UTC (rev 281)
@@ -9,7 +9,7 @@
     <a href="" />
     <a href="" />
     <a href="" />
-    <a href="" />
+    <a href="" />
     <a href="" />
     <a href="" />
     <a href="" />

Modified: trunk/extensions/taglib-acceptance/src/main/webapp/number.jsp (280 => 281)

--- trunk/extensions/taglib-acceptance/src/main/webapp/number.jsp	2007-07-25 15:59:18 UTC (rev 280)
+++ trunk/extensions/taglib-acceptance/src/main/webapp/number.jsp	2007-07-25 18:56:07 UTC (rev 281)
@@ -2,7 +2,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%@ page contentType="text/html;encoding=iso-8859-1" %>
-<%@ page import="java.lang.Number" %>
 
 <html>
 <head>
@@ -10,20 +9,18 @@
 <body >
  
 <%
-	pageContext.setAttribute("number",new Double(1234.567));
-  pageContext.setAttribute("number2",new Double(1234.5));
+  pageContext.setAttribute("number", new Double(1234.5));
 %>
 
-<fmt:setLocale value="pt_BR" />
+<fmt:setLocale value="${param.locale}" />
 
 Number Tag:
 <br/>
-without pattern <w:number id="asfsad" value="${number}" name="numberLocalized"/>
+without pattern <w:number id="localizedNumber" name="number" />
 <br/>
-with pattern <w:number name="d" value="${number2}" pattern="00,000.##"/>
+with pattern <w:number id="patternNumber" name="number" pattern="00,000.00" />
 <br/>
-only name atribute:<w:number name="number" />
 <br/>
-<br/>
+
 </body >
 </html>

Modified: trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/HiddenTagTest.java (280 => 281)

--- trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/HiddenTagTest.java	2007-07-25 15:59:18 UTC (rev 280)
+++ trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/HiddenTagTest.java	2007-07-25 18:56:07 UTC (rev 281)
@@ -14,16 +14,16 @@
 
 	public void testChecksTheDefaultAttribute() {
 		open("hidden.jsp");
-		assertEquals("54321",selenium.getValue("onlyName"));
+		assertEquals("54321", field("onlyName").value());
 	}
 
 	public void testChecksTheValueAttribute() {
 		open("hidden.jsp");
-		assertEquals("12345",selenium.getValue("nameAndValue"));
+		assertEquals("12345", field("nameAndValue").value());
 	}
 	
 	public void testChecksTheRenderedAttributeSetToTrue() {
 		open("hidden.jsp");
-		assertEquals("54321",selenium.getValue("renderedTrue"));
+		assertEquals("54321", field("renderedTrue").value());
 	}
 }

Modified: trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/IntegrationTest.java (280 => 281)

--- trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/IntegrationTest.java	2007-07-25 15:59:18 UTC (rev 280)
+++ trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/IntegrationTest.java	2007-07-25 18:56:07 UTC (rev 281)
@@ -19,7 +19,23 @@
 	protected void open(String url) {
 		String contextPath = System.getProperty("seleniumContextPath");
         selenium.open(contextPath + url);
-		selenium.waitForPageToLoad("2000");
+        selenium.waitForPageToLoad("2000");
 	}
 
+    protected Field field(String localizer) {
+        return new Field(localizer);
+    }
+    
+    protected class Field {
+        private final String localizer;
+
+        public Field(String localizer) {
+            this.localizer = localizer;
+        }
+
+        public String value() {
+            return selenium.getValue(localizer);
+        }
+    }
+    
 }

Copied: trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/NumberTest.java (from rev 278, trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/SelectTokensTest.java) (0 => 281)

--- trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/NumberTest.java	                        (rev 0)
+++ trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/NumberTest.java	2007-07-25 18:56:07 UTC (rev 281)
@@ -0,0 +1,15 @@
+package org.codehaus.waffle.taglib.acceptance;
+
+public class NumberTest extends IntegrationTest {
+
+	public void testUsesTheCurrentLocaleIfNoPatternIsSpecified() {
+		open("number.jsp?locale=pt_BR");
+        assertEquals("1.234,5", field("localizedNumber").value());
+	}
+
+    public void testUsesTheSpecifiedPattern() {
+        open("number.jsp?locale=pt_BR");
+        assertEquals("01.234,50", field("patternNumber").value());
+    }
+
+}
\ No newline at end of file

Modified: trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/TextareaTagTest.java (280 => 281)

--- trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/TextareaTagTest.java	2007-07-25 15:59:18 UTC (rev 280)
+++ trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/TextareaTagTest.java	2007-07-25 18:56:07 UTC (rev 281)
@@ -9,7 +9,7 @@
 
     public void testContainsItsBodyAsValue() {
         open("textarea.jsp");
-        assertEquals("itsValue", selenium.getValue("itsName"));
+        assertEquals("itsValue", field("itsName").value());
     }
 
 }
\ No newline at end of file


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to