dion 2004/10/26 16:54:37
Modified: jelly/src/test/org/apache/commons/jelly/core
TestFileTag.java TestUseBeanTag.java
TestForEachTag.java TestInvokeStaticTag.java
TestInvokeTag.java TestSwitchTag.java
TestChooseTag.java TestBreakTag.java
TestNewTag.java TestGetStaticTag.java
TestArgTag.java
jelly project.xml
jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing
TestSwingTags.java
jelly/jelly-tags/swing project.xml
Added: jelly/src/java/org/apache/commons/jelly/test
BaseJellyTest.java
Removed: jelly/src/test/org/apache/commons/jelly/core
BaseJellyTest.java
Log:
Jelly-159 - Share BaseJellyTest class
Revision Changes Path
1.7 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestFileTag.java
Index: TestFileTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestFileTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestFileTag.java 9 Sep 2004 12:29:35 -0000 1.6
+++ TestFileTag.java 26 Oct 2004 23:54:37 -0000 1.7
@@ -21,6 +21,7 @@
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.commons.jelly.test.BaseJellyTest;
import org.dom4j.io.HTMLWriter;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
1.6 +1 -0
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestUseBeanTag.java
Index: TestUseBeanTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestUseBeanTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestUseBeanTag.java 9 Sep 2004 12:29:35 -0000 1.5
+++ TestUseBeanTag.java 26 Oct 2004 23:54:37 -0000 1.6
@@ -18,6 +18,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* Tests for UseBean tag
1.2 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestForEachTag.java
Index: TestForEachTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestForEachTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestForEachTag.java 18 Oct 2004 05:45:28 -0000 1.1
+++ TestForEachTag.java 26 Oct 2004 23:54:37 -0000 1.2
@@ -18,6 +18,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.test.BaseJellyTest;
import org.apache.commons.lang.StringUtils;
/**
1.9 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestInvokeStaticTag.java
Index: TestInvokeStaticTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestInvokeStaticTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestInvokeStaticTag.java 8 Sep 2004 04:36:52 -0000 1.8
+++ TestInvokeStaticTag.java 26 Oct 2004 23:54:37 -0000 1.9
@@ -19,6 +19,7 @@
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Robert McIntosh</a>
1.9 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestInvokeTag.java
Index: TestInvokeTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestInvokeTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestInvokeTag.java 8 Sep 2004 04:36:52 -0000 1.8
+++ TestInvokeTag.java 26 Oct 2004 23:54:37 -0000 1.9
@@ -20,6 +20,7 @@
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.core.Customer;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* @author Rodney Waldhoff
1.9 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestSwitchTag.java
Index: TestSwitchTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestSwitchTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestSwitchTag.java 9 Sep 2004 12:29:35 -0000 1.8
+++ TestSwitchTag.java 26 Oct 2004 23:54:37 -0000 1.9
@@ -20,6 +20,7 @@
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* @author Rodney Waldhoff
1.5 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestChooseTag.java
Index: TestChooseTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestChooseTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestChooseTag.java 9 Sep 2004 12:29:35 -0000 1.4
+++ TestChooseTag.java 26 Oct 2004 23:54:37 -0000 1.5
@@ -18,6 +18,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Ben Walding</a>
1.3 +1 -0
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestBreakTag.java
Index: TestBreakTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestBreakTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestBreakTag.java 9 Sep 2004 12:29:35 -0000 1.2
+++ TestBreakTag.java 26 Oct 2004 23:54:37 -0000 1.3
@@ -18,6 +18,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.test.BaseJellyTest;
public class TestBreakTag extends BaseJellyTest
{
1.8 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestNewTag.java
Index: TestNewTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestNewTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestNewTag.java 9 Sep 2004 12:29:35 -0000 1.7
+++ TestNewTag.java 26 Oct 2004 23:54:37 -0000 1.8
@@ -21,6 +21,7 @@
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.core.Customer;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* @author Rodney Waldhoff
1.3 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestGetStaticTag.java
Index: TestGetStaticTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestGetStaticTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestGetStaticTag.java 9 Sep 2004 12:29:35 -0000 1.2
+++ TestGetStaticTag.java 26 Oct 2004 23:54:37 -0000 1.3
@@ -19,6 +19,7 @@
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.JellyTagException;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* @version $Revision$
1.9 +2 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestArgTag.java
Index: TestArgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/TestArgTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestArgTag.java 9 Sep 2004 12:29:35 -0000 1.8
+++ TestArgTag.java 26 Oct 2004 23:54:37 -0000 1.9
@@ -28,6 +28,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.core.ArgTag;
import org.apache.commons.jelly.tags.core.ArgTagParent;
+import org.apache.commons.jelly.test.BaseJellyTest;
/**
* @author Rodney Waldhoff
1.153 +6 -0 jakarta-commons/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- project.xml 18 Oct 2004 05:40:29 -0000 1.152
+++ project.xml 26 Oct 2004 23:54:37 -0000 1.153
@@ -343,6 +343,12 @@
<url>http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/intro.html</url>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <url>http://junit.org</url>
+ </dependency>
</dependencies>
<build>
1.11 +1 -1
jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestSwingTags.java
Index: TestSwingTags.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestSwingTags.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestSwingTags.java 12 Sep 2004 15:34:32 -0000 1.10
+++ TestSwingTags.java 26 Oct 2004 23:54:37 -0000 1.11
@@ -36,7 +36,7 @@
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.core.BaseJellyTest;
+import org.apache.commons.jelly.test.BaseJellyTest;
/** Tests many swing tags for basic functionality.
* @author Hans Gilde
1.1
jakarta-commons/jelly/src/java/org/apache/commons/jelly/test/BaseJellyTest.java
Index: BaseJellyTest.java
===================================================================
/*
* Copyright 2002,2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.jelly.test;
import java.net.URL;
import junit.framework.TestCase;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
/**
* @author Rodney Waldhoff
* @version $Revision: 1.1 $ $Date: 2004/10/26 23:54:37 $
*/
public abstract class BaseJellyTest extends TestCase {
public BaseJellyTest(String name) {
super(name);
}
public void setUp() throws Exception {
super.setUp();
jelly = new Jelly();
context = new JellyContext();
xmlOutput = XMLOutput.createDummyXMLOutput();
}
protected void setUpScript(String scriptname) throws Exception {
URL url = this.getClass().getResource(scriptname);
if(null == url) {
throw new Exception(
"Could not find Jelly script: " + scriptname
+ " in package of class: " + getClass().getName()
);
}
jelly.setUrl(url);
String exturl = url.toExternalForm();
int lastSlash = exturl.lastIndexOf("/");
String extBase = exturl.substring(0,lastSlash+1);
URL baseurl = new URL(extBase);
context.setCurrentURL(baseurl);
}
protected Jelly getJelly() {
return jelly;
}
protected JellyContext getJellyContext() {
return context;
}
protected XMLOutput getXMLOutput() {
return xmlOutput;
}
private Jelly jelly = null;
private JellyContext context = null;
private XMLOutput xmlOutput = null;
}
1.23 +1 -1 jakarta-commons/jelly/jelly-tags/swing/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 12 Sep 2004 15:34:32 -0000 1.22
+++ project.xml 26 Oct 2004 23:54:37 -0000 1.23
@@ -39,7 +39,7 @@
<dependency>
<id>commons-jelly</id>
- <version>1.0-beta-4</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
