Return-Path: Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 633 invoked by uid 2016); 5 Nov 1999 04:30:17 -0000 Delivered-To: apcore-jakarta-tools-cvs@apache.org Received: (qmail 631 invoked by uid 263); 5 Nov 1999 04:30:16 -0000 Date: 5 Nov 1999 04:30:16 -0000 Message-ID: <19991105043016.630.qmail@hyperreal.org> From: vanitha@hyperreal.org To: jakarta-tools-cvs@apache.org Subject: cvs commit: jakarta-tools/moo/src/share/org/apache/tools/moo/jsp JspCheckTest.java NegativeJspCheckTest.java PositiveJspCheckTest.java vanitha 99/11/04 20:30:15 Modified: moo/src/share/org/apache/tools/moo/jsp JspCheckTest.java NegativeJspCheckTest.java PositiveJspCheckTest.java Log: Changed to support watchdog tests Revision Changes Path 1.4 +6 -4 jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/JspCheckTest.java Index: JspCheckTest.java =================================================================== RCS file: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/JspCheckTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JspCheckTest.java 1999/10/21 18:41:52 1.3 +++ JspCheckTest.java 1999/11/05 04:30:13 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/JspCheckTest.java,v 1.3 1999/10/21 18:41:52 arun Exp $ - * $Date: 1999/10/21 18:41:52 $ - * $Revision: 1.3 $ + * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/JspCheckTest.java,v 1.4 1999/11/05 04:30:13 vanitha Exp $ + * $Date: 1999/11/05 04:30:13 $ + * $Revision: 1.4 $ * * The Apache Software License, Version 1.1 * @@ -339,7 +339,9 @@ while (enum.hasMoreElements()) { String key = (String)enum.nextElement(); - Vector values = (Vector)queryString.get(key); + Vector values = new Vector(); + //(Vector)queryString.get(key); + values.add(0,queryString.get(key)); Enumeration valuesEnum = values.elements(); 1.3 +11 -6 jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/NegativeJspCheckTest.java Index: NegativeJspCheckTest.java =================================================================== RCS file: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/NegativeJspCheckTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NegativeJspCheckTest.java 1999/10/21 18:41:53 1.2 +++ NegativeJspCheckTest.java 1999/11/05 04:30:13 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/NegativeJspCheckTest.java,v 1.2 1999/10/21 18:41:53 arun Exp $ - * $Date: 1999/10/21 18:41:53 $ - * $Revision: 1.2 $ + * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/NegativeJspCheckTest.java,v 1.3 1999/11/05 04:30:13 vanitha Exp $ + * $Date: 1999/11/05 04:30:13 $ + * $Revision: 1.3 $ * * The Apache Software License, Version 1.1 * @@ -99,14 +99,19 @@ public TestResult getTestResult(HttpURLConnection connection) throws Exception { + + TestResult testResult = new TestResult(); //handle HTTP codes here int code = connection.getResponseCode(); - if (this.useCookie == true) - saveCookies(connection); - Thread.currentThread().dumpStack(); + + + if (this.useCookie == true) + saveCookies(connection); + + Thread.currentThread().dumpStack(); //http response in 400s signifies Client Request Incomplete/Doc Not found //http response in 500s signifies servlet error 1.3 +14 -6 jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/PositiveJspCheckTest.java Index: PositiveJspCheckTest.java =================================================================== RCS file: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/PositiveJspCheckTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PositiveJspCheckTest.java 1999/10/21 18:41:53 1.2 +++ PositiveJspCheckTest.java 1999/11/05 04:30:14 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/PositiveJspCheckTest.java,v 1.2 1999/10/21 18:41:53 arun Exp $ - * $Date: 1999/10/21 18:41:53 $ - * $Revision: 1.2 $ + * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/PositiveJspCheckTest.java,v 1.3 1999/11/05 04:30:14 vanitha Exp $ + * $Date: 1999/11/05 04:30:14 $ + * $Revision: 1.3 $ * * The Apache Software License, Version 1.1 * @@ -109,8 +109,8 @@ //handle HTTP codes here int code = connection.getResponseCode(); - if (this.useCookie == true) - saveCookies(connection); + if (this.useCookie == true) + saveCookies(connection); String message = connection.getResponseMessage(); //http response in 400s signifies Client Request Incomplete/Doc Not found @@ -134,7 +134,11 @@ String token = tok.nextToken(); result.append(" " + token); } + + } + + // Get the expected result from the "golden" file. StringBuffer expResult = getExpectedResult (getGoldenFileName()); @@ -170,7 +174,7 @@ String gfURL = mapManager.getGoldenfilePrefix(mapResource, goldenFile); url = URLHelper.getURL(gfURL); out.println("url = " + url.toString()); - + con = (HttpURLConnection) url.openConnection(); con.setUseCaches(false); @@ -185,6 +189,8 @@ String token = tok.nextToken(); expResult.append(" " + token); } + + } } catch (Exception ex) { @@ -203,7 +209,9 @@ while (st1.hasMoreTokens() && st2.hasMoreTokens()) { String tok1 = st1.nextToken(); + String tok2 = st2.nextToken(); + if (!tok1.equals(tok2)) { try { out.println("FAIL*** : tok1 = " + tok1 + ", tok2 = " + tok2);