Return-Path: 
 <dev-return-50872-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 27950 invoked from network); 23 Sep 2003 06:30:28 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 23 Sep 2003 06:30:28 -0000
Received: (qmail 4502 invoked by uid 500); 23 Sep 2003 06:30:03 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 4466 invoked by uid 500); 23 Sep 2003 06:30:02 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 4453 invoked by uid 500); 23 Sep 2003 06:30:02 -0000
Received: (qmail 4447 invoked from network); 23 Sep 2003 06:30:02 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 23 Sep 2003 06:30:02 -0000
Received: (qmail 27929 invoked by uid 1146); 23 Sep 2003 06:30:24 -0000
Date: 23 Sep 2003 06:30:24 -0000
Message-ID: <20030923063024.27928.qmail@minotaur.apache.org>
From: bodewig@apache.org
To: ant-cvs@apache.org
Subject: cvs commit:
 ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit
 XMLFormatterWithCDATAOnSystemOut.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

bodewig     2003/09/22 23:30:24

  Added:       src/etc/testcases/taskdefs/optional/junit cdataoutput.xml
               src/testcases/org/apache/tools/ant/taskdefs/optional/junit
                        XMLFormatterWithCDATAOnSystemOut.java
  Log:
  Add test for PR 21037
  
  Revision  Changes    Path
  1.1                  ant/src/etc/testcases/taskdefs/optional/junit/cdataoutput.xml
  
  Index: cdataoutput.xml
  ===================================================================
  <project basedir=".">
    <target name="run-junit">
      <junit fork="true">
        <classpath path="${tests-classpath.value}"/>
        <sysproperty key="cdata.inner" value="true"/>
        <test
          name="org.apache.tools.ant.taskdefs.optional.junit.XMLFormatterWithCDATAOnSystemOut"/>
        <formatter type="xml"/>
      </junit>
    </target>
  </project>
  
  
  1.1                  ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java
  
  Index: XMLFormatterWithCDATAOnSystemOut.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 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 "Ant" 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/>.
   */
  package org.apache.tools.ant.taskdefs.optional.junit;
  
  import java.io.File;
  import java.io.FileReader;
  import java.io.IOException;
  import org.apache.tools.ant.BuildFileTest;
  import org.apache.tools.ant.util.FileUtils;
  
  public class XMLFormatterWithCDATAOnSystemOut extends BuildFileTest {
  
      private static String DIR = "src/etc/testcases/taskdefs/optional/junit";
      private static String REPORT = 
          "TEST-" + XMLFormatterWithCDATAOnSystemOut.class.getName() + ".xml";
  
      private static String TESTDATA = 
          "<ERROR>" +
          "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
          "  <RESPONSE>" +
          "    <GDS/>" +
          "    <ERROR>" +
          "      <ID/>" +
          "      <MESSAGE/>" +
          "      <REQUEST_TYPE/>" +
          "      <RESEND/>" +
          "      <RAW_RESPONSE/>" +
          "    </ERROR>" +
          "  </RESPONSE>" +
          "]]>" +
          "</ERROR>";
  
      public XMLFormatterWithCDATAOnSystemOut(String name) {
          super(name);
      }
  
      public void testOutput() {
          System.out.println(TESTDATA);
      }
  
      public void testBuildfile() throws IOException {
          configureProject(DIR + "/cdataoutput.xml");
          if (getProject().getProperty("cdata.inner") == null) {
              // avoid endless loop
              executeTarget("run-junit");
              File f = getProject().resolveFile(REPORT);
              FileReader reader = null;
              try {
                  reader = new FileReader(f);
                  String content = FileUtils.newFileUtils().readFully(reader);
                  assertTrue(content.indexOf("</RESPONSE>&#x5d;&#x5d;&gt;"
                                             + "</ERROR>") > 0);
              } finally {
                  if (reader != null) {
                      reader.close();
                  }
                  f.delete();
              }
          }
      }
  
  }
  
  
  

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