root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove some try/catch blocks from test methods

Browse Source
pull/4/merge
Dave Syer 12 years ago
parent 4b1c58d736
commit 7bf3e35249
2 changed files with 63 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java
Unescape Escape View File

@ -41,6 +41,6 @@ public interface EmbeddedServletContainerFactory {
* @see EmbeddedServletContainer#stop()
*/
EmbeddedServletContainer getEmbdeddedServletContainer(
ServletContextInitializer... initializers); //TODO(6/14/2013) Fix name of method
ServletContextInitializer... initializers);
}

105
spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java
Unescape Escape View File

@ -15,15 +15,12 @@
*/
package org.springframework.bootstrap.autoconfigure.web;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import javax.servlet.MultipartConfigElement;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.junit.rules.ExpectedException;
import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
@ -38,38 +35,43 @@ import org.springframework.web.multipart.support.StandardServletMultipartResolve
import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
/**
* A series of embedded unit tests, based on an empty configuration, no multipart
* configuration, and a multipart configuration, with both Jetty and Tomcat.
*
* @author Greg Turnquist
* @author Dave Syer
*/
public class MultipartAutoConfigurationTests {
private AnnotationConfigEmbeddedWebApplicationContext context;
@Rule
public ExpectedException exception = ExpectedException.none();
@After
public void close() {
if (this.context != null) {
this.context.close();
}
}
@Test
public void containerWithNothing() {
this.context = new AnnotationConfigEmbeddedWebApplicationContext(
ContainerWithNothing.class,
EmbeddedServletContainerAutoConfiguration.class,
MultipartAutoConfiguration.class);
try {
DispatcherServlet servlet = this.context.getBean(DispatcherServlet.class);
assertNull(servlet.getMultipartResolver());
try {
this.context.getBean(StandardServletMultipartResolver.class);
fail("Expected to receive a " + NoSuchBeanDefinitionException.class);
} catch (NoSuchBeanDefinitionException e) {
}
try {
this.context.getBean(MultipartResolver.class);
fail("Expected to receive a " + NoSuchBeanDefinitionException.class);
} catch (NoSuchBeanDefinitionException e) {
}
} finally {
this.context.close();
}
assertEquals(0,
this.context.getBeansOfType(StandardServletMultipartResolver.class)
.size());
assertEquals(0, this.context.getBeansOfType(MultipartResolver.class).size());
}
@Configuration
@ -82,23 +84,13 @@ public class MultipartAutoConfigurationTests {
ContainerWithNoMultipartJetty.class,
EmbeddedServletContainerAutoConfiguration.class,
MultipartAutoConfiguration.class);
try {
DispatcherServlet servlet = this.context.getBean(DispatcherServlet.class);
assertNull(servlet.getMultipartResolver());
try {
this.context.getBean(StandardServletMultipartResolver.class);
fail("Expected to receive a " + NoSuchBeanDefinitionException.class);
} catch (NoSuchBeanDefinitionException e) {
}
try {
this.context.getBean(MultipartResolver.class);
fail("Expected to receive a " + NoSuchBeanDefinitionException.class);
} catch (NoSuchBeanDefinitionException e) {
}
assertEquals(0,
this.context.getBeansOfType(StandardServletMultipartResolver.class)
.size());
assertEquals(0, this.context.getBeansOfType(MultipartResolver.class).size());
verifyServletWorks();
} finally {
this.context.close();
}
}
@Configuration
@ -107,6 +99,7 @@ public class MultipartAutoConfigurationTests {
JettyEmbeddedServletContainerFactory containerFactory() {
return new JettyEmbeddedServletContainerFactory();
}
@Bean
WebController controller() {
return new WebController();
@ -119,23 +112,13 @@ public class MultipartAutoConfigurationTests {
ContainerWithNoMultipartTomcat.class,
EmbeddedServletContainerAutoConfiguration.class,
MultipartAutoConfiguration.class);
try {
DispatcherServlet servlet = this.context.getBean(DispatcherServlet.class);
assertNull(servlet.getMultipartResolver());
try {
this.context.getBean(StandardServletMultipartResolver.class);
fail("Expected to receive a " + NoSuchBeanDefinitionException.class);
} catch (NoSuchBeanDefinitionException e) {
}
try {
this.context.getBean(MultipartResolver.class);
fail("Expected to receive a " + NoSuchBeanDefinitionException.class);
} catch (NoSuchBeanDefinitionException e) {
}
assertEquals(0,
this.context.getBeansOfType(StandardServletMultipartResolver.class)
.size());
assertEquals(0, this.context.getBeansOfType(MultipartResolver.class).size());
verifyServletWorks();
} finally {
this.context.close();
}
}
@Configuration
@ -144,6 +127,7 @@ public class MultipartAutoConfigurationTests {
TomcatEmbeddedServletContainerFactory containerFactory() {
return new TomcatEmbeddedServletContainerFactory();
}
@Bean
WebController controller() {
return new WebController();
@ -156,15 +140,10 @@ public class MultipartAutoConfigurationTests {
ContainerWithEverythingJetty.class,
EmbeddedServletContainerAutoConfiguration.class,
MultipartAutoConfiguration.class);
try {
this.context.getBean(MultipartConfigElement.class);
assertSame(
this.context.getBean(DispatcherServlet.class).getMultipartResolver(),
assertSame(this.context.getBean(DispatcherServlet.class).getMultipartResolver(),
this.context.getBean(StandardServletMultipartResolver.class));
verifyServletWorks();
} finally {
this.context.close();
}
}
@Configuration
@ -173,10 +152,12 @@ public class MultipartAutoConfigurationTests {
MultipartConfigElement multipartConfigElement() {
return new MultipartConfigElement("");
}
@Bean
JettyEmbeddedServletContainerFactory containerFactory() {
return new JettyEmbeddedServletContainerFactory();
}
@Bean
WebController webController() {
return new WebController();
@ -189,15 +170,10 @@ public class MultipartAutoConfigurationTests {
ContainerWithEverythingTomcat.class,
EmbeddedServletContainerAutoConfiguration.class,
MultipartAutoConfiguration.class);
try {
this.context.getBean(MultipartConfigElement.class);
assertSame(
this.context.getBean(DispatcherServlet.class).getMultipartResolver(),
assertSame(this.context.getBean(DispatcherServlet.class).getMultipartResolver(),
this.context.getBean(StandardServletMultipartResolver.class));
verifyServletWorks();
} finally {
this.context.close();
}
}
@Configuration
@ -207,10 +183,12 @@ public class MultipartAutoConfigurationTests {
MultipartConfigElement multipartConfigElement() {
return new MultipartConfigElement("");
}
@Bean
TomcatEmbeddedServletContainerFactory containerFactory() {
return new TomcatEmbeddedServletContainerFactory();
}
@Bean
WebController webController() {
return new WebController();
@ -220,15 +198,16 @@ public class MultipartAutoConfigurationTests {
@Controller
public static class WebController {
@RequestMapping("/")
public @ResponseBody String index() {
public @ResponseBody
String index() {
return "Hello";
}
}
private void verifyServletWorks() {
RestTemplate restTemplate = new RestTemplate();
assertEquals(restTemplate.getForObject("http://localhost:8080/", String.class), "Hello");
assertEquals(restTemplate.getForObject("http://localhost:8080/", String.class),
"Hello");
}
}

Write Preview
Loading…
Cancel
Save