svn commit: r1662843 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java

[remm]

Author: remm
Date: Fri Feb 27 22:53:00 2015
New Revision: 1662843

URL: http://svn.apache.org/r1662843
Log:
Avoid NPE and fix JAR names.

Modified:
    tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1662843&r1=1662842&r2=1662843&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
Fri Feb 27 22:53:00 2015
@@ -63,6 +63,9 @@ public class TestStandardContextAliases
         ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
 
         String result = res.toString();
+        if (result == null) {
+            result = "";
+        }
 
         assertTrue(result.indexOf("00-PASS") > -1);
         assertTrue(result.indexOf("01-PASS") > -1);
@@ -86,12 +89,12 @@ public class TestStandardContextAliases
             ServletContext context = getServletContext();
 
             // Check resources individually
-            URL url = context.getResource("/WEB-INF/lib/jstl.jar");
+            URL url = 
context.getResource("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar");
             if (url != null) {
                 resp.getWriter().write("00-PASS\n");
             }
 
-            url = context.getResource("/WEB-INF/lib/standard.jar");
+            url = 
context.getResource("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar");
             if (url != null) {
                 resp.getWriter().write("01-PASS\n");
             }
@@ -102,10 +105,10 @@ public class TestStandardContextAliases
                 return;
             }
 
-            if (!libs.contains("/WEB-INF/lib/jstl.jar")) {
+            if 
(!libs.contains("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar")) {
                 return;
             }
-            if (!libs.contains("/WEB-INF/lib/standard.jar")) {
+            if 
(!libs.contains("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar")) {
                 return;
             }
 



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