commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject cvs commit: jakarta-commons-sandbox/jelly maven.xml
Date Thu, 10 Oct 2002 10:24:32 GMT
jstrachan    2002/10/10 03:24:32

  Modified:    jelly    maven.xml
  Added:       jelly/src/test/org/apache/commons/jelly/util suite.jelly
                        TestJelly.java
  Log:
  Added some JellyUnit test cases for the <util:tokenize> tag which also helped highlight
the bug in Jexl Robert found.
  Will be adding some more unit test cases to Jexl shortly...
  
  Revision  Changes    Path
  1.1                  jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/util/suite.jelly
  
  Index: suite.jelly
  ===================================================================
  <?xml version="1.0"?>
  <test:suite 
  	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>
  
  <!--		
  		<j:set var="size" value="${tokens.size()}"/>		
  		<test:assert test="${size == 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[size]}"/>
  		
  		<test:assertEquals expected="Test4" actual="${tokens[tokens.size() - 1]}"/>
  		<test:assertEquals expected="Test4" actual="${tokens.get(tokens.size() - 1)}"/>
  -->		
  		
    </test:case>
  </test:suite>
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/util/TestJelly.java
  
  Index: TestJelly.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) 1999-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 apache@apache.org.
   *
   * 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.util;
  
  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:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.8 $
   */
  public class TestJelly extends JellyTestSuite {
  
      public static void main( String[] args ) throws Exception {
          TestRunner.run( suite() );
      }
      
      public static TestSuite suite() throws Exception {
          return createTestSuite(TestJelly.class, "suite.jelly");        
      }
  }
  
  
  
  1.39      +4 -4      jakarta-commons-sandbox/jelly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/maven.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- maven.xml	8 Oct 2002 11:26:00 -0000	1.38
  +++ maven.xml	10 Oct 2002 10:24:32 -0000	1.39
  @@ -2,12 +2,12 @@
   
     <!-- define jelly task -->	
     <goal name="jelly-task" prereqs="java:compile, test:compile">
  -	<path id="test.classpath">
  +		<path id="test.classpath">
         <pathelement path="${maven.build.dest}"/>
         <pathelement path="target/classes"/>
         <pathelement path="target/test-classes"/>
         <path refid="maven.dependency.classpath"/>
  -	</path>
  +		</path>
   	  
       <taskdef
         name="jelly"
  @@ -19,7 +19,7 @@
       
   
     <!-- copies unit testing stuff -->
  -  <preGoal name="test:test">
  +  <postGoal name="test:compile">
       <copy todir="target/test-classes">
         <fileset dir="src/test">
           <include name="**/*.properties"/>
  @@ -30,7 +30,7 @@
           <include name="**/*.rng"/>
         </fileset>
       </copy>
  -  </preGoal>
  +  </postGoal>
     
     <!-- runs the XML doclet -->  
     <goal name="doclet:xml" prereqs="java:compile">
  
  
  

--
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