dion 2002/11/18 04:35:08
Added: jelly/src/test/org/apache/commons/jelly/jsl test1.xml
suite.jelly test2.xml TestJSLSuite.java
Log:
Tests showing jsl is busted once an xpath expression is nested within some
other tag.
Now for the fix......?
Revision Changes Path
1.1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/test1.xml
Index: test1.xml
===================================================================
<document>
<properties>
<title>Test1</title>
</properties>
</document>
1.1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/suite.jelly
Index: suite.jelly
===================================================================
<?xml version="1.0"?>
<test:suite xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:m="jelly:jeez"
xmlns:test="jelly:junit"
xmlns:u="jelly:util"
xmlns:x="jelly:xml">
<!-- see if we can break template -->
<m:fileScanner var="files">
<m:fileset dir="src/test/org/apache/commons/jelly/jsl">
<m:patternset>
<m:include name="**/*.xml"/>
</m:patternset>
</m:fileset>
</m:fileScanner>
<j:forEach var="file" items="${files.iterator()}">
<x:parse var="doc" xml="${file.toURL()}" />
<jsl:stylesheet select="$doc">
<jsl:template match="document" trim="no">
<h>
<!-- uncomment this to fix the bug </h> -->
<j:set var="full"><x:expr
select="$doc/document/properties/title"/></j:set>
<j:set var="short"><x:expr select="./properties/title" /></j:set>
<m:echo>full=${full},short=${short}</m:echo>
<test:assert test="${full == short}">All iterations should
succeed</test:assert>
<!-- comment this out to fix the bug -->
</h>
</jsl:template>
</jsl:stylesheet>
</j:forEach>
</test:suite>
1.1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/test2.xml
Index: test2.xml
===================================================================
<document>
<properties>
<title>Test2</title>
</properties>
</document>
1.1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/TestJSLSuite.java
Index: TestJSLSuite.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/JellyTestSuite.java,v
1.8 2002/07/06 13:53:39 dion Exp $
* $Revision: 1.8 $
* $Date: 2002/07/06 13:53:39 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* $Id: JellyTestSuite.java,v 1.8 2002/07/06 13:53:39 dion Exp $
*/
package org.apache.commons.jelly.jsl;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
import org.apache.commons.jelly.tags.junit.JellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:[EMAIL PROTECTED]";>dIon Gillard</a>
* @version $Revision: 1.8 $
*/
public class TestJSLSuite extends JellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
}
public static TestSuite suite() throws Exception {
return createTestSuite(TestJSLSuite.class, "suite.jelly");
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
