You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/09/23 04:19:45 UTC
svn commit: r449146 - in /tapestry/tapestry4/trunk:
tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/
tapestry-framework/src/java/org/apache/tapestry/json/
tapestry-framework/src/test/org/apache/tapestry/form/translator/
tapestry-framework...
Author: jkuhnert
Date: Fri Sep 22 19:19:44 2006
New Revision: 449146
URL: http://svn.apache.org/viewvc?view=rev&rev=449146
Log:
Updating unit tests to reflect changes made to JSONObject.accumulate() fix.
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/json/JSONObject.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.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/translator/TestStringTranslator.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/json/TestJsonProperties.java
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java Fri Sep 22 19:19:44 2006
@@ -74,6 +74,6 @@
assert literal != null;
- assertEquals("[tapestry.form.validation.isPalleteSelected]", literal.toString());
+ assertEquals(literal.toString(),"[[tapestry.form.validation.isPalleteSelected]]");
}
}
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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -263,20 +263,16 @@
Object o = opt(key);
if (o == null)
{
- put(key, value);
+ a = new JSONArray();
+ a.put(value);
+ put(key, a);
}
else if (o instanceof JSONArray)
{
a = (JSONArray) o;
a.put(value);
}
- else
- {
- a = new JSONArray();
- a.put(o);
- a.put(value);
- put(key, a);
- }
+
return this;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java Fri Sep 22 19:19:44 2006
@@ -30,7 +30,7 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.testng.annotations.Configuration;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
/**
@@ -47,12 +47,12 @@
/**
* @see junit.framework.TestCase#setUp()
*/
- @Configuration(afterTestMethod = true)
- protected void setUp() throws Exception
+ @AfterMethod
+ protected void cleanup()
{
_calendar.clear();
}
-
+
private Date buildDate(int year, int month, int day)
{
_calendar.set(Calendar.YEAR, year);
@@ -254,7 +254,7 @@
verify();
- assertEquals("{\"trim\":\"foo\"}",
+ assertEquals("{\"trim\":[\"foo\"]}",
json.toString());
}
}
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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -217,9 +217,9 @@
verify();
- assertEquals( "{\"constraints\":{\"numberField\":[dojo.validate.isRealNumber,"
- + "{places:0,decimal:\".\"}]},"
- + "\"numberField\":{\"constraints\":\"invalid number message\"}}",
+ assertEquals( "{\"constraints\":{\"numberField\":[[dojo.validate.isRealNumber,"
+ + "{places:0,decimal:\".\"}]]},"
+ + "\"numberField\":{\"constraints\":[\"invalid number message\"]}}",
json.toString());
}
@@ -256,9 +256,9 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isRealNumber,"
- + "{places:0,decimal:\".\"}]},"
- + "\"myfield\":{\"constraints\":\"Blah Blah \'Field Name\' Blah.\"}}",
+ assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isRealNumber,"
+ + "{places:0,decimal:\".\"}]]},"
+ + "\"myfield\":{\"constraints\":[\"Blah Blah \'Field Name\' Blah.\"]}}",
json.toString());
}
@@ -291,10 +291,10 @@
verify();
- assertEquals("{\"trim\":\"myfield\","
- + "\"constraints\":{\"myfield\":[dojo.validate.isRealNumber,"
- + "{places:0,decimal:\".\"}]},"
- + "\"myfield\":{\"constraints\":\"invalid number message\"}}",
+ assertEquals("{\"trim\":[\"myfield\"],"
+ + "\"constraints\":{\"myfield\":[[dojo.validate.isRealNumber,"
+ + "{places:0,decimal:\".\"}]]},"
+ + "\"myfield\":{\"constraints\":[\"invalid number message\"]}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java Fri Sep 22 19:19:44 2006
@@ -23,7 +23,7 @@
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.valid.ValidatorException;
-import org.testng.annotations.Configuration;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
/**
@@ -37,7 +37,7 @@
{
private StringTranslator _translator = new StringTranslator();
- @Configuration(afterTestMethod = true)
+ @AfterMethod
public void reset()
{
_translator.setTrim(false);
@@ -45,7 +45,7 @@
_translator.setMessage(null);
}
- public void testFormat()
+ public void test_Format()
{
replay();
@@ -56,7 +56,7 @@
verify();
}
- public void testNullFormat()
+ public void test_Null_Format()
{
replay();
@@ -67,7 +67,7 @@
verify();
}
- public void testParse()
+ public void test_Parse()
{
replay();
@@ -87,7 +87,7 @@
}
}
- public void testTrimmedParse()
+ public void test_Trimmed_Parse()
{
_translator.setTrim(true);
@@ -109,7 +109,7 @@
}
}
- public void testEmptyParse()
+ public void test_Empty_Parse()
{
replay();
@@ -129,7 +129,7 @@
}
}
- public void testCustomEmptyParse()
+ public void test_Custom_Empty_Parse()
{
_translator.setEmpty("");
@@ -151,7 +151,7 @@
}
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
replay();
@@ -160,7 +160,7 @@
verify();
}
- public void testTrimRenderContribution()
+ public void test_Trim_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -181,7 +181,7 @@
verify();
- assertEquals("{\"trim\":\"myfield\"}",
+ assertEquals("{\"trim\":[\"myfield\"]}",
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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -36,7 +36,7 @@
@Test
public class TestEmail extends BaseValidatorTestCase
{
- public void testOK() throws Exception
+ public void test_OK() throws Exception
{
IFormComponent field = newField();
ValidationMessages messages = newMessages();
@@ -48,7 +48,7 @@
verify();
}
- public void testFail()
+ public void test_Fail()
{
IFormComponent field = newField("My Email");
ValidationMessages messages = newMessages(
@@ -74,7 +74,7 @@
verify();
}
- public void testFailCustomMessage()
+ public void test_Fail_Custom_Message()
{
IFormComponent field = newField("My Email");
ValidationMessages messages = newMessages(
@@ -100,7 +100,7 @@
verify();
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -123,12 +123,12 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isEmailAddress,false,true]},"
- +"\"myfield\":{\"constraints\":\"default\\\\message\"}}",
+ assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isEmailAddress,false,true]]},"
+ +"\"myfield\":{\"constraints\":[\"default\\\\message\"]}}",
json.toString());
}
- public void testRenderContributionCustomMessage()
+ public void test_Render_Contribution_Custom_Message()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -156,8 +156,8 @@
verify();
- assertEquals("{\"constraints\":{\"barney\":[dojo.validate.isEmailAddress,false,true]},"
- + "\"barney\":{\"constraints\":\"custom message\"}}",
+ assertEquals("{\"constraints\":{\"barney\":[[dojo.validate.isEmailAddress,false,true]]},"
+ + "\"barney\":{\"constraints\":[\"custom 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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -100,7 +100,7 @@
}
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -126,13 +126,13 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{max:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]},"
- + "\"myfield\":{\"constraints\":\"default message\"}}",
+ assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isInRange,{max:20.0,decimal:\""
+ + symbols.getDecimalSeparator() + "\"}]]},"
+ + "\"myfield\":{\"constraints\":[\"default message\"]}}",
json.toString());
}
- public void testRenderContributionCustomMessage()
+ public void test_Render_Contribution_Custom_Message()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -164,9 +164,9 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{max:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]},"
- +"\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
+ 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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -133,7 +133,7 @@
verify();
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -171,16 +171,16 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":[["
+ "tapestry.form.datetime.isValidDate,{max:\""
+ strMax + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]},"
- +"\"myfield\":{\"constraints\":\"default message\"}}",
+ + "}]]},"
+ +"\"myfield\":{\"constraints\":[\"default message\"]}}",
json.toString());
}
- public void testRenderContributionCustomMessage()
+ public void test_Render_Contribution_Custom_Message()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -219,12 +219,12 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":[["
+ "tapestry.form.datetime.isValidDate,{max:\""
+ strMax + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]},"
- + "\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
+ + "}]]},"
+ + "\"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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -95,7 +95,7 @@
}
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -116,8 +116,8 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isText,{maxlength:20}]},"
- +"\"myfield\":{\"constraints\":\"default\\\\message\"}}",
+ 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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -99,7 +99,7 @@
}
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -125,13 +125,13 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{min:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]},"
- + "\"myfield\":{\"constraints\":\"default message\"}}",
+ assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isInRange,{min:20.0,decimal:\""
+ + symbols.getDecimalSeparator() + "\"}]]},"
+ + "\"myfield\":{\"constraints\":[\"default message\"]}}",
json.toString());
}
- public void testRenderContributionCustomMessage()
+ public void test_Render_Contribution_Custom_Message()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -163,9 +163,9 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isInRange,{min:20.0,decimal:\""
- + symbols.getDecimalSeparator() + "\"}]},"
- + "\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
+ 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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -133,7 +133,7 @@
verify();
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -171,16 +171,16 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":[["
+ "tapestry.form.datetime.isValidDate,{min:\""
+ strMin + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]},"
- + "\"myfield\":{\"constraints\":\"default message\"}}",
+ + "}]]},"
+ + "\"myfield\":{\"constraints\":[\"default message\"]}}",
json.toString());
}
- public void testRenderContributionCustomMessage()
+ public void test_Render_Contribution_Custom_Message()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -219,12 +219,12 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":["
+ assertEquals("{\"constraints\":{\"myfield\":[["
+ "tapestry.form.datetime.isValidDate,{min:\""
+ strMin + "\",format:"
+ JSONObject.quote(Strftime.convertToPosixFormat(translator.getPattern()))
- + "}]},"
- +"\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
+ + "}]]},"
+ +"\"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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -96,7 +96,7 @@
}
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -117,12 +117,12 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[dojo.validate.isText,{minlength:25}]},"
- +"\"myfield\":{\"constraints\":\"default\\\\message\"}}",
+ assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isText,{minlength:25}]]},"
+ +"\"myfield\":{\"constraints\":[\"default\\\\message\"]}}",
json.toString());
}
- public void testRenderContributionCustomMessage()
+ public void test_Render_Contribution_Custom_Message()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -151,8 +151,8 @@
verify();
- assertEquals("{\"constraints\":{\"customField\":[dojo.validate.isText,{minlength:25}]},"
- + "\"customField\":{\"constraints\":\"custom\\\\message\"}}",
+ 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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -128,9 +128,9 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[tapestry.form.validation.isValidPattern,\""
- + pattern + "\"]},"
- + "\"myfield\":{\"constraints\":\"default message\"}}",
+ assertEquals("{\"constraints\":{\"myfield\":[[tapestry.form.validation.isValidPattern,\""
+ + pattern + "\"]]},"
+ + "\"myfield\":{\"constraints\":[\"default message\"]}}",
json.toString());
}
@@ -162,9 +162,9 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[tapestry.form.validation.isValidPattern,\""
- + pattern + "\"]},"
- +"\"myfield\":{\"constraints\":\"custom\\\\message\"}}",
+ 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?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- 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 Fri Sep 22 19:19:44 2006
@@ -157,7 +157,7 @@
verify();
}
- public void testRenderContribution()
+ public void test_Render_Contribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -185,7 +185,7 @@
verify();
- assertEquals("{\"required\":\"fred\",\"fred\":{\"required\":\"Default\\\\Message for Fred.\"}}",
+ assertEquals("{\"required\":[\"fred\"],\"fred\":{\"required\":[\"Default\\\\Message for Fred.\"]}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/json/TestJsonProperties.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/json/TestJsonProperties.java?view=diff&rev=449146&r1=449145&r2=449146
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/json/TestJsonProperties.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/json/TestJsonProperties.java Fri Sep 22 19:19:44 2006
@@ -28,7 +28,7 @@
public class TestJsonProperties extends BaseComponentTestCase
{
- public void testLiteralArrays()
+ public void test_Literal_Arrays()
{
JSONObject json = new JSONObject();
@@ -46,7 +46,7 @@
container.toString());
}
- public void testLiteralArrayContainer()
+ public void test_Literal_Array_Container()
{
JSONObject profile = new JSONObject();
profile.put("constraints", new JSONObject());
@@ -69,4 +69,22 @@
profile.toString());
}
+ public void test_Multiple_Element_Accumulate()
+ {
+ JSONObject profile = new JSONObject();
+
+ profile.accumulate("required", "val1");
+ profile.accumulate("required", "val2");
+
+ assertEquals(profile.toString(), "{\"required\":[\"val1\",\"val2\"]}");
+ }
+
+ public void test_Single_Element_Accumulate()
+ {
+ JSONObject profile = new JSONObject();
+
+ profile.accumulate("required", "val1");
+
+ assertEquals(profile.toString(), "{\"required\":[\"val1\"]}");
+ }
}