Updated Branches: refs/heads/wicket-6.x 05e08a2d3 -> b2427ddb1
Merge branch 'WICKET-5251' of https://github.com/CedricGatay/wicket into WICKET-5251 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9eacfef1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9eacfef1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9eacfef1 Branch: refs/heads/wicket-6.x Commit: 9eacfef1f4716edd5a805f6fe2d72320305bd628 Parents: 05e08a2 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Jun 26 12:33:15 2013 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Jun 26 12:39:21 2013 +0300 ---------------------------------------------------------------------- .../resource/PackageResourceReference.java | 9 ++++++++- .../resource/PackageResourceReferenceTest.java | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9eacfef1/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java index cc72731..710eef2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java @@ -207,7 +207,14 @@ public class PackageResourceReference extends ResourceReference if (idxOfExtension > -1) { String extension = name.substring(idxOfExtension); - minifiedName = name.substring(0, name.length() - extension.length() + 1) + "min" + extension; + final String baseName = name.substring(0, name.length() - extension.length() + 1); + if (!".min".equals(extension) && !baseName.endsWith(".min.")) + { + minifiedName = baseName + "min" + extension; + } else + { + minifiedName = name; + } } else { minifiedName = name + ".min"; http://git-wip-us.apache.org/repos/asf/wicket/blob/9eacfef1/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java index cbde900..63cb6ec 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java @@ -22,6 +22,7 @@ import org.apache.wicket.WicketTestCase; import org.apache.wicket.request.resource.IResource.Attributes; import org.apache.wicket.request.resource.ResourceReference.UrlAttributes; import org.apache.wicket.response.ByteArrayResponse; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -184,4 +185,23 @@ public class PackageResourceReferenceTest extends WicketTestCase } } + /** + * see WICKET-5251 : Proper detection of already minified resources + */ + @Test + public void testMinifiedNameDetectMinInName() throws Exception + { + final PackageResourceReference html5minjs = new PackageResourceReference("html5.min.js"); + Assert.assertEquals("html5.min.js", html5minjs.getMinifiedName()); + + final PackageResourceReference html5notminjs = new PackageResourceReference("html5.notmin.js"); + Assert.assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName()); + + final PackageResourceReference html5notmin = new PackageResourceReference("html5notmin"); + Assert.assertEquals("html5notmin.min", html5notmin.getMinifiedName()); + + final PackageResourceReference html5min = new PackageResourceReference("html5.min"); + Assert.assertEquals("html5.min", html5min.getMinifiedName()); + + } }
