Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 259F3F1D8 for ; Fri, 22 Mar 2013 21:02:19 +0000 (UTC) Received: (qmail 81278 invoked by uid 500); 22 Mar 2013 21:02:18 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 81194 invoked by uid 500); 22 Mar 2013 21:02:18 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 81184 invoked by uid 99); 22 Mar 2013 21:02:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 21:02:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 21:02:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B267D23889D7 for ; Fri, 22 Mar 2013 21:01:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459987 - in /tomcat/tc7.0.x/trunk: ./ test/javax/el/ test/org/apache/catalina/comet/ test/org/apache/catalina/filters/ test/org/apache/catalina/loader/ test/org/apache/jasper/runtime/ test/org/apache/naming/resources/ Date: Fri, 22 Mar 2013 21:01:53 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130322210153.B267D23889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kkolinko Date: Fri Mar 22 21:01:52 2013 New Revision: 1459987 URL: http://svn.apache.org/r1459987 Log: Merged revision 1402683 from tomcat/trunk: Use methods from JUnit 4 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/javax/el/TestBeanELResolver.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1402683 Modified: tomcat/tc7.0.x/trunk/test/javax/el/TestBeanELResolver.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/javax/el/TestBeanELResolver.java?rev=1459987&r1=1459986&r2=1459987&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/javax/el/TestBeanELResolver.java (original) +++ tomcat/tc7.0.x/trunk/test/javax/el/TestBeanELResolver.java Fri Mar 22 21:01:52 2013 @@ -16,7 +16,7 @@ */ package javax.el; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1459987&r1=1459986&r2=1459987&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Fri Mar 22 21:01:52 2013 @@ -28,12 +28,11 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import junit.framework.Assert; - import static org.junit.Assert.assertEquals; 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/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java?rev=1459987&r1=1459986&r2=1459987&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java Fri Mar 22 21:01:52 2013 @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java?rev=1459987&r1=1459986&r2=1459987&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java Fri Mar 22 21:01:52 2013 @@ -37,12 +37,11 @@ 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.assertFalse; import static org.junit.Assert.assertNull; +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.AccessLog; Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java?rev=1459987&r1=1459986&r2=1459987&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java Fri Mar 22 21:01:52 2013 @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java?rev=1459987&r1=1459986&r2=1459987&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java Fri Mar 22 21:01:52 2013 @@ -20,7 +20,7 @@ import java.io.File; import javax.servlet.http.HttpServletResponse; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; Modified: tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1459987&r1=1459986&r2=1459987&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java Fri Mar 22 21:01:52 2013 @@ -33,11 +33,10 @@ 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.assertTrue; +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.core.StandardContext; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org