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-sandbox/jelly/src/test/org/apache/commons/jelly/util suite.jelly
Date Sat, 21 Dec 2002 02:24:22 GMT
dion        2002/12/20 18:24:21

  Modified:    jelly/src/test/org/apache/commons/jelly/util suite.jelly
  Log:
  Detabulate
  
  Revision  Changes    Path
  1.6       +78 -78    jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/util/suite.jelly
  
  Index: suite.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/util/suite.jelly,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- suite.jelly	19 Dec 2002 10:52:33 -0000	1.5
  +++ suite.jelly	21 Dec 2002 02:24:21 -0000	1.6
  @@ -1,84 +1,84 @@
   <?xml version="1.0"?>
   <test:suite 
  -	xmlns:j="jelly:core" 
  -	xmlns:util="jelly:util" 
  -	xmlns:test="jelly:junit" 
  -	xmlns:log="jelly:log">
  +    xmlns:j="jelly:core" 
  +    xmlns:util="jelly:util" 
  +    xmlns:test="jelly:junit" 
  +    xmlns:log="jelly:log">
   
     <test:case name="testTokenize">
  -	
  -		<util:tokenize var="tokens" delim=",">Test1,Test2,Test3,Test4</util:tokenize>
  +    
  +        <util:tokenize var="tokens" delim=",">Test1,Test2,Test3,Test4</util:tokenize>
   
  -		<j:set var="s" value="${size(tokens)}"/>		
  -		<test:assert test="${s == 4}"/>
  -		<test:assert test="${size(tokens) == 4}"/>
  -
  -<!--		
  -		<j:set var="s" value="${tokens.size()}"/>		
  -		<test:assert test="${s == 4}"/>
  -		
  -		<test:assert test="${tokens.size() == 4}"/>
  +        <j:set var="s" value="${size(tokens)}"/>        
  +        <test:assert test="${s == 4}"/>
  +        <test:assert test="${size(tokens) == 4}"/>
  +
  +<!--        
  +        <j:set var="s" value="${tokens.size()}"/>        
  +        <test:assert test="${s == 4}"/>
  +        
  +        <test:assert test="${tokens.size() == 4}"/>
   -->
  -			
  -		<test:assertEquals expected="Test1" actual="${tokens[0]}"/>
  -		<test:assertEquals expected="Test2" actual="${tokens[1]}"/>
  -		<test:assertEquals expected="Test3" actual="${tokens[2]}"/>
  -		<test:assertEquals expected="Test4" actual="${tokens[3]}"/>
  -		
  -		<test:assertEquals expected="Test4" actual="${tokens[s - 1]}"/>
  -		<test:assertEquals expected="Test4" actual="${tokens[size(tokens) - 1]}"/>
  -		
  -<!--		
  -		<test:assertEquals expected="Test4" actual="${tokens.get(size(tokens) - 1)}"/>
  -		
  -		
  -		<test:assertEquals expected="Test4" actual="${tokens[tokens.size() - 1]}"/>
  -		<test:assertEquals expected="Test4" actual="${tokens.get(tokens.size() - 1)}"/>
  --->		
  -		
  +            
  +        <test:assertEquals expected="Test1" actual="${tokens[0]}"/>
  +        <test:assertEquals expected="Test2" actual="${tokens[1]}"/>
  +        <test:assertEquals expected="Test3" actual="${tokens[2]}"/>
  +        <test:assertEquals expected="Test4" actual="${tokens[3]}"/>
  +        
  +        <test:assertEquals expected="Test4" actual="${tokens[s - 1]}"/>
  +        <test:assertEquals expected="Test4" actual="${tokens[size(tokens) - 1]}"/>
  +        
  +<!--        
  +        <test:assertEquals expected="Test4" actual="${tokens.get(size(tokens) - 1)}"/>
  +        
  +        
  +        <test:assertEquals expected="Test4" actual="${tokens[tokens.size() - 1]}"/>
  +        <test:assertEquals expected="Test4" actual="${tokens.get(tokens.size() - 1)}"/>
  +-->        
  +        
     </test:case>
   
     <test:case name="testFileExists">
   
  -		<!-- ensure that ${base.dir} is defined -->
  -		<j:if test="${empty base.dir}">
  -			<j:set var="base.dir" value="."/>
  -		</j:if>
  -		
  -  	<j:set var="flag" value="not found"/>
  -
  -  	<util:available file="${base.dir}/project.xml">
  -  		<j:set var="flag" value="found"/>
  -		</util:available>
  -		
  -		<test:assertEquals expected="found" actual="${flag}">
  -			Should have found the file via the file $${base.dir}/project.xml with base.dir=${base.dir}
  -		</test:assertEquals>
  -		
  -  	<util:available file="${base.dir}/doesNotExist.xml">
  -  		<test:fail>The file ${base.dir}/doesNotExist.xml should not exist</test:fail>
  -		</util:available>
  -		
  +      <!-- ensure that ${base.dir} is defined -->
  +      <j:if test="${empty base.dir}">
  +          <j:set var="base.dir" value="."/>
  +      </j:if>
  +        
  +      <j:set var="flag" value="not found"/>
  +
  +      <util:available file="${base.dir}/project.xml">
  +          <j:set var="flag" value="found"/>
  +      </util:available>
  +        
  +      <test:assertEquals expected="found" actual="${flag}">
  +          Should have found the file via the file $${base.dir}/project.xml with base.dir=${base.dir}
  +      </test:assertEquals>
  +        
  +      <util:available file="${base.dir}/doesNotExist.xml">
  +          <test:fail>The file ${base.dir}/doesNotExist.xml should not exist</test:fail>
  +      </util:available>
  +        
     </test:case>
  -	
  +    
     <test:case name="testURIExists">
   
  -  	<j:set var="flag" value="not found"/>
  +      <j:set var="flag" value="not found"/>
   
  -		<!-- use relative URIs-->
  -		
  -  	<util:available uri="dummy.xml">
  -  		<j:set var="flag" value="found"/>
  -		</util:available>
  -		
  -		<test:assertEquals expected="found" actual="${flag}">
  -			Should have found the file via the URI dummy.xml
  -		</test:assertEquals>
  -		
  -  	<util:available uri="doesNotExist.xml">
  -  		<test:fail>The URI doesNotExist.xml should not exist!</test:fail>
  -		</util:available>
  -		
  +        <!-- use relative URIs-->
  +        
  +      <util:available uri="dummy.xml">
  +          <j:set var="flag" value="found"/>
  +      </util:available>
  +        
  +      <test:assertEquals expected="found" actual="${flag}">
  +        Should have found the file via the URI dummy.xml
  +      </test:assertEquals>
  +        
  +      <util:available uri="doesNotExist.xml">
  +          <test:fail>The URI doesNotExist.xml should not exist!</test:fail>
  +      </util:available>
  +        
     </test:case>
     
     <test:case name="testReplace">
  @@ -102,21 +102,21 @@
     </test:case>
   
     <test:case name="testProperties">
  -  	
  -  	<util:properties uri="foo.properties"/>
  -  	
  -    <test:assertEquals expected="ABC" actual="${foo}"/>
  +      
  +      <util:properties uri="foo.properties"/>
  +      
  +      <test:assertEquals expected="ABC" actual="${foo}"/>
       
     </test:case>
  -	
  +    
     <test:case name="testPropertiesVar">
  -  	
  -  	<util:properties uri="foo.properties" var="props"/>
  -  	
  -    <test:assertEquals expected="ABC" actual="${props.foo}"/>
  +      
  +      <util:properties uri="foo.properties" var="props"/>
  +      
  +      <test:assertEquals expected="ABC" actual="${props.foo}"/>
       
  -    <log:info>Loaded properties value ${props}</log:info>
  +      <log:info>Loaded properties value ${props}</log:info>
       
     </test:case>
  -	
  +    
   </test:suite>
  
  
  

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


Mime
View raw message