Repository: wicket Updated Branches: refs/heads/master 8042ef56a -> 104f7e264
WICKET-6527 added test for FilterForm Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/104f7e26 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/104f7e26 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/104f7e26 Branch: refs/heads/master Commit: 104f7e2648e3e8ece1e11128c0be66c351becd32 Parents: 8042ef5 Author: Sven Meier <svenme...@apache.org> Authored: Sat Feb 24 10:04:26 2018 +0100 Committer: Sven Meier <svenme...@apache.org> Committed: Sat Feb 24 10:04:26 2018 +0100 ---------------------------------------------------------------------- .../repeater/data/table/filter/FilterForm.java | 2 +- .../data/table/filter/FilterFormTest.java | 29 ++++++++++++ .../data/table/filter/FilterFormTestPage.html | 5 +++ .../data/table/filter/FilterFormTestPage.java | 47 ++++++++++++++++++++ .../filter/FilterFormTestPage_expected.html | 15 +++++++ 5 files changed, 97 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/104f7e26/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java index ab3537a..a5caa38 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java @@ -93,7 +93,7 @@ public class FilterForm<T> extends Form<T> getResponse().write( String.format( "<div style='position: absolute; left: -9999px; width: 1px; height: 1px;' class='%s'><input type='hidden' name='%s' id='%s' value='%s'/><input type='submit'/></div>", - id, id, Strings.escapeMarkup(value), cssClass)); + cssClass, id, id, Strings.escapeMarkup(value))); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/104f7e26/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java new file mode 100644 index 0000000..4dd1772 --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.extensions.markup.html.repeater.data.table.filter; + +import org.apache.wicket.util.tester.WicketTestCase; +import org.junit.Test; + +public class FilterFormTest extends WicketTestCase +{ + + @Test + public void test() throws Exception { + executeTest(FilterFormTestPage.class, "FilterFormTestPage_expected.html"); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/104f7e26/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.html ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.html b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.html new file mode 100644 index 0000000..86dd011 --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.html @@ -0,0 +1,5 @@ +<html xmlns:wicket> +<body> + <form wicket:id="form"></form> +</body> +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/104f7e26/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.java new file mode 100644 index 0000000..c80c62a --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.extensions.markup.html.repeater.data.table.filter; + +import org.apache.wicket.markup.html.WebPage; + + +public class FilterFormTestPage extends WebPage +{ + private static final long serialVersionUID = 1L; + + /** + * constructor + */ + public FilterFormTestPage() + { + add(new FilterForm<String>("form", new IFilterStateLocator<String>() + { + private String state; + + @Override + public String getFilterState() + { + return state; + } + @Override + public void setFilterState(String state) + { + this.state = state; + } + })); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/104f7e26/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html new file mode 100644 index 0000000..114850d --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html @@ -0,0 +1,15 @@ +<html xmlns:wicket> +<head><script type="text/javascript" src="../resource/org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm/wicket-filterform.js"></script> +<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script> +<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script> +<script type="text/javascript" > +/*<![CDATA[*/ +Wicket.Event.add(window, "load", function(event) { +Wicket.FilterForm.restore('form1focus');; +;}); +/*]]>*/ +</script> +</head><body> + <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterFormTestPage?0-1.-form"><div style='position: absolute; left: -9999px; width: 1px; height: 1px;' class='hidden-fields'><input type='hidden' name='form1focus' id='form1focus' value=''/><input type='submit'/></div></form> +</body> +</html>
