craigmcc 01/05/14 19:23:18
Modified:
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletConfig
ServletConfigGetServletContextTestServlet.java
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext
ServletContextGetContextTestServlet.java
Log:
Provide more information on a failure to assist in debugging.
Revision Changes Path
1.2 +5 -3
jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletConfig/ServletConfigGetServletContextTestServlet.java
Index: ServletConfigGetServletContextTestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletConfig/ServletConfigGetServletContextTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletConfigGetServletContextTestServlet.java 2000/10/16 22:47:09 1.1
+++ ServletConfigGetServletContextTestServlet.java 2001/05/15 02:23:17 1.2
@@ -1,6 +1,6 @@
/*
- * $Header:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletConfig/ServletConfigGetServletContextTestServlet.java,v
1.1 2000/10/16 22:47:09 santosh Exp $
- * $Date: 2000/10/16 22:47:09 $
+ * $Header:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletConfig/ServletConfigGetServletContextTestServlet.java,v
1.2 2001/05/15 02:23:17 craigmcc Exp $
+ * $Date: 2001/05/15 02:23:17 $
*
* The Apache Software License, Version 1.1
*
@@ -89,12 +89,14 @@
//we expect ServletContext object that corresponds to the named URL
ServletContext context2 = context.getContext(anotherServlet);
- if((context2 == context)) {
+ if((context2 == context) || (context2 == null)) {
out.println("ServletConfigGetServletContextTest test PASSED");
}
else {
out.println("ServletConfigGetServletContextTest test FAILED");
out.println("ServletConfig.getServletContext() returned
incorrect result");
+ out.println("context1 = " + context);
+ out.println("context2 = " + context2);
}
}
}
1.2 +4 -2
jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetContextTestServlet.java
Index: ServletContextGetContextTestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetContextTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletContextGetContextTestServlet.java 2000/10/16 22:49:38 1.1
+++ ServletContextGetContextTestServlet.java 2001/05/15 02:23:18 1.2
@@ -1,6 +1,6 @@
/*
- * $Header:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetContextTestServlet.java,v
1.1 2000/10/16 22:49:38 santosh Exp $
- * $Date: 2000/10/16 22:49:38 $
+ * $Header:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetContextTestServlet.java,v
1.2 2001/05/15 02:23:18 craigmcc Exp $
+ * $Date: 2001/05/15 02:23:18 $
*
* The Apache Software License, Version 1.1
*
@@ -99,6 +99,8 @@
else {
out.println("ServletContextGetContextTest test FAILED");
out.println("ServletContext.getServletContext() returned
incorrect result");
+ out.println("context1 = " + context);
+ out.println("context2 = " + context2);
}
}
}
