commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl suite.jelly
Date Wed, 08 Sep 2004 05:25:12 GMT
dion        2004/09/07 22:25:12

  Modified:    jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl
                        suite.jelly
  Log:
  detab
  
  Revision  Changes    Path
  1.13      +104 -104  jakarta-commons/jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly
  
  Index: suite.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- suite.jelly	1 Mar 2004 01:32:39 -0000	1.12
  +++ suite.jelly	8 Sep 2004 05:25:12 -0000	1.13
  @@ -22,57 +22,57 @@
               xmlns:x="jelly:xml"
               xmlns:log="jelly:log">
   
  -	<test:case name="testDionsBug" xmlns="dummy">
  +    <test:case name="testDionsBug" xmlns="dummy">
   
  -		<log:info>
  -			<!-- 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>
  -							<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>
  -						</h>
  -					</jsl:template>
  -				</jsl:stylesheet>
  -	
  -			</j:forEach>
  -	
  -			<!-- test stylesheet external to loop -->
  -			<jsl:stylesheet var="ss1">
  -				<jsl:template match="document" trim="no">
  -					<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>
  -					</h>
  -				</jsl:template>
  -			</jsl:stylesheet>
  -	
  -			<j:forEach var="file" items="${files.iterator()}">
  -				<x:parse var="doc" xml="${file.toURL()}" />
  -				<jsl:style stylesheet="${ss1}" select="$doc" />
  -			</j:forEach>
  -		</log:info>			
  +        <log:info>
  +            <!-- 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>
  +                            <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>
  +                        </h>
  +                    </jsl:template>
  +                </jsl:stylesheet>
  +    
  +            </j:forEach>
  +    
  +            <!-- test stylesheet external to loop -->
  +            <jsl:stylesheet var="ss1">
  +                <jsl:template match="document" trim="no">
  +                    <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>
  +                    </h>
  +                </jsl:template>
  +            </jsl:stylesheet>
  +    
  +            <j:forEach var="file" items="${files.iterator()}">
  +                <x:parse var="doc" xml="${file.toURL()}" />
  +                <jsl:style stylesheet="${ss1}" select="$doc" />
  +            </j:forEach>
  +        </log:info>            
     </test:case>  
   
   
  -	<test:case name="testStylesheetReuse" xmlns="dummy">
  -		
  +    <test:case name="testStylesheetReuse" xmlns="dummy">
  +        
       <!-- see if we can break template -->
       <m:fileScanner var="files">
         <m:fileset dir="src/test/org/apache/commons/jelly/jsl">
  @@ -83,14 +83,14 @@
       </m:fileScanner>
   
       <jsl:stylesheet var="myStylesheet">
  -    	<jsl:template match="document" trim="no">
  -    		<h>
  +        <jsl:template match="document" trim="no">
  +            <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>
  -    		</h>
  -    	</jsl:template>
  +            </h>
  +        </jsl:template>
       </jsl:stylesheet>
   
   
  @@ -101,54 +101,54 @@
     </test:case>  
   
   
  -	<test:case name="testRelativeXPaths">
  +    <test:case name="testRelativeXPaths">
  +
  +        <j:forEach var="i" begin="1" end="5">
  +            <x:parse var="doc">
  +                <document id="${i}">
  +                    <a x="1">
  +                        <b y="123"/>
  +                    </a>
  +                    <properties><title>value ${i}</title></properties>
  +                </document>
  +            </x:parse>
  +        
  +            <jsl:stylesheet select="$doc">
  +                <jsl:template match="document">
  +                    <log:info>Found document with ID <x:expr select="./@id"/>
title <x:expr select="./properties/title"/></log:info>
  +
  +                    <j:set var="title"><x:expr select="./properties/title"/></j:set>
  +                    <test:assertEquals expected="value ${i}" actual="${title}"/>
  +                    
  +                    <j:set var="title"><x:expr select="$doc/document/properties/title"/></j:set>
  +                    <test:assertEquals expected="value ${i}" actual="${title}"/>
  +                    
  +                    
  +                    <j:set var="id"><x:expr select="./@id"/></j:set>
  +                    <test:assert test="${id == i}"/>
  +                    
  +                    <test:assert xpath="a[@x = '1']"/>
  +                    
  +                    <test:assert xpath="@id = $i"/>
  +                    
  +                    <jsl:applyTemplates/>
  +                </jsl:template>
  +    
  +                <jsl:template match="a">
  +                    <test:assert xpath="@x='1'"/>                
  +                    <jsl:applyTemplates/>
  +                </jsl:template>
  +    
  +                <jsl:template match="b">
  +                    <test:assert xpath="@y='123'"/>                
  +                    <jsl:applyTemplates/>
  +                </jsl:template>
  +
   
  -		<j:forEach var="i" begin="1" end="5">
  -			<x:parse var="doc">
  -				<document id="${i}">
  -					<a x="1">
  -						<b y="123"/>
  -					</a>
  -					<properties><title>value ${i}</title></properties>
  -				</document>
  -			</x:parse>
  -		
  -			<jsl:stylesheet select="$doc">
  -				<jsl:template match="document">
  -					<log:info>Found document with ID <x:expr select="./@id"/> title <x:expr
select="./properties/title"/></log:info>
  -
  -					<j:set var="title"><x:expr select="./properties/title"/></j:set>
  -					<test:assertEquals expected="value ${i}" actual="${title}"/>
  -					
  -					<j:set var="title"><x:expr select="$doc/document/properties/title"/></j:set>
  -					<test:assertEquals expected="value ${i}" actual="${title}"/>
  -					
  -					
  -					<j:set var="id"><x:expr select="./@id"/></j:set>
  -					<test:assert test="${id == i}"/>
  -					
  -					<test:assert xpath="a[@x = '1']"/>
  -					
  -					<test:assert xpath="@id = $i"/>
  -					
  -					<jsl:applyTemplates/>
  -				</jsl:template>
  -	
  -				<jsl:template match="a">
  -					<test:assert xpath="@x='1'"/>				
  -					<jsl:applyTemplates/>
  -				</jsl:template>
  -	
  -				<jsl:template match="b">
  -					<test:assert xpath="@y='123'"/>				
  -					<jsl:applyTemplates/>
  -				</jsl:template>
  -
  -
  -				<jsl:template match="@*"/>
  -			</jsl:stylesheet>
  -		</j:forEach>  	
  -		
  +                <jsl:template match="@*"/>
  +            </jsl:stylesheet>
  +        </j:forEach>      
  +        
     </test:case>  
     
     <!-- 
  @@ -171,9 +171,9 @@
       </jsl:stylesheet>
   
       <log:info>
  -    	...
  -	    <jsl:style stylesheet="${contextStyleSheet}" select="$testDoc"/>
  -	    ...
  +        ...
  +        <jsl:style stylesheet="${contextStyleSheet}" select="$testDoc"/>
  +        ...
       </log:info>
   
       <m:echo>text is '${contextText}'</m:echo>
  @@ -198,9 +198,9 @@
       </jsl:stylesheet>
   
       <log:info>
  -    	...
  -	    <jsl:style stylesheet="${contextStyleSheet}" select="$testDoc"/>
  -	    ...
  +        ...
  +        <jsl:style stylesheet="${contextStyleSheet}" select="$testDoc"/>
  +        ...
       </log:info>
   
       <m:echo>text is '${contextText}'</m:echo>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message