Updated Branches: refs/heads/master 2624d2db8 -> 384cb3a4d
WICKET-4471: testcases for bundles, also with external urls Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/384cb3a4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/384cb3a4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/384cb3a4 Branch: refs/heads/master Commit: 384cb3a4db1bff465b2ba04b66c57f3c03b7f9fb Parents: e0692c6 Author: Emond Papegaaij <[email protected]> Authored: Tue Mar 27 17:23:19 2012 +0200 Committer: Emond Papegaaij <[email protected]> Committed: Tue Mar 27 17:23:19 2012 +0200 ---------------------------------------------------------------------- .../wicket/request/resource/BundlesPage.html | 5 ++ .../wicket/request/resource/BundlesPage.java | 43 ++++++++++++++ .../request/resource/BundlesPage_ext_result.html | 6 ++ .../request/resource/BundlesPage_result.html | 6 ++ .../wicket/request/resource/ResouceBundleTest.java | 46 ++++++++++++++- 5 files changed, 105 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/384cb3a4/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.html b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.html new file mode 100644 index 0000000..612e1cb --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.html @@ -0,0 +1,5 @@ +<html> +<body> + +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/384cb3a4/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.java new file mode 100644 index 0000000..74d4084 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage.java @@ -0,0 +1,43 @@ +/* + * 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.request.resource; + +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.markup.html.WebPage; + +/** + * @author papegaaij + */ +public class BundlesPage extends WebPage +{ + private static final long serialVersionUID = 1L; + + /** + * Construct. + */ + public BundlesPage() + { + } + + @Override + public void renderHead(IHeaderResponse response) + { + response.render(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference( + ResouceBundleTest.class, "a.js"))); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/384cb3a4/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html new file mode 100644 index 0000000..22b3d69 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html @@ -0,0 +1,6 @@ +<html> +<head><script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js";></script> +</head><body> + +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/384cb3a4/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html new file mode 100644 index 0000000..02caf0a --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html @@ -0,0 +1,6 @@ +<html> +<head><script type="text/javascript" src="../resource/org.apache.wicket.request.resource.ResouceBundleTest/ab.js"></script> +</head><body> + +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/384cb3a4/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java index 8555ab1..3d561c2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java @@ -20,7 +20,9 @@ import java.util.Arrays; import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.request.Url; import org.apache.wicket.resource.bundles.ConcatBundleResource; +import org.apache.wicket.resource.bundles.ResourceBundleReference; import org.junit.Test; /** @@ -38,11 +40,53 @@ public class ResouceBundleTest extends WicketTestCase { ConcatBundleResource bundle = new ConcatBundleResource(Arrays.asList( JavaScriptHeaderItem.forReference(new JavaScriptResourceReference( - ResouceBundleTest.class, "a.js")), + ResouceBundleTest.class, "a.js")), JavaScriptHeaderItem.forReference(new JavaScriptResourceReference( ResouceBundleTest.class, "b.js")))); tester.startResource(bundle); assertEquals("//a\n//b\n", tester.getLastResponseAsString()); } + + /** + * Tests the replacement of provided resources by their bundle + * + * @throws Exception + */ + @Test + public void providedResource() throws Exception + { + tester.getApplication() + .getResourceBundles() + .addJavaScriptBundle(ResouceBundleTest.class, "ab.js", + new JavaScriptResourceReference(ResouceBundleTest.class, "a.js"), + new JavaScriptResourceReference(ResouceBundleTest.class, "b.js")); + + executeTest(BundlesPage.class, "BundlesPage_result.html"); + } + + /** + * Tests an external resource bundle + * + * @throws Exception + */ + @Test + public void externalBundle() throws Exception + { + ResourceBundleReference bundle = new ResourceBundleReference( + new ExternalUrlResourceReference( + Url.parse("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js";))); + bundle.addProvidedResources( + JavaScriptHeaderItem.forReference(new JavaScriptResourceReference( + ResouceBundleTest.class, "a.js")), + JavaScriptHeaderItem.forReference(new JavaScriptResourceReference( + ResouceBundleTest.class, "b.js"))); + + tester.getApplication() + .getResourceBundles() + .addBundle(JavaScriptHeaderItem.forReference(bundle)); + + + executeTest(BundlesPage.class, "BundlesPage_ext_result.html"); + } }
