You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2018/01/13 14:08:14 UTC
wicket git commit: Tests are partially fixed
Repository: wicket
Updated Branches:
refs/heads/WICKET-6498_deferred_javascript ecff3b60c -> 9836d109d
Tests are partially fixed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9836d109
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9836d109
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9836d109
Branch: refs/heads/WICKET-6498_deferred_javascript
Commit: 9836d109dc0ffbae449796a2ff80534d9d4f2f84
Parents: ecff3b6
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Jan 13 21:08:03 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Jan 13 21:08:03 2018 +0700
----------------------------------------------------------------------
.../head/filter/FilteringHeaderResponse.java | 1 -
.../resource/JQueryPluginResourceReference.java | 2 +-
.../filter/FilteringHeaderResponseTest.java | 29 ++++++++++----------
.../HideableBorderPage_ExpectedResult.html | 22 +++++++--------
.../ResourceAggregatorTest1Page_results.html | 5 ++--
.../ResourceAggregatorTest2Page_results.html | 5 ++--
6 files changed, 33 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9836d109/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
index f388803..233b588 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
@@ -27,7 +27,6 @@ import org.apache.wicket.MetaDataKey;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.ResourceAggregator;
import org.apache.wicket.markup.head.internal.HeaderResponse;
import org.apache.wicket.markup.html.DecoratingHeaderResponse;
import org.apache.wicket.request.Response;
http://git-wip-us.apache.org/repos/asf/wicket/blob/9836d109/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
index 30abada..044158b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
@@ -80,7 +80,7 @@ public class JQueryPluginResourceReference extends JavaScriptResourceReference
}
else
{
- backingLibraryReference = DynamicJQueryResourceReference.get();
+ backingLibraryReference = DynamicJQueryResourceReference.getV2();
}
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(backingLibraryReference));
http://git-wip-us.apache.org/repos/asf/wicket/blob/9836d109/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
index 6c1473d..570e105 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
@@ -63,20 +63,21 @@ public class FilteringHeaderResponseTest extends WicketTestCase
@Test
public void createBucketOnTheFlyForFilteredHeaderItem() throws Exception
{
- FilteringHeaderResponse headerResponse = new FilteringHeaderResponse(new HeaderResponse()
- {
- @Override
- protected Response getRealResponse()
+ try (FilteringHeaderResponse headerResponse = new FilteringHeaderResponse(new HeaderResponse()
{
- return new StringResponse();
- }
- }, "headerBucketName", Collections.EMPTY_LIST);
-
- String filterName = "filterName";
- String headerContent = "content";
- FilteredHeaderItem item = new FilteredHeaderItem(StringHeaderItem.forString(headerContent), filterName);
- headerResponse.render(item);
- CharSequence realContent = headerResponse.getContent(filterName);
- assertEquals(headerContent, realContent.toString());
+ @Override
+ protected Response getRealResponse()
+ {
+ return new StringResponse();
+ }
+ }, "headerBucketName", Collections.EMPTY_LIST))
+ {
+ String filterName = "filterName";
+ String headerContent = "content";
+ FilteredHeaderItem item = new FilteredHeaderItem(StringHeaderItem.forString(headerContent), filterName);
+ headerResponse.render(item);
+ CharSequence realContent = headerResponse.getContent(filterName);
+ assertEquals(headerContent, realContent.toString());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/9836d109/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
index a9f9aa7..998cdb4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
@@ -2,22 +2,22 @@
<head><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" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
-/*<![CDATA[*/
-Wicket.Ajax.DebugWindow.enabled=true;
-/*]]>*/
-</script>
-<script type="text/javascript" id="wicket-ajax-base-url">
+<script type="text/javascript" >
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.HideableBorderPage?0";
+(function() {var f = function() {
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.0-hideable-hideLink","c":"hideLink1","e":"click"});;
+Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
+;};
+if ('loading' !== document.readyState) f(); else document.addEventListener('DOMContentLoaded', f);})();
/*]]>*/
</script>
<script type="text/javascript" >
/*<![CDATA[*/
-Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.0-hideable-hideLink","c":"hideLink1","e":"click"});;
-Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
-;});
+(function() {var f = function() {
+Wicket.Ajax.DebugWindow.enabled=true;;
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.HideableBorderPage?0";;
+;};
+if ('complete' === document.readyState) f(); else window.addEventListener('load', f);})();
/*]]>*/
</script>
</head><body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9836d109/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
index 6a53359..61db362 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
@@ -7,10 +7,11 @@
<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, "domready", function(event) {
+(function() {var f = function() {
alert('Hello World!');;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
-;});
+;};
+if ('loading' !== document.readyState) f(); else document.addEventListener('DOMContentLoaded', f);})();
/*]]>*/
</script>
</head>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9836d109/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
index 3a70f51..96400bc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
@@ -8,10 +8,11 @@
<script type="text/javascript" src="../resource/org.apache.wicket.resource.aggregator.ResourceAggregatorTest2Page/ResourceAggregatorTest2Page.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
-Wicket.Event.add(window, "domready", function(event) {
+(function() {var f = function() {
alert('Hello World!');;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
-;});
+;};
+if ('loading' !== document.readyState) f(); else document.addEventListener('DOMContentLoaded', f);})();
/*]]>*/
</script>
</head>