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/test/org/apache/commons/jelly TestParser.java
Date Thu, 30 May 2002 14:27:07 GMT
jstrachan    02/05/30 07:27:07

  Modified:    jelly/src/java/org/apache/commons/jelly/parser
                        XMLParser.java
  Added:       jelly/src/test/org/apache/commons/jelly TestParser.java
  Log:
  Patched the XMLParser so that it correctly sets the parent relationship, using a stack of
tags. This fixes the bug where certain tags would have the wrong parent. 
  Thanks go to Hristo for spotting this one.
  
  Revision  Changes    Path
  1.19      +25 -6     jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java
  
  Index: XMLParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- XMLParser.java	21 May 2002 07:59:32 -0000	1.18
  +++ XMLParser.java	30 May 2002 14:27:07 -0000	1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
1.18 2002/05/21 07:59:32 jstrachan Exp $
  - * $Revision: 1.18 $
  - * $Date: 2002/05/21 07:59:32 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
1.19 2002/05/30 14:27:07 jstrachan Exp $
  + * $Revision: 1.19 $
  + * $Date: 2002/05/30 14:27:07 $
    *
    * ====================================================================
    *
  @@ -57,7 +57,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - * $Id: XMLParser.java,v 1.18 2002/05/21 07:59:32 jstrachan Exp $
  + * $Id: XMLParser.java,v 1.19 2002/05/30 14:27:07 jstrachan Exp $
    */
   package org.apache.commons.jelly.parser;
   import java.io.File;
  @@ -109,7 +109,7 @@
    * The SAXParser and XMLReader portions of this code come from Digester.</p>
    *
    * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  - * @version $Revision: 1.18 $
  + * @version $Revision: 1.19 $
    */
   public class XMLParser extends DefaultHandler {
   
  @@ -200,6 +200,12 @@
        */
       private Log log = LogFactory.getLog(XMLParser.class);
   
  +
  +    /** 
  +     * A stack of tags used to assign the parent tag
  +     */
  +    private List tagStack = new ArrayList();
  +    
       /**
        * Construct a new XMLParser with default properties.
        */
  @@ -565,7 +571,13 @@
                   // set parent relationship...
                   Tag tag = tagScript.getTag();
                   tag.setParent(parentTag);
  -                parentTag = tag;
  +                
  +                // pop another tag onto the stack
  +                if ( parentTag != null ) {
  +                    tagStack.add( parentTag );                
  +                }
  +                parentTag = tag;                
  +                
                   if (textBuffer.length() > 0) {
                       script.addScript(new TextScript(textBuffer.toString()));
                       textBuffer.setLength(0);
  @@ -642,6 +654,13 @@
               textBuffer.append("</");
               textBuffer.append(qName);
               textBuffer.append(">");
  +        }
  +        int size = tagStack.size();
  +        if ( size <= 0 ) {
  +            parentTag = null;
  +        }
  +        else {
  +            parentTag = (Tag) tagStack.remove( size - 1 );
           }
       }
   
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestParser.java
  
  Index: TestParser.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestParser.java,v
1.8 2002/05/28 07:20:06 jstrachan Exp $
   * $Revision: 1.8 $
   * $Date: 2002/05/28 07:20:06 $
   *
   * ====================================================================
   *
   * 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: TestParser.java,v 1.8 2002/05/28 07:20:06 jstrachan Exp $
   */
  package org.apache.commons.jelly;
  
  import java.io.FileInputStream;
  import java.io.InputStream;
  import java.io.IOException;
  import java.io.StringWriter;
  
  import junit.framework.Test;
  import junit.framework.TestCase;
  import junit.framework.TestSuite;
  import junit.textui.TestRunner;
  
  import org.apache.commons.jelly.JellyContext;
  import org.apache.commons.jelly.Script;
  import org.apache.commons.jelly.XMLOutput;
  import org.apache.commons.jelly.impl.ScriptBlock;
  import org.apache.commons.jelly.impl.TagScript;
  import org.apache.commons.jelly.parser.XMLParser;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  /** Tests the core tags
    *
    * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
    * @version $Revision: 1.8 $
    */
  public class TestParser extends TestCase {
  
      /** The Log to which logging calls will be made. */
      private static final Log log = LogFactory.getLog(TestParser.class);
  
      public static void main(String[] args) {
          TestRunner.run(suite());
      }
  
      public static Test suite() {
          return new TestSuite(TestParser.class);
      }
  
      public TestParser(String testName) {
          super(testName);
      }
  
      /**
       * Tests that parsing an example script correctly creates the parent relationships
       */
      public void testParser() throws Exception {
          InputStream in = new FileInputStream("src/test/org/apache/commons/jelly/sql/example2.jelly");
          XMLParser parser = new XMLParser();
          Script script = parser.parse(in);
          script = script.compile();
          
          log.debug("Found: " + script);
          
          assertTagsHaveParent( script, null );
      }
      
      /**
       * Tests that the Tag in the TagScript has the given parent and then
       * recurse to check its children has the correct parent and so forth.
       */
      protected void assertTagsHaveParent(Script script, Tag parent) throws Exception {
          if ( script instanceof TagScript ) {
              TagScript tagScript = (TagScript) script;        
              Tag tag = tagScript.getTag();
              
              assertEquals( "Tag: " + tag + " has the incorrect parent", parent, tag.getParent()
);
              
              assertTagsHaveParent( tag.getBody(), tag );
          }
          else if ( script instanceof ScriptBlock ) {
              ScriptBlock block = (ScriptBlock) script;
              Script[] scripts = block.getScripts();
              for ( int i = 0; i < scripts.length; i++ ) {
                  assertTagsHaveParent( scripts[i], parent );
              }
          }
      }
  }
  
  
  

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