diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java index 8693ed6bab..537d44be8e 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 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. @@ -16,22 +16,24 @@ package org.springframework.mock.web; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.util.Set; -import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; - /** * @author Juergen Hoeller * @author Chris Beams + * @author Sam Brannen * @since 19.02.2006 */ public class MockServletContextTests { - @Ignore - // fails to work under ant after move from .testsuite -> .test @Test public void testListFiles() { MockServletContext sc = new MockServletContext("org/springframework/mock"); @@ -40,8 +42,6 @@ public class MockServletContextTests { assertTrue(paths.contains("/web/MockServletContextTests.class")); } - @Ignore - // fails to work under ant after move from .testsuite -> .test @Test public void testListSubdirectories() { MockServletContext sc = new MockServletContext("org/springframework/mock");