Author: andyhot
Date: Mon Feb 12 19:57:00 2007
New Revision: 506847
URL: http://svn.apache.org/viewvc?view=rev&rev=506847
Log:
Getting ready to also apply (some) tests to MultipleFormSupport...cool!
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MultipleFormSupport.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java?view=diff&rev=506847&r1=506846&r2=506847
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
Mon Feb 12 19:57:00 2007
@@ -465,7 +465,7 @@
for (int i = 0; i < ids.length; i++)
_allocatedIds.add(ids[i]);
- // Now, reconstruct the the initial state of the
+ // Now, reconstruct the initial state of the
// id allocator.
preallocateReservedIds();
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MultipleFormSupport.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MultipleFormSupport.java?view=diff&rev=506847&r1=506846&r2=506847
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MultipleFormSupport.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MultipleFormSupport.java
Mon Feb 12 19:57:00 2007
@@ -39,7 +39,7 @@
public MultipleFormSupport(IMarkupWriter writer, IRequestCycle cycle,
IForm form)
{
super(writer, cycle, form);
- _prefix = form.getClientId();
+ _prefix = form.getClientId() + ":";
}
/**
@@ -49,7 +49,7 @@
public String getElementId(IFormComponent component, String baseId)
{
- return super.getElementId(component, _prefix + ":" + baseId);
+ return super.getElementId(component, _prefix + baseId);
}
public String peekClientId(IFormComponent comp)
@@ -63,7 +63,7 @@
protected String peekClientId(IFormComponent comp, String baseId)
{
- return _elementIdAllocator.peekNextId(_prefix + ":" + baseId);
+ return _elementIdAllocator.peekNextId(_prefix + baseId);
}
public String rewind()
@@ -75,8 +75,10 @@
private void findIdPrefix()
{
String allocatedFormIds = _cycle.getParameter(FORM_IDS);
+ if (allocatedFormIds==null)
+ return;
int pos = allocatedFormIds.indexOf(':');
if (pos>=0)
- _prefix = allocatedFormIds.substring(0, pos);
+ _prefix = allocatedFormIds.substring(0, pos + 1);
}
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java?view=diff&rev=506847&r1=506846&r2=506847
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
Mon Feb 12 19:57:00 2007
@@ -42,6 +42,7 @@
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.valid.IValidationDelegate;
import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
/**
* Tests for [EMAIL PROTECTED] org.apache.tapestry.form.FormSupportImpl}.
@@ -52,11 +53,21 @@
@Test
public class FormSupportTest extends BaseComponentTestCase
{
- protected FormSupport newFormSupport(IMarkupWriter writer, IRequestCycle
cycle, IForm form)
- {
- return new FormSupportImpl(writer, cycle, form);
- }
-
+ @DataProvider(name="allSupports")
+ public Object[][] createAllSupports() {
+ return new Object[][] {
+ {new FormSupportFactoryImpl()},
+ {new MultipleFormSupportFactory()}
+ };
+ }
+
+ @DataProvider(name="mainSupport")
+ public Object[][] createMainSupport() {
+ return new Object[][] {
+ {new FormSupportFactoryImpl()}
+ };
+ }
+
protected FormSupport newFormSupport(IRequestCycle cycle)
{
return new FormSupportImpl(cycle);
@@ -124,7 +135,8 @@
return component;
}
- public void test_Cancel_Rewind()
+ @Test(dataProvider = "mainSupport")
+ public void test_Cancel_Rewind(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -137,7 +149,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -158,7 +170,8 @@
verify();
}
- public void test_Complex_Render()
+ @Test(dataProvider = "mainSupport")
+ public void test_Complex_Render(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -178,7 +191,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -234,7 +247,8 @@
verify();
}
- public void test_Complex_Rewind()
+ @Test(dataProvider = "mainSupport")
+ public void test_Complex_Rewind(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -250,7 +264,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -283,7 +297,8 @@
verify();
}
- public void test_Complex_Submit_Event_Handler()
+ @Test(dataProvider = "mainSupport")
+ public void test_Complex_Submit_Event_Handler(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -301,7 +316,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -357,7 +372,8 @@
verify();
}
- public void test_Encoding_Type()
+ @Test(dataProvider = "mainSupport")
+ public void test_Encoding_Type(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -376,7 +392,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -426,6 +442,7 @@
verify();
}
+ @Test(dataProvider = "mainSupport")
public void test_Field_Prerender_Twice()
{
IFormComponent field = newField();
@@ -483,7 +500,8 @@
}
- public void test_Hidden_Values()
+ @Test(dataProvider = "mainSupport")
+ public void test_Hidden_Values(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -502,7 +520,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -565,7 +583,8 @@
verify();
}
- public void test_Invalid_Encoding_Type()
+ @Test(dataProvider = "mainSupport")
+ public void test_Invalid_Encoding_Type(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -583,7 +602,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -624,7 +643,8 @@
verify();
}
- public void test_Refresh_Rewind()
+ @Test(dataProvider = "mainSupport")
+ public void test_Refresh_Rewind(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -638,7 +658,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -664,7 +684,8 @@
verify();
}
- public void test_Render_Extra_Reserved_Ids()
+ @Test(dataProvider = "mainSupport")
+ public void test_Render_Extra_Reserved_Ids(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -683,7 +704,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -742,7 +763,8 @@
verify();
}
- public void test_Reset_Event_Handler()
+ @Test(dataProvider = "mainSupport")
+ public void test_Reset_Event_Handler(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -762,7 +784,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -815,7 +837,8 @@
verify();
}
- public void test_Rewind_Extra_Reserved_Ids()
+ @Test(dataProvider = "mainSupport")
+ public void test_Rewind_Extra_Reserved_Ids(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -831,7 +854,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -857,7 +880,8 @@
verify();
}
- public void test_Rewind_Mismatch()
+ @Test(dataProvider = "mainSupport")
+ public void test_Rewind_Mismatch(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -870,7 +894,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -912,7 +936,8 @@
verify();
}
- public void test_Rewind_Too_Long()
+ @Test(dataProvider = "mainSupport")
+ public void test_Rewind_Too_Long(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -925,7 +950,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -967,7 +992,8 @@
verify();
}
- public void test_Rewind_Too_Short()
+ @Test(dataProvider = "mainSupport")
+ public void test_Rewind_Too_Short(FormSupportFactory factory)
{
Location l = newLocation();
IMarkupWriter writer = newWriter();
@@ -983,7 +1009,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -1027,7 +1053,8 @@
verify();
}
- public void test_Simple_Render()
+ @Test(dataProvider = "mainSupport")
+ public void test_Simple_Render(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -1047,7 +1074,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -1101,7 +1128,8 @@
verify();
}
- public void test_Simple_Render_With_Deferred_Runnable()
+ @Test(dataProvider = "mainSupport")
+ public void test_Simple_Render_With_Deferred_Runnable(FormSupportFactory
factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -1121,7 +1149,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -1182,7 +1210,8 @@
verify();
}
- public void test_Simple_Render_With_Scheme()
+ @Test(dataProvider = "mainSupport")
+ public void test_Simple_Render_With_Scheme(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -1202,7 +1231,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -1256,7 +1285,8 @@
verify();
}
- public void test_Simple_Rewind()
+ @Test(dataProvider = "mainSupport")
+ public void test_Simple_Rewind(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -1271,7 +1301,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -1297,7 +1327,8 @@
verify();
}
- public void test_Simple_Rewind_With_Deferred_Runnable()
+ @Test(dataProvider = "mainSupport")
+ public void test_Simple_Rewind_With_Deferred_Runnable(FormSupportFactory
factory)
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
@@ -1312,7 +1343,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
@@ -1353,7 +1384,8 @@
verify();
}
- public void test_Simple_Submit_Event_Handler()
+ @Test(dataProvider = "mainSupport")
+ public void test_Simple_Submit_Event_Handler(FormSupportFactory factory)
{
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
@@ -1373,7 +1405,7 @@
replay();
- final FormSupport fs = newFormSupport(writer, cycle, form);
+ final FormSupport fs = factory.createFormSupport(writer, cycle, form);
verify();
