You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/02/06 09:52:00 UTC
[27/38] git commit: WICKET-5019 cache minified name correctly
WICKET-5019 cache minified name correctly
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/917dd2b5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/917dd2b5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/917dd2b5
Branch: refs/heads/reference-guide
Commit: 917dd2b5e3314fe7c98a61cb3d16f0fef2c148c6
Parents: 742cade
Author: svenmeier <sv...@apache.org>
Authored: Thu Jan 31 21:44:13 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Thu Jan 31 21:44:13 2013 +0100
----------------------------------------------------------------------
.../request/resource/PackageResourceReference.java | 2 +-
.../MinifiedAwareResourceReferenceTest.java | 26 ++++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/917dd2b5/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 ea2ddb6..cc72731 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
@@ -173,7 +173,7 @@ public class PackageResourceReference extends ResourceReference
private String internalGetMinifiedName()
{
String minifiedName = MINIFIED_NAMES_CACHE.get(this);
- if (minifiedName != null && minifiedName != NO_MINIFIED_NAME)
+ if (minifiedName != null)
{
return minifiedName;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/917dd2b5/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
index 2bade84..7f8cadc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
@@ -18,8 +18,10 @@ package org.apache.wicket.request.resource;
import org.apache.wicket.Application;
import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.response.ByteArrayResponse;
+import org.apache.wicket.util.resource.IResourceStream;
import org.junit.Test;
/**
@@ -61,11 +63,33 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase
@Test
public void noMinifiedResourceAvailable()
{
+ MinCountingResourceStreamLocator locator = new MinCountingResourceStreamLocator();
+
+ Application.get().getResourceSettings().setResourceStreamLocator(locator);
Application.get().getResourceSettings().setUseMinifiedResources(true);
+
ResourceReference reference = new JavaScriptResourceReference(
MinifiedAwareResourceReferenceTest.class, "a.js");
assertEquals("a.js", reference.getName());
String fileContent = renderResource(reference);
assertEquals("//a", fileContent);
+
+ assertEquals(1, locator.minLocated);
+ }
+
+ private class MinCountingResourceStreamLocator extends ResourceStreamLocator
+ {
+ public int minLocated = 0;
+
+ @Override
+ public IResourceStream locate(Class<?> clazz, String path)
+ {
+ if (path.contains(".min."))
+ {
+ minLocated++;
+ }
+
+ return super.locate(clazz, path);
+ }
}
-}
+}
\ No newline at end of file