You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/06/14 21:11:56 UTC
wicket git commit: added additional test code
Repository: wicket
Updated Branches:
refs/heads/WICKET-5906-7.x 9dc1846d9 -> 926aa3729
added additional test code
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/926aa372
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/926aa372
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/926aa372
Branch: refs/heads/WICKET-5906-7.x
Commit: 926aa3729b2ab54b3625dde1a3a7d5e1ace31d72
Parents: 9dc1846
Author: Andrea Del Bene <ad...@apache.org>
Authored: Sun Jun 14 21:11:22 2015 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Sun Jun 14 21:11:22 2015 +0200
----------------------------------------------------------------------
.../wicket/resource/ResourceUtilTest.java | 40 ++++++++++++++++++++
1 file changed, 40 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/926aa372/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
index 446bd0f..74caa2c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
@@ -19,9 +19,11 @@ package org.apache.wicket.resource;
import java.util.Locale;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.ResourceReference.UrlAttributes;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Mockito;
public class ResourceUtilTest extends Assert
@@ -93,4 +95,42 @@ public class ResourceUtilTest extends Assert
assertEquals("--variation", ResourceUtil.encodeResourceReferenceAttributes(attributes));
}
+
+ @Test
+ public void encodeResourceReferenceAttributesWithResource() throws Exception
+ {
+ ResourceReference resourceReference = Mockito.mock(ResourceReference.class);
+ UrlAttributes attributes = new UrlAttributes(null, null, null);
+
+ String urlString = "www.funny.url";
+ Url url = Url.parse(urlString);
+
+ Mockito.when(resourceReference.getUrlAttributes()).thenReturn(attributes);
+ ResourceUtil.encodeResourceReferenceAttributes(url, resourceReference);
+
+ //test with all null attributes
+ assertEquals(urlString, url.toString());
+
+ Mockito.reset(resourceReference);
+
+ //test with locale, style and variation
+ attributes = new UrlAttributes(Locale.CANADA_FRENCH, "style", "variation");
+
+ Mockito.when(resourceReference.getUrlAttributes()).thenReturn(attributes);
+ ResourceUtil.encodeResourceReferenceAttributes(url, resourceReference);
+
+ assertEquals(urlString + "?fr_CA-style-variation", url.toString());
+
+ Mockito.reset(resourceReference);
+
+ //test with just variation
+ attributes = new UrlAttributes(null, null, "variation");
+ url = Url.parse(urlString);
+
+ Mockito.when(resourceReference.getUrlAttributes()).thenReturn(attributes);
+ ResourceUtil.encodeResourceReferenceAttributes(url, resourceReference);
+
+ assertEquals(urlString + "?--variation", url.toString());
+
+ }
}