SPR-8823 Fix test error.

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2002-2011 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.support;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-/**
- * @author Rossen Stoyanchev
- */
-public class ServletUriComponentsBuilderTests {
-
-	private MockHttpServletRequest request;
-
-	@Before
-	public void setup() {
-		this.request = new MockHttpServletRequest();
-		this.request.setScheme("http");
-		this.request.setServerName("localhost");
-		this.request.setServerPort(80);
-		this.request.setContextPath("/mvc-showcase");
-	}
-	
-	@Test
-	public void fromRequest() {
-		request.setRequestURI("/mvc-showcase/data/param");
-		request.setQueryString("foo=123");
-
-		String result = ServletUriComponentsBuilder.fromRequest(request).build().toUriString();
-
-		assertEquals("http://localhost/mvc-showcase/data/param?foo=123", result);
-	}
-
-	@Test
-	public void fromRequestEncodedPath() {
-		request.setRequestURI("/mvc-showcase/data/foo%20bar;jsessionid=123");
-
-		String result = ServletUriComponentsBuilder.fromRequest(request).build().toUriString();
-
-		assertEquals("http://localhost/mvc-showcase/data/foo bar", result);
-	}
-
-	@Test
-	public void fromRequestAtypicalHttpPort() {
-		request.setServerPort(8080);
-		String result = ServletUriComponentsBuilder.fromRequest(request).build().toUriString();
-		
-		assertEquals("http://localhost:8080", result);
-	}
-	
-	@Test
-	public void fromRequestAtypicalHttpsPort() {
-		request.setScheme("https");
-		request.setServerPort(9043);
-		
-		String result = ServletUriComponentsBuilder.fromRequest(request).build().toUriString();
-		
-		assertEquals("https://localhost:9043", result);
-	}
-
-	@Test
-	public void fromContextPath() {
-		request.setRequestURI("/mvc-showcase/data/param");
-		request.setQueryString("foo=123");
-		
-		String result = ServletUriComponentsBuilder.fromContextPath(request).build().toUriString();
-		
-		assertEquals("http://localhost/mvc-showcase", result);
-	}	
-
-	@Test
-	public void fromServletMapping() {
-		request.setRequestURI("/mvc-showcase/app/simple");
-		request.setServletPath("/app");
-		request.setQueryString("foo=123");
-		
-		String result = ServletUriComponentsBuilder.fromServletMapping(request).build().toUriString();
-		
-		assertEquals("http://localhost/mvc-showcase/app", result);
-	}	
-
-	@Test
-	public void fromCurrentRequest() {
-		request.setRequestURI("/mvc-showcase/data/param");
-		request.setQueryString("foo=123");
-		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(this.request));
-
-		try {
-			String result = ServletUriComponentsBuilder.fromCurrentRequest().build().toUriString();
-
-			assertEquals("http://localhost/mvc-showcase/data/param?foo=123", result);
-		}
-		finally {
-			RequestContextHolder.resetRequestAttributes();
-		}
-	}
-	
-}