Return-Path: 
 <dev-return-49830-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 3350 invoked by uid 500); 22 Aug 2003 01:26:28 -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 3296 invoked by uid 500); 22 Aug 2003 01:26:27 -0000
Received: (qmail 3279 invoked from network); 22 Aug 2003 01:26:27 -0000
Received: from minotaur.apache.org (209.237.227.194)
  by daedalus.apache.org with SMTP; 22 Aug 2003 01:26:27 -0000
Received: (qmail 42418 invoked by uid 1652); 21 Aug 2003 18:14:30 -0000
Date: 21 Aug 2003 18:14:30 -0000
Message-ID: <20030821181430.42417.qmail@minotaur.apache.org>
From: antoine@apache.org
To: ant-cvs@apache.org
Subject: cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs
 StyleTest.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

antoine     2003/08/21 11:14:30

  Modified:    src/testcases/org/apache/tools/ant/filters HeadTailTest.java
               src/testcases/org/apache/tools/ant/taskdefs StyleTest.java
  Log:
  finish off the bug report of Martijn.
  Note that the diffs of StyleTest.java is big, the file contained
  control M characters at the end of each line
  PR: 22549
  Submitted by: J.M. (Martijn) Kruithof ant at kruithof dot xs4all dot nl
  
  Revision  Changes    Path
  1.4       +1 -1      ant/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java
  
  Index: HeadTailTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HeadTailTest.java	23 Apr 2003 15:12:13 -0000	1.3
  +++ HeadTailTest.java	21 Aug 2003 18:14:30 -0000	1.4
  @@ -61,7 +61,7 @@
   import org.apache.tools.ant.util.FileUtils;
   
   /** JUnit Testcases for TailFilter and HeadFilter
  - * @author <a href="mailto:jan@materne.de">Jan Mat�rne</a>
  + * @author <a href="mailto:jan@materne.de">Jan Materne</a>
    */
   /* I wrote the testcases in one java file because I want also to test the
    * combined behaviour (see end of the class).
  
  
  
  1.3       +154 -154  ant/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
  
  Index: StyleTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StyleTest.java	6 Aug 2003 09:43:19 -0000	1.2
  +++ StyleTest.java	21 Aug 2003 18:14:30 -0000	1.3
  @@ -1,154 +1,154 @@
  -/*
  - * 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;
  -
  -
  -import org.apache.tools.ant.BuildFileTest;
  -import org.apache.tools.ant.util.FileUtils;
  -
  -import java.io.File;
  -import java.io.FileReader;
  -import java.io.IOException;
  -import java.io.Reader;
  -
  -
  -/**
  - * TestCases f�r <style> / <xslt> task.
  - * @author Jan Mat�rne
  - * @version 2003-08-05
  - */
  -public class StyleTest extends BuildFileTest {
  -
  -    public StyleTest(String s) {
  -        super(s);
  -    }
  -
  -    protected void setUp() throws Exception {
  -        configureProject("src/etc/testcases/taskdefs/style/build.xml");
  -        //executeTarget("setup");
  -        //commented out for performance while target is empty
  -    }
  -
  -    protected void tearDown() throws Exception {
  -        executeTarget("teardown");
  -    }
  -
  -    public void testStyleIsSet() throws Exception {
  -        expectBuildException("testStyleIsSet", "no stylesheet specified");
  -    }
  -
  -    public void testTransferParameterSet() throws Exception {
  -        expectFileContains("testTransferParameterSet",  // target
  -                           "out/out.xml",               // file
  -                           "set='myvalue'");            // exptected string
  -    }
  -
  -    public void testTransferParameterEmpty() throws Exception {
  -        expectFileContains("testTransferParameterEmpty",
  -                           "out/out.xml",
  -                           "empty=''");
  -    }
  -
  -    public void testTransferParameterUnset() throws Exception {
  -        expectFileContains("testTransferParameterUnset",
  -                           "out/out.xml",
  -                           "undefined='${value}'");
  -    }
  -
  -    public void testTransferParameterUnsetWithIf() throws Exception {
  -        expectFileContains("testTransferParameterUnsetWithIf",
  -                           "out/out.xml",
  -                           "undefined='undefined default value'");
  -    }
  -
  -
  -    // *************  copied from ConcatTest  *************
  -
  -    // ------------------------------------------------------
  -    //   Helper methods - should be in BuildFileTest
  -    // -----------------------------------------------------
  -
  -    private String getFileString(String filename)
  -        throws IOException
  -    {
  -        Reader r = null;
  -        try {
  -            r = new FileReader(getProject().resolveFile(filename));
  -            return  FileUtils.newFileUtils().readFully(r);
  -        }
  -        finally {
  -            try {r.close();} catch (Throwable ignore) {}
  -        }
  -
  -    }
  -
  -    private String getFileString(String target, String filename)
  -        throws IOException
  -    {
  -        executeTarget(target);
  -        return getFileString(filename);
  -    }
  -
  -    private void expectFileContains(
  -        String target, String filename, String contains)
  -        throws IOException
  -    {
  -        String content = getFileString(target, filename);
  -        assertTrue(
  -            "expecting file " + filename + " to contain " +
  -            contains +
  -            " but got " + content, content.indexOf(contains) > -1);
  -    }
  -
  -}
  +/*
  + * 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;
  +
  +
  +import org.apache.tools.ant.BuildFileTest;
  +import org.apache.tools.ant.util.FileUtils;
  +
  +import java.io.File;
  +import java.io.FileReader;
  +import java.io.IOException;
  +import java.io.Reader;
  +
  +
  +/**
  + * TestCases fuer <style> / <xslt> task.
  + * @author Jan Materne
  + * @version 2003-08-05
  + */
  +public class StyleTest extends BuildFileTest {
  +
  +    public StyleTest(String s) {
  +        super(s);
  +    }
  +
  +    protected void setUp() throws Exception {
  +        configureProject("src/etc/testcases/taskdefs/style/build.xml");
  +        //executeTarget("setup");
  +        //commented out for performance while target is empty
  +    }
  +
  +    protected void tearDown() throws Exception {
  +        executeTarget("teardown");
  +    }
  +
  +    public void testStyleIsSet() throws Exception {
  +        expectBuildException("testStyleIsSet", "no stylesheet specified");
  +    }
  +
  +    public void testTransferParameterSet() throws Exception {
  +        expectFileContains("testTransferParameterSet",  // target
  +                           "out/out.xml",               // file
  +                           "set='myvalue'");            // exptected string
  +    }
  +
  +    public void testTransferParameterEmpty() throws Exception {
  +        expectFileContains("testTransferParameterEmpty",
  +                           "out/out.xml",
  +                           "empty=''");
  +    }
  +
  +    public void testTransferParameterUnset() throws Exception {
  +        expectFileContains("testTransferParameterUnset",
  +                           "out/out.xml",
  +                           "undefined='${value}'");
  +    }
  +
  +    public void testTransferParameterUnsetWithIf() throws Exception {
  +        expectFileContains("testTransferParameterUnsetWithIf",
  +                           "out/out.xml",
  +                           "undefined='undefined default value'");
  +    }
  +
  +
  +    // *************  copied from ConcatTest  *************
  +
  +    // ------------------------------------------------------
  +    //   Helper methods - should be in BuildFileTest
  +    // -----------------------------------------------------
  +
  +    private String getFileString(String filename)
  +        throws IOException
  +    {
  +        Reader r = null;
  +        try {
  +            r = new FileReader(getProject().resolveFile(filename));
  +            return  FileUtils.newFileUtils().readFully(r);
  +        }
  +        finally {
  +            try {r.close();} catch (Throwable ignore) {}
  +        }
  +
  +    }
  +
  +    private String getFileString(String target, String filename)
  +        throws IOException
  +    {
  +        executeTarget(target);
  +        return getFileString(filename);
  +    }
  +
  +    private void expectFileContains(
  +        String target, String filename, String contains)
  +        throws IOException
  +    {
  +        String content = getFileString(target, filename);
  +        assertTrue(
  +            "expecting file " + filename + " to contain " +
  +            contains +
  +            " but got " + content, content.indexOf(contains) > -1);
  +    }
  +
  +}
  
  
  

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