You are viewing a plain text version of this content. The canonical link for it is here.
Posted to watchdog-dev@jakarta.apache.org by va...@hyperreal.org on 1999/10/23 07:35:15 UTC
cvs commit: jakarta-watchdog/src/conf jsp-testlist.txt
vanitha 99/10/22 22:35:15
Modified: src/clients/org/apache/jcheck/jsp/client/core_syntax/beantests/useBean
negativeBody.java
src/clients/org/apache/jcheck/jsp/resources
LocalStrings.properties
src/clients/org/apache/jcheck/props jsp-tests.properties
src/conf jsp-testlist.txt
Log:
Revision Changes Path
1.2 +15 -12 jakarta-watchdog/src/clients/org/apache/jcheck/jsp/client/core_syntax/beantests/useBean/negativeBody.java
Index: negativeBody.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog/src/clients/org/apache/jcheck/jsp/client/core_syntax/beantests/useBean/negativeBody.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- negativeBody.java 1999/10/09 00:41:55 1.1
+++ negativeBody.java 1999/10/23 05:35:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-watchdog/src/clients/org/apache/jcheck/jsp/client/core_syntax/beantests/useBean/negativeBody.java,v 1.1 1999/10/09 00:41:55 duncan Exp $
- * $Date: 1999/10/09 00:41:55 $
- * $Revision: 1.1 $
+ * $Header: /home/cvs/jakarta-watchdog/src/clients/org/apache/jcheck/jsp/client/core_syntax/beantests/useBean/negativeBody.java,v 1.2 1999/10/23 05:35:11 vanitha Exp $
+ * $Date: 1999/10/23 05:35:11 $
+ * $Revision: 1.2 $
*
* The Apache Software License, Version 1.1
*
@@ -63,8 +63,7 @@
import org.apache.tools.moo.TestResult;
import java.net.HttpURLConnection;
-public class negativeBody
-extends NegativeJspCheckTest {
+public class negativeBody extends NegativeJspCheckTest {
StringManager sm = StringManager.getManager(UtilConstants.Package);
@@ -72,18 +71,22 @@
return sm.getString("negativeBody.description");
}
- public TestResult
- runTest () {
+ public TestResult runTest () {
TestResult testResult = null;
+ HttpURLConnection connection = null;
+ setErrorCode (500);
+
try {
- setErrorCode (500);
- HttpURLConnection connection = getConnection();
- testResult = getTestResult(connection);
+ connection = getConnection();
+ int code = connection.getResponseCode();
} catch (Exception e) {
- testResult = getTestResult(testResult, e);
+ try {
+ testResult = getTestResult(connection);
+ } catch (Exception m) {
+ testResult = getTestResult(testResult,m);
+ }
}
-
return testResult;
}
}
1.2 +19 -14 jakarta-watchdog/src/clients/org/apache/jcheck/jsp/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-watchdog/src/clients/org/apache/jcheck/jsp/resources/LocalStrings.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalStrings.properties 1999/10/09 00:41:55 1.1
+++ LocalStrings.properties 1999/10/23 05:35:12 1.2
@@ -7,30 +7,35 @@
HelloWorld.description = HelloWorld
HelloWorld.goldenFile = HelloWorld.html
-positiveBeanNameClass.description = core_syntax/beantests/useBean/positiveBeanNameClass
+positiveBeanNameClass.description = positiveBeanName
positiveBeanNameClass.goldenFile = core_syntax/beantests/useBean/positiveBeanNameClass.html
-positiveBeanNameRes.description = core_syntax/beantests/useBean/positiveBeanNameRes
+positiveBeanNameRes.description = positiveBeanNameRes
positiveBeanNameRes.goldenFile = core_syntax/beantests/useBean/positiveBeanNameRes.html
-positiveBodyExists.description = core_syntax/beantests/useBean/positiveBodyExists
+positiveBodyExists.description = positiveBodyExists
positiveBodyExists.goldenFile = core_syntax/beantests/useBean/positiveBodyExists.html
-positiveBodyNew.description = core_syntax/beantests/useBean/positiveBodyNew
+positiveBodyNew.description = positiveBodyNew
positiveBodyNew.goldenFile = core_syntax/beantests/useBean/positiveBodyNew.html
-positiveDupIDPage1.description = core_syntax/beantests/useBean/positiveDupIDPage1
+positiveDupIDPage1.description = positiveDupIDPage1
positiveDupIDPage1.goldenFile = core_syntax/beantests/useBean/positiveDupIDPage1.html
-positiveDupIDPage2.description = core_syntax/beantests/useBean/positiveDupIDPage2
+positiveDupIDPage2.description = positiveDupIDPage2
positiveDupIDPage2.goldenFile = core_syntax/beantests/useBean/positiveDupIDPage2.html
-positiveDupIDRequest1.description = core_syntax/beantests/useBean/positiveDupIDRequest1
+positiveDupIDRequest1.description = positiveDupIDRequest1
positiveDupIDRequest1.goldenFile = core_syntax/beantests/useBean/positiveDupIDRequest1.html
-positiveDupIDRequest2.description = core_syntax/beantests/useBean/positiveDupIDRequest2
+positiveDupIDRequest2.description = positiveDupIDRequest2
positiveDupIDRequest2.goldenFile = core_syntax/beantests/useBean/positiveDupIDRequest2.html
-positiveNoBody.description = core_syntax/beantests/useBean/positiveNoBody
+positiveNoBody.description = positiveNoBody
positiveNoBody.goldenFile = core_syntax/beantests/useBean/positiveNoBody.html
-positivePageScope.description = core_syntax/beantests/useBean/positivePageScope
+positivePageScope.description = positivePageScope
positivePageScope.goldenFile = core_syntax/beantests/useBean/positivePageScope.html
-positiveTypeAssignable.description = core_syntax/beantests/useBean/positiveTypeAssignable
+positiveTypeAssignable.description = positiveTypeAssignable
positiveSessionScope.goldenFile = core_syntax/beantests/useBean/positiveSessionScope.html
-positiveSessionScope.description = core_syntax/beantests/useBean/positiveSessionScope
+positiveSessionScope.description = positiveSessionScope
positiveTypeAssignable.goldenFile = core_syntax/beantests/useBean/positiveTypeAssignable.html
-positiveGetProps.description = core_syntax/beantests/getProperty/positiveGetProps
+positiveGetProps.description = positiveGetProps
positiveGetProps.goldenFile = core_syntax/beantests/getProperty/positiveGetProps.html
-negativeBody.description = Negative body test
+negativeBeanName.description = negativeBeanName
+negativeBody.description = negativeBody
+negativeDupID.description = negativeDupID
+negativeDupIDSession1.description = negativeDupIDSession1
+negativeInvalidClass.description = negativeInvalidClass
+negativeNoBody.description = negativeInvalidClass
1.2 +6 -0 jakarta-watchdog/src/clients/org/apache/jcheck/props/jsp-tests.properties
Index: jsp-tests.properties
===================================================================
RCS file: /home/cvs/jakarta-watchdog/src/clients/org/apache/jcheck/props/jsp-tests.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jsp-tests.properties 1999/10/21 01:39:44 1.1
+++ jsp-tests.properties 1999/10/23 05:35:13 1.2
@@ -9,6 +9,12 @@
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveDupIDRequest2=core_syntax/beantests/useBean/positiveDupIDRequest2.jsp
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveNoBody=core_syntax/beantests/useBean/positiveNoBody.jsp
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positivePageScope=core_syntax/beantests/useBean/positivePageScope.jsp
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveSessionScope=core_syntax/beantests/useBean/positiveSessionScope.jsp
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveTypeAssignable=core_syntax/beantests/useBean/positiveTypeAssignable.jsp
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveSessionScope=core_syntax/beantests/useBean/positiveSessionScope.jsp
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeBeanName=core_syntax/beantests/useBean/negativeBeanName.jsp
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeBody=core_syntax/beantests/useBean/negativeBody.jsp
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeDupID=core_syntax/beantests/useBean/negativeDupID.jsp
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeDupIDSession1=core_syntax/beantests/useBean/negativeDupIDSession1.jsp
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeInvalidClass=core_syntax/beantests/useBean/negativeInvalidClass.jsp
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeNoBody=core_syntax/beantests/useBean/negativeNoBody.jsp
1.2 +7 -1 jakarta-watchdog/src/conf/jsp-testlist.txt
Index: jsp-testlist.txt
===================================================================
RCS file: /home/cvs/jakarta-watchdog/src/conf/jsp-testlist.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jsp-testlist.txt 1999/10/11 02:00:14 1.1
+++ jsp-testlist.txt 1999/10/23 05:35:14 1.2
@@ -1,4 +1,4 @@
-# $Id: jsp-testlist.txt,v 1.1 1999/10/11 02:00:14 costin Exp $
+# $Id: jsp-testlist.txt,v 1.2 1999/10/23 05:35:14 vanitha Exp $
org.apache.jcheck.jsp.client.HelloWorld
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveBeanNameClass
@@ -12,3 +12,9 @@
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveNoBody
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positivePageScope
org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.positiveTypeAssignable
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeBeanName
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeBody
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeDupID
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeDupIDSession1
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeInvalidClass
+org.apache.jcheck.jsp.client.core_syntax.beantests.useBean.negativeNoBody