From d25611dd40d6f17c70e67c1052c6629054c4e49a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 16 Jun 2013 19:55:35 +0200 Subject: [PATCH] Move MockMultHtServReqTests to correct package This commit relocates MockMultipartHttpServletRequestTests to the appropriate package. --- .../MockMultipartHttpServletRequestTests.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) rename spring-test/src/test/java/org/springframework/{web/multipart => mock/web}/MockMultipartHttpServletRequestTests.java (89%) diff --git a/spring-test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java similarity index 89% rename from spring-test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java rename to spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java index 029f584c1f..51fc9e983c 100644 --- a/spring-test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2013 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. @@ -14,12 +14,7 @@ * limitations under the License. */ -package org.springframework.web.multipart; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +package org.springframework.mock.web; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -31,10 +26,12 @@ import java.util.Map; import java.util.Set; import org.junit.Test; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.mock.web.MockMultipartHttpServletRequest; import org.springframework.util.FileCopyUtils; import org.springframework.util.ObjectUtils; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; + +import static org.junit.Assert.*; /** * @author Juergen Hoeller