Author: markt
Date: Fri Jan 18 13:24:05 2013
New Revision: 1435126
URL: http://svn.apache.org/viewvc?rev=1435126&view=rev
Log:
Make sure JUnit 4 imports are used
Modified:
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1435126&r1=1435125&r2=1435126&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Fri Jan 18 13:24:05 2013
@@ -57,7 +57,9 @@
value="org.apache.catalina.startup.SimpleHttpClient.CRLF"/>
<property name="excludes" value="org.junit.Assert.*"/>
</module>
- <module name="IllegalImport"/>
+ <module name="IllegalImport">
+ <property name="illegalPkgs" value="sun,junit.framework"/>
+ </module>
<module name="ImportOrder">
<property name="groups"
value="java,javax,async,jsp2,junit,org.junit,org,util"/>
<property name="ordered" value="true"/>
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1435126&r1=1435125&r2=1435126&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Fri
Jan 18 13:24:05 2013
@@ -39,13 +39,12 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import junit.framework.Assert;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1435126&r1=1435125&r2=1435126&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Fri Jan
18 13:24:05 2013
@@ -38,8 +38,7 @@ import javax.servlet.http.HttpServletRes
import javax.servlet.http.ProtocolHandler;
import javax.servlet.http.WebConnection;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java?rev=1435126&r1=1435125&r2=1435126&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java Fri
Jan 18 13:24:05 2013
@@ -19,12 +19,11 @@ package org.apache.tomcat.util.http.pars
import java.io.IOException;
import java.io.StringReader;
-import junit.framework.Assert;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.junit.Assert;
import org.junit.Test;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
