This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch better-page-invalidation
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/better-page-invalidation by
this push:
new 91d9eb543 Fixing a couple of tests in FormsTests
91d9eb543 is described below
commit 91d9eb543d340bca7d354a0e461806a46ca43f32
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat May 13 13:43:39 2023 -0300
Fixing a couple of tests in FormsTests
---
.../tapestry5/integration/app1/FormTests.java | 10 ++-
.../tapestry5/integration/app1/SelectObj.java | 23 ++++++
.../tapestry5/integration/app1/SelectObjModel.java | 67 +++++++++++++++++
.../app1/pages/MultiZoneUpdateInsideForm.java | 87 +---------------------
4 files changed, 100 insertions(+), 87 deletions(-)
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
index 699eee455..d12b7f584 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
@@ -907,13 +907,19 @@ public class FormTests extends App1TestCase
}
@Test
- public void calendar_field_inside_bean_editor()
+ public void calendar_field_inside_bean_editor() throws InterruptedException
{
- openLinks("BeanEditor / Calendar Demo", "Reset Page State");
+// openLinks("BeanEditor / Calendar Demo", "Reset Page State");
+ open("/beaneditcalendardemo");
+ clickAndWait("link=Reset Page State");
type("calendar", "04/06/1978");
+
+ Thread.sleep(1000); // Test seems to go too fast
clickAndWait(SUBMIT);
+
+ Thread.sleep(1000); // Test seems to go too fast
assertTextPresent("Apr 6, 1978");
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/SelectObj.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/SelectObj.java
new file mode 100644
index 000000000..843f18e8b
--- /dev/null
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/SelectObj.java
@@ -0,0 +1,23 @@
+package org.apache.tapestry5.integration.app1;
+
+public class SelectObj
+{
+ final int id;
+ final String label;
+
+ public SelectObj(int id, String label)
+ {
+ this.id = id;
+ this.label = label;
+ }
+
+ public int getId()
+ {
+ return id;
+ }
+
+ public String getLabel()
+ {
+ return label;
+ }
+}
\ No newline at end of file
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/SelectObjModel.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/SelectObjModel.java
new file mode 100644
index 000000000..80ede04c2
--- /dev/null
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/SelectObjModel.java
@@ -0,0 +1,67 @@
+package org.apache.tapestry5.integration.app1;
+
+import java.util.List;
+
+import org.apache.tapestry5.AbstractOptionModel;
+import org.apache.tapestry5.OptionGroupModel;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.func.F;
+import org.apache.tapestry5.func.Mapper;
+import org.apache.tapestry5.util.AbstractSelectModel;
+
+public class SelectObjModel extends AbstractSelectModel implements
ValueEncoder<SelectObj>
+{
+ private final List<SelectObj> options;
+
+ public SelectObjModel(List<SelectObj> options)
+ {
+ this.options = options;
+ }
+
+ public List<OptionGroupModel> getOptionGroups()
+ {
+ return null;
+ }
+
+ public List<OptionModel> getOptions()
+ {
+ assert options != null;
+ return F.flow(options).map(new Mapper<SelectObj, OptionModel>()
+ {
+ public OptionModel map(final SelectObj input)
+ {
+ return new AbstractOptionModel()
+ {
+ public Object getValue()
+ {
+ return input;
+ }
+
+ public String getLabel()
+ {
+ return input.getLabel();
+ }
+ };
+ }
+ }).toList();
+ }
+
+ public String toClient(SelectObj value)
+ {
+ return String.valueOf(value.getId());
+ }
+
+ public SelectObj toValue(String clientValue)
+ {
+ int id = Integer.parseInt(clientValue);
+
+ for (SelectObj so : options)
+ {
+ if (so.id == id)
+ return so;
+ }
+
+ return null;
+ }
+}
\ No newline at end of file
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java
index 326c84926..137339e7e 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiZoneUpdateInsideForm.java
@@ -16,23 +16,18 @@ import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tapestry5.AbstractOptionModel;
import org.apache.tapestry5.EventContext;
-import org.apache.tapestry5.OptionGroupModel;
-import org.apache.tapestry5.OptionModel;
import org.apache.tapestry5.SelectModel;
-import org.apache.tapestry5.ValueEncoder;
import org.apache.tapestry5.ajax.MultiZoneUpdate;
import org.apache.tapestry5.annotations.Component;
import org.apache.tapestry5.annotations.Log;
import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.corelib.components.Select;
import org.apache.tapestry5.corelib.components.Zone;
-import org.apache.tapestry5.func.F;
-import org.apache.tapestry5.func.Mapper;
import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.integration.app1.SelectObj;
+import org.apache.tapestry5.integration.app1.SelectObjModel;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.util.AbstractSelectModel;
public class MultiZoneUpdateInsideForm
{
@@ -69,84 +64,6 @@ public class MultiZoneUpdateInsideForm
return new Object[] {13, RetentionPolicy.RUNTIME};
}
- public class SelectObj
- {
- final int id;
- final String label;
-
- public SelectObj(int id, String label)
- {
- this.id = id;
- this.label = label;
- }
-
- public int getId()
- {
- return id;
- }
-
- public String getLabel()
- {
- return label;
- }
- }
-
- public class SelectObjModel extends AbstractSelectModel implements
ValueEncoder<SelectObj>
- {
- private final List<SelectObj> options;
-
- public SelectObjModel(List<SelectObj> options)
- {
- this.options = options;
- }
-
- public List<OptionGroupModel> getOptionGroups()
- {
- return null;
- }
-
- public List<OptionModel> getOptions()
- {
- assert options != null;
- return F.flow(options).map(new Mapper<SelectObj, OptionModel>()
- {
- public OptionModel map(final SelectObj input)
- {
- return new AbstractOptionModel()
- {
- public Object getValue()
- {
- return input;
- }
-
- public String getLabel()
- {
- return input.getLabel();
- }
- };
- }
- }).toList();
- }
-
- public String toClient(SelectObj value)
- {
- return String.valueOf(value.getId());
- }
-
- public SelectObj toValue(String clientValue)
- {
- int id = Integer.parseInt(clientValue);
-
- for (SelectObj so : options)
- {
- if (so.id == id)
- return so;
- }
-
- return null;
- }
- }
-
void onActivate(EventContext ctx)
{
List<SelectObj> select1List = new ArrayList();
