morgand 2003/01/25 09:56:53
Modified: jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit
CaseTag.java FailTag.java RunTag.java SuiteTag.java
Log:
converted junit tags from Exception to JellyTagException
Revision Changes Path
1.2 +8 -8
jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/CaseTag.java
Index: CaseTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/CaseTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CaseTag.java 19 Jan 2003 06:17:10 -0000 1.1
+++ CaseTag.java 25 Jan 2003 17:56:53 -0000 1.2
@@ -65,7 +65,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
@@ -83,7 +83,7 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(final XMLOutput output) throws Exception {
+ public void doTag(final XMLOutput output) throws JellyTagException {
String name = getName();
if ( name == null ) {
name = toString();
@@ -109,7 +109,7 @@
// lets find the test suite
TestSuite suite = getSuite();
if ( suite == null ) {
- throw new JellyException( "Could not find a TestSuite to add this test
to. This tag should be inside a <test:suite> tag" );
+ throw new JellyTagException( "Could not find a TestSuite to add this
test to. This tag should be inside a <test:suite> tag" );
}
suite.addTest(testCase);
}
1.2 +7 -6
jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/FailTag.java
Index: FailTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/FailTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FailTag.java 19 Jan 2003 06:17:10 -0000 1.1
+++ FailTag.java 25 Jan 2003 17:56:53 -0000 1.2
@@ -61,6 +61,7 @@
*/
package org.apache.commons.jelly.tags.junit;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
/**
@@ -79,7 +80,7 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
+ public void doTag(XMLOutput output) throws JellyTagException {
String message = getMessage();
if ( message == null ) {
message = getBodyText();
1.2 +7 -6
jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/RunTag.java
Index: RunTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/RunTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RunTag.java 19 Jan 2003 06:17:10 -0000 1.1
+++ RunTag.java 25 Jan 2003 17:56:53 -0000 1.2
@@ -69,6 +69,7 @@
import junit.framework.TestListener;
import junit.framework.TestResult;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
@@ -96,7 +97,7 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
+ public void doTag(XMLOutput output) throws MissingAttributeException,
JellyTagException {
Test test = getTest();
if ( test == null ) {
test = (Test)
context.getVariable("org.apache.commons.jelly.junit.suite");
1.2 +7 -6
jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
Index: SuiteTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/SuiteTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SuiteTag.java 19 Jan 2003 06:17:10 -0000 1.1
+++ SuiteTag.java 25 Jan 2003 17:56:53 -0000 1.2
@@ -64,6 +64,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
@@ -97,7 +98,7 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
+ public void doTag(XMLOutput output) throws JellyTagException {
suite = createSuite();
TestSuite parent = (TestSuite)
context.getVariable("org.apache.commons.jelly.junit.suite");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
