Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish UriTemplateHandler related classes

Browse Source
This commit is contained in:
Rossen Stoyanchev
2016-03-03 13:33:04 -05:00
parent 44c32128dc
commit e98738d8ba
5 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-web/src/test/java/org/springframework/web/util/DefaultUriTemplateHandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,35 +15,27 @@
*/
package org.springframework.web.util;
import static org.junit.Assert.assertEquals;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
* Unit tests for {@link DefaultUriTemplateHandler}.
* @author Rossen Stoyanchev
*/
public class DefaultUriTemplateHandlerTests {
private DefaultUriTemplateHandler handler;
@Before
public void setUp() throws Exception {
this.handler = new DefaultUriTemplateHandler();
}
private final DefaultUriTemplateHandler handler = new DefaultUriTemplateHandler();
@Test
public void baseUrl() throws Exception {
this.handler.setBaseUrl("http://localhost:8080");
URI actual = this.handler.expand("/myapiresource");
URI expected = new URI("http://localhost:8080/myapiresource");
assertEquals(expected, actual);
}
@@ -52,35 +44,30 @@ public class DefaultUriTemplateHandlerTests {
public void baseUrlWithPartialPath() throws Exception {
this.handler.setBaseUrl("http://localhost:8080/context");
URI actual = this.handler.expand("/myapiresource");
URI expected = new URI("http://localhost:8080/context/myapiresource");
assertEquals(expected, actual);
}
@Test
public void expandWithFullPath() throws Exception {
Map<String, String> vars = new HashMap<String, String>(2);
Map<String, String> vars = new HashMap<>(2);
vars.put("hotel", "1");
vars.put("publicpath", "pics/logo.png");
String template = "http://example.com/hotels/{hotel}/pic/{publicpath}";
URI actual = this.handler.expand(template, vars);
URI expected = new URI("http://example.com/hotels/1/pic/pics/logo.png");
assertEquals(expected, actual);
}
@Test
public void expandWithFullPathAndParsePathEnabled() throws Exception {
Map<String, String> vars = new HashMap<String, String>(2);
this.handler.setParsePath(true);
Map<String, String> vars = new HashMap<>(2);
vars.put("hotel", "1");
vars.put("publicpath", "pics/logo.png");
vars.put("scale", "150x150");
String template = "http://example.com/hotels/{hotel}/pic/{publicpath}/size/{scale}";
this.handler.setParsePath(true);
URI actual = this.handler.expand(template, vars);
URI expected = new URI("http://example.com/hotels/1/pic/pics%2Flogo.png/size/150x150");
assertEquals(expected, actual);
}