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/src/java/org/apache/commons/jelly/tags/junit RunTag.java SuiteTag.java CaseTag.java JUnitTagLibrary.java RunTestTag.java TestCaseTag.java TestSuiteTag.java
Date Mon, 22 Jul 2002 07:58:49 GMT
jstrachan    2002/07/22 00:58:49

  Modified:    jelly/src/java/org/apache/commons/jelly/tags/junit
                        JUnitTagLibrary.java
  Added:       jelly/src/java/org/apache/commons/jelly/tags/junit
                        RunTag.java SuiteTag.java CaseTag.java
  Removed:     jelly/src/java/org/apache/commons/jelly/tags/junit
                        RunTestTag.java TestCaseTag.java TestSuiteTag.java
  Log:
  Patched the tag class names so that the auto generated tag reference documentation matches
the real names of the tags
  
  Revision  Changes    Path
  1.3       +3 -3      jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
  
  Index: JUnitTagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JUnitTagLibrary.java	22 Jul 2002 07:16:51 -0000	1.2
  +++ JUnitTagLibrary.java	22 Jul 2002 07:58:49 -0000	1.3
  @@ -90,9 +90,9 @@
           registerTag("assert", AssertTag.class);
           registerTag("assertEquals", AssertEqualsTag.class);
           registerTag("fail", FailTag.class);
  -        registerTag("run", RunTestTag.class );
  -        registerTag("case", TestCaseTag.class );
  -        registerTag("suite", TestSuiteTag.class );
  +        registerTag("run", RunTag.class );
  +        registerTag("case", CaseTag.class );
  +        registerTag("suite", SuiteTag.class );
       }
   
       public Expression createExpression(
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/RunTag.java
  
  Index: RunTag.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/RunTag.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: RunTag.java,v 1.8 2002/07/06 13:53:39 dion Exp $
   */
  package org.apache.commons.jelly.tags.junit;
  
  import junit.framework.Test;
  import junit.framework.TestResult;
  
  import org.apache.commons.jelly.MissingAttributeException;
  import org.apache.commons.jelly.TagSupport;
  import org.apache.commons.jelly.XMLOutput;
  
  /** 
   * This tag will run the given Test which could be an individual TestCase or a TestSuite.
   * The TestResult can be specified to capture the output, otherwise the results are output
   * as XML so that they can be formatted in some custom manner.
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.8 $
   */
  public class RunTag extends TagSupport {
  
      private Test test;
      private TestResult result;
      
      
      // Tag interface
      //------------------------------------------------------------------------- 
      public void doTag(XMLOutput output) throws Exception {
          if ( test == null ) {
              throw new MissingAttributeException( "test" );
          }
          TestResult result = getResult();
          if ( result == null ) {
              result = createResult(output);                    
          }
          test.run(result);
      }
      
      // Properties
      //-------------------------------------------------------------------------        
       
  
      /**
       * Returns the TestResult used to capture the output of the test.
       * @return TestResult
       */
      public TestResult getResult() {
          return result;
      }
  
      /**
       * Returns the Test to be ran.
       * @return Test
       */
      public Test getTest() {
          return test;
      }
  
      /**
       * Sets the JUnit TestResult used to capture the results of the tst
       * @param result The TestResult to use
       */
      public void setResult(TestResult result) {
          this.result = result;
      }
  
      /**
       * Sets the JUnit Test to run which could be an individual test or a TestSuite
       * @param test The test to run
       */
      public void setTest(Test test) {
          this.test = test;
      }
  
      // Implementation methods
      //-------------------------------------------------------------------------        
       
  
      /**
       * Factory method to create a new TestResult to capture the output of
       * the test cases
       */
      protected TestResult createResult(XMLOutput output) {
          return new TestResult();
      }
  }
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
  
  Index: SuiteTag.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/SuiteTag.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: SuiteTag.java,v 1.8 2002/07/06 13:53:39 dion Exp $
   */
  package org.apache.commons.jelly.tags.junit;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  import org.apache.commons.jelly.TagSupport;
  import org.apache.commons.jelly.XMLOutput;
  
  /** 
   * Represents a collection of TestCases.. This tag is analagous to
   * JUnit's TestSuite class.
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.8 $
   */
  public class SuiteTag extends TagSupport {
  
      /** the test suite this tag created */
      private TestSuite suite;
      
      /** the name of the variable of the test suite */
      private String var;
      
      /** the name of the test suite to create */
      private String name;
  
      public SuiteTag() {
      }
      
      /**
       * Adds a new Test to this suite
       */
      public void addTest(Test test) {
          getSuite().addTest(test);
      }    
      
      // Tag interface
      //------------------------------------------------------------------------- 
      public void doTag(XMLOutput output) throws Exception {
          suite = createSuite();
          
          TestSuite parent = (TestSuite) context.getVariable("org.apache.commons.jelly.junit.suite");
       
          if ( parent == null ) {
              context.setVariable("org.apache.commons.jelly.junit.suite", suite );
          }
          else {
              parent.addTest( suite );
          }
  
          invokeBody(output);
          
          if ( var != null ) {
              context.setVariable(var, suite);
          }            
      }
      
      // Properties
      //-------------------------------------------------------------------------        
       
      public TestSuite getSuite() {
          return suite;
      }
      
      /**
       * Sets the name of the test suite whichi is exported
       */
      public void setVar(String var) {
          this.var = var;
      }
      
      /**
       * @return the name of this test suite
       */
      public String getName() {
          return name;
      }
      
      /** 
       * Sets the name of this test suite
       */
      public void setName(String name) {
          this.name = name;
      }
      
      // Implementation methods
      //-------------------------------------------------------------------------        
       
      
      /**
       * Factory method to create a new TestSuite
       */
      protected TestSuite createSuite() {
          if ( name == null ) {
              return new TestSuite();
          }
          else {
              return new TestSuite(name);
          }
      }
  }
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/CaseTag.java
  
  Index: CaseTag.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CaseTag.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: CaseTag.java,v 1.8 2002/07/06 13:53:39 dion Exp $
   */
  package org.apache.commons.jelly.tags.junit;
  
  import junit.framework.TestCase;
  import junit.framework.TestSuite;
  
  
  import org.apache.commons.jelly.JellyException;
  import org.apache.commons.jelly.TagSupport;
  import org.apache.commons.jelly.XMLOutput;
  
  /** 
   * Represents a single test case in a test suite; this tag is analagous to
   * JUnit's TestCase class.
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.8 $
   */
  public class CaseTag extends TagSupport {
  
      private String name;
      
      
      // Tag interface
      //------------------------------------------------------------------------- 
      public void doTag(final XMLOutput output) throws Exception {
          String name = getName();
          if ( name == null ) {
              name = toString();
          }
          
          // #### we need to redirect the output to a TestListener
          // or something?
          TestCase testCase = new TestCase(name) {
              protected void runTest() throws Throwable {
                  invokeBody(output);
              }
          };
          
          // lets find the test suite
          TestSuite suite = getSuite();
          if ( suite == null ) {
              throw new JellyException( "Could not find a TestSuite to add this test to. This
tag should be inside a <test:suite> tag" );
          }
          suite.addTest(testCase);
      }
      
      // Properties
      //-------------------------------------------------------------------------        
       
  
      /**
       * @return the name of this test case
       */
      public String getName() {
          return name;
      }
      
      /** 
       * Sets the name of this test case
       */
      public void setName(String name) {
          this.name = name;
      }
      
      // Implementation methods
      //-------------------------------------------------------------------------        
       
  
      /**
       * Strategy method to find the corrent TestSuite to add a new Test case to
       */
      protected TestSuite getSuite() {
          SuiteTag tag = (SuiteTag) findAncestorWithClass( SuiteTag.class );
          if ( tag != null ) {
              return tag.getSuite();
          }
          return (TestSuite) context.getVariable( "org.apache.commons.jelly.junit.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