You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/07/30 18:28:14 UTC
svn commit: r426898 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/json/ java/org/apache/tapestry/record/
test/org/apache/tapestry/form/translator/
test/org/apache/tapestry/form/validator/ test/org/apache/tapestry/recor...
Author: jkuhnert
Date: Sun Jul 30 09:28:11 2006
New Revision: 426898
URL: http://svn.apache.org/viewvc?rev=426898&view=rev
Log:
Applied patch from TAPESTRY-1028. I'm a little wary of introducing anything that impacts performance (however small),
but seeing as how these JSON responses should have a minimal size (as browsers can only hold so much in memory), the LinkedHashMap
implementation may be worth the slight overhead.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/json/JSONObject.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/record/ClientPropertyPersistenceStrategy.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestPattern.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestRequired.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/json/JSONObject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/json/JSONObject.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/json/JSONObject.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/json/JSONObject.java Sun Jul 30 09:28:11 2006
@@ -27,6 +27,7 @@
import java.text.ParseException;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -136,7 +137,7 @@
*/
public JSONObject()
{
- this.myHashMap = new HashMap();
+ this.myHashMap = new LinkedHashMap();
}
/**
@@ -322,11 +323,11 @@
}
/**
- * Get the HashMap the holds that contents of the JSONObject.
+ * Get the Map the holds that contents of the JSONObject.
*
* @return The getHashMap.
*/
- HashMap getHashMap()
+ Map getMap()
{
return this.myHashMap;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/record/ClientPropertyPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/record/ClientPropertyPersistenceStrategy.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/record/ClientPropertyPersistenceStrategy.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/record/ClientPropertyPersistenceStrategy.java Sun Jul 30 09:28:11 2006
@@ -16,8 +16,8 @@
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -41,7 +41,7 @@
* Keyed on page name (String), values are
* {@link org.apache.tapestry.record.PersistentPropertyData}.
*/
- private final Map _data = new HashMap();
+ private final Map _data = new LinkedHashMap();
private PersistentPropertyDataEncoder _encoder;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java Sun Jul 30 09:28:11 2006
@@ -218,9 +218,9 @@
verify();
- assertEquals("{\"numberField\":{\"constraints\":\"invalid number message\"},"
- + "\"constraints\":{\"numberField\":[dojo.validate.isRealNumber,"
- + "{places:0,decimal:\".\",separator:\",\"}]}}",
+ assertEquals( "{\"constraints\":{\"numberField\":[dojo.validate.isRealNumber,"
+ + "{places:0,decimal:\".\",separator:\",\"}]},"
+ + "\"numberField\":{\"constraints\":\"invalid number message\"}}",
json.toString());
}
@@ -257,9 +257,9 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"Blah Blah \'Field Name\' Blah.\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isRealNumber,"
- + "{places:0,decimal:\".\",separator:\",\"}]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isRealNumber,"
+ + "{places:0,decimal:\".\",separator:\",\"}]},"
+ + "\"myfield\":{\"constraints\":\"Blah Blah \'Field Name\' Blah.\"}}",
json.toString());
}
@@ -292,10 +292,10 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"invalid number message\"},"
+ assertEquals("{\"trim\":\"myfield\","
+ "\"constraints\":{\"myfield\":[dojo.validate.isRealNumber,"
+ "{places:0,decimal:\".\",separator:\",\"}]},"
- + "\"trim\":\"myfield\"}",
+ + "\"myfield\":{\"constraints\":\"invalid number message\"}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java Sun Jul 30 09:28:11 2006
@@ -124,8 +124,8 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default\\\\message\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isEmailAddress,false,true]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isEmailAddress,false,true]},"
+ +"\"myfield\":{\"constraints\":\"default\\\\message\"}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java Sun Jul 30 09:28:11 2006
@@ -127,9 +127,9 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default message\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isInRange,{max:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{max:20.0,decimal:\""
+ + symbols.getDecimalSeparator() + "\"}]},"
+ + "\"myfield\":{\"constraints\":\"default message\"}}",
json.toString());
}
@@ -165,9 +165,9 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"custom\\\\message\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isInRange,{max:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{max:20.0,decimal:\""
+ + symbols.getDecimalSeparator() + "\"}]},"
+ +"\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java Sun Jul 30 09:28:11 2006
@@ -172,12 +172,12 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default message\"},"
- + "\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":["
+ "tapestry.form.datetime.isValidDate,{max:\""
+ strMax + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]}}",
+ + "}]},"
+ +"\"myfield\":{\"constraints\":\"default message\"}}",
json.toString());
}
@@ -220,12 +220,12 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"custom\\\\message\"},"
- + "\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":["
+ "tapestry.form.datetime.isValidDate,{max:\""
+ strMax + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]}}",
+ + "}]},"
+ + "\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
json.toString());
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java Sun Jul 30 09:28:11 2006
@@ -117,8 +117,8 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default\\\\message\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isText,{maxlength:20}]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isText,{maxlength:20}]},"
+ +"\"myfield\":{\"constraints\":\"default\\\\message\"}}",
json.toString());
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java Sun Jul 30 09:28:11 2006
@@ -126,9 +126,9 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default message\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isInRange,{min:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{min:20.0,decimal:\""
+ + symbols.getDecimalSeparator() + "\"}]},"
+ + "\"myfield\":{\"constraints\":\"default message\"}}",
json.toString());
}
@@ -164,9 +164,9 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"custom\\\\message\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isInRange,{min:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{min:20.0,decimal:\""
+ + symbols.getDecimalSeparator() + "\"}]},"
+ + "\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java Sun Jul 30 09:28:11 2006
@@ -172,12 +172,12 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default message\"},"
- + "\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":["
+ "tapestry.form.datetime.isValidDate,{min:\""
+ strMin + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]}}",
+ + "}]},"
+ + "\"myfield\":{\"constraints\":\"default message\"}}",
json.toString());
}
@@ -220,12 +220,12 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"custom\\\\message\"},"
- + "\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":["
+ "tapestry.form.datetime.isValidDate,{min:\""
+ strMin + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]}}",
+ + "}]},"
+ +"\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
json.toString());
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java Sun Jul 30 09:28:11 2006
@@ -118,8 +118,8 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default\\\\message\"},"
- + "\"constraints\":{\"myfield\":[dojo.validate.isText,{minlength:25}]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isText,{minlength:25}]},"
+ +"\"myfield\":{\"constraints\":\"default\\\\message\"}}",
json.toString());
}
@@ -152,8 +152,8 @@
verify();
- assertEquals("{\"customField\":{\"constraints\":\"custom\\\\message\"},"
- + "\"constraints\":{\"customField\":[dojo.validate.isText,{minlength:25}]}}",
+ assertEquals("{\"constraints\":{\"customField\":[dojo.validate.isText,{minlength:25}]},"
+ + "\"customField\":{\"constraints\":\"custom\\\\message\"}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestPattern.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestPattern.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestPattern.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestPattern.java Sun Jul 30 09:28:11 2006
@@ -129,9 +129,9 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"default message\"},"
- + "\"constraints\":{\"myfield\":[tapestry.form.validation.isValidPattern,\""
- + pattern + "\"]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[tapestry.form.validation.isValidPattern,\""
+ + pattern + "\"]},"
+ + "\"myfield\":{\"constraints\":\"default message\"}}",
json.toString());
}
@@ -164,9 +164,9 @@
verify();
- assertEquals("{\"myfield\":{\"constraints\":\"custom\\\\message\"},"
- + "\"constraints\":{\"myfield\":[tapestry.form.validation.isValidPattern,\""
- + pattern + "\"]}}",
+ assertEquals("{\"constraints\":{\"myfield\":[tapestry.form.validation.isValidPattern,\""
+ + pattern + "\"]},"
+ +"\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestRequired.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestRequired.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestRequired.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestRequired.java Sun Jul 30 09:28:11 2006
@@ -187,7 +187,7 @@
verify();
- assertEquals("{\"fred\":{\"required\":\"Default\\\\Message for Fred.\"},\"required\":\"fred\"}",
+ assertEquals("{\"required\":\"fred\",\"fred\":{\"required\":\"Default\\\\Message for Fred.\"}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java Sun Jul 30 09:28:11 2006
@@ -141,6 +141,7 @@
trainGetPage(cycle, page);
trainGetPageName(page, "MyPage");
+
replay();
PageClientPropertyPersistenceScope scope = new PageClientPropertyPersistenceScope();
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java?rev=426898&r1=426897&r2=426898&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java Sun Jul 30 09:28:11 2006
@@ -14,8 +14,7 @@
package org.apache.tapestry.valid;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.*;
import java.text.DateFormat;
import java.util.Calendar;
@@ -133,8 +132,8 @@
}
catch (ValidatorException ex)
{
- assertEquals("Invalid date format for badDatesIndy. Format is MM/dd/yyyy.", ex
- .getMessage());
+ assertEquals("Invalid date format for badDatesIndy. Format is MM/DD/YYYY.".toLowerCase(), ex
+ .getMessage().toLowerCase());
assertEquals(ValidationConstraint.DATE_FORMAT, ex.getConstraint());
}