Updated Branches: refs/heads/master bfae6c64d -> 9c5106ade
WICKET-4457 setTextEncoding on JavascriptResourceReferences/CssResourceReferences: add test Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9c5106ad Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9c5106ad Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9c5106ad Branch: refs/heads/master Commit: 9c5106ade58166108adc9e39cbc52785bcd9c02b Parents: bfae6c6 Author: Peter Ertl <[email protected]> Authored: Tue May 8 01:14:57 2012 +0200 Committer: Peter Ertl <[email protected]> Committed: Tue May 8 01:14:57 2012 +0200 ---------------------------------------------------------------------- .../wicket/markup/html/PackageResourceTest.java | 32 +++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9c5106ad/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java index a63e153..056fad9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java @@ -22,6 +22,8 @@ import org.apache.wicket.Application; import org.apache.wicket.SharedResources; import org.apache.wicket.WicketTestCase; import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.request.resource.JavaScriptPackageResource; +import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResource; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; @@ -156,4 +158,34 @@ public class PackageResourceTest extends WicketTestCase tester.startResource(jsResource); assertEquals("text/javascript", tester.getLastResponse().getContentType()); } + + @Test + public void textFileWithEncoding() + { + final String encoding = "Klingon-8859-42"; + final PackageResource resource = + new PackageResource(PackageResourceTest.class, "packaged1.txt", null, null, null) + { + private static final long serialVersionUID = 1L; + }; + resource.setTextEncoding(encoding); + tester.startResource(resource); + final String contentType = tester.getLastResponse().getContentType(); + assertEquals("text/plain; charset=" + encoding, contentType); + } + + @Test + public void javascriptFileWithEncoding() + { + final String encoding = "Klingon-8859-42"; + final JavaScriptPackageResource resource = + new JavaScriptPackageResource(PackageResourceTest.class, "packaged3.js", null, null, null) + { + private static final long serialVersionUID = 1L; + }; + resource.setTextEncoding(encoding); + tester.startResource(resource); + final String contentType = tester.getLastResponse().getContentType(); + assertEquals("text/javascript; charset=" + encoding, contentType); + } }
