svn commit: r1310633 - in /tomcat/trunk/test/javax: el/TestCompositeELResolver.java servlet/jsp/TestPageContext.java

[markt]

Author: markt
Date: Fri Apr  6 23:36:16 2012
New Revision: 1310633

URL: http://svn.apache.org/viewvc?rev=1310633&view=rev
Log:
Revert 1310541 that removed static imports

Modified:
    tomcat/trunk/test/javax/el/TestCompositeELResolver.java
    tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java

Modified: tomcat/trunk/test/javax/el/TestCompositeELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestCompositeELResolver.java?rev=1310633&r1=1310632&r2=1310633&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestCompositeELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestCompositeELResolver.java Fri Apr  6 23:36:16 
2012
@@ -20,7 +20,8 @@ import java.io.File;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 import org.apache.catalina.core.StandardContext;
@@ -48,6 +49,6 @@ public class TestCompositeELResolver ext
         int rc = getUrl("http://localhost:"; + getPort() +
                 "/test/bug50408.jsp", new ByteChunk(), null);
 
-        Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+        assertEquals(HttpServletResponse.SC_OK, rc);
     }
 }

Modified: tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java?rev=1310633&r1=1310632&r2=1310633&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java (original)
+++ tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java Fri Apr  6 
23:36:16 2012
@@ -19,7 +19,8 @@ package javax.servlet.jsp;
 
 import java.io.File;
 
-import org.junit.Assert;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 import org.apache.catalina.startup.Tomcat;
@@ -42,6 +43,6 @@ public class TestPageContext extends Tom
                 "/test/bug49nnn/bug49196.jsp");
 
         String result = res.toString();
-        Assert.assertTrue(result.contains("OK"));
+        assertTrue(result.contains("OK"));
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org