From 0a60a74c8c40cc87239e965e94380e1922d85293 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Wed, 15 Jan 2003 14:10:59 +0000 Subject: [PATCH] Initial tests for Import including a test to highlight issue importing unnamed projects git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273802 13f79535-47bb-0310-9956-ffa450edef68 --- .../taskdefs/{ => import}/import.xml | 0 .../taskdefs/{ => import}/imported.xml | 0 .../testcases/taskdefs/import/unnamed1.xml | 5 ++ .../testcases/taskdefs/import/unnamed2.xml | 3 + .../taskdefs/import/unnamedImport.xml | 8 ++ .../org/apache/tools/ant/BuildFileTest.java | 27 +++++- .../apache/tools/ant/taskdefs/ImportTest.java | 87 +++++++++++++++++++ 7 files changed, 129 insertions(+), 1 deletion(-) rename src/etc/testcases/taskdefs/{ => import}/import.xml (100%) rename src/etc/testcases/taskdefs/{ => import}/imported.xml (100%) create mode 100644 src/etc/testcases/taskdefs/import/unnamed1.xml create mode 100644 src/etc/testcases/taskdefs/import/unnamed2.xml create mode 100644 src/etc/testcases/taskdefs/import/unnamedImport.xml create mode 100644 src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java diff --git a/src/etc/testcases/taskdefs/import.xml b/src/etc/testcases/taskdefs/import/import.xml similarity index 100% rename from src/etc/testcases/taskdefs/import.xml rename to src/etc/testcases/taskdefs/import/import.xml diff --git a/src/etc/testcases/taskdefs/imported.xml b/src/etc/testcases/taskdefs/import/imported.xml similarity index 100% rename from src/etc/testcases/taskdefs/imported.xml rename to src/etc/testcases/taskdefs/import/imported.xml diff --git a/src/etc/testcases/taskdefs/import/unnamed1.xml b/src/etc/testcases/taskdefs/import/unnamed1.xml new file mode 100644 index 000000000..cc321d827 --- /dev/null +++ b/src/etc/testcases/taskdefs/import/unnamed1.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/etc/testcases/taskdefs/import/unnamed2.xml b/src/etc/testcases/taskdefs/import/unnamed2.xml new file mode 100644 index 000000000..083c195d3 --- /dev/null +++ b/src/etc/testcases/taskdefs/import/unnamed2.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/etc/testcases/taskdefs/import/unnamedImport.xml b/src/etc/testcases/taskdefs/import/unnamedImport.xml new file mode 100644 index 000000000..00fe9b117 --- /dev/null +++ b/src/etc/testcases/taskdefs/import/unnamedImport.xml @@ -0,0 +1,8 @@ + + + + + + Tests import of unnamed projects + + \ No newline at end of file diff --git a/src/testcases/org/apache/tools/ant/BuildFileTest.java b/src/testcases/org/apache/tools/ant/BuildFileTest.java index 41c1a2913..735ea0ee1 100644 --- a/src/testcases/org/apache/tools/ant/BuildFileTest.java +++ b/src/testcases/org/apache/tools/ant/BuildFileTest.java @@ -222,12 +222,22 @@ public abstract class BuildFileTest extends TestCase { * @param filename name of project file to run */ protected void configureProject(String filename) throws BuildException { + configureProject(filename, Project.MSG_DEBUG); + } + + /** + * set up to run the named project + * + * @param filename name of project file to run + */ + protected void configureProject(String filename, int logLevel) + throws BuildException { logBuffer = new StringBuffer(); fullLogBuffer = new StringBuffer(); project = new Project(); project.init(); project.setUserProperty( "ant.file" , new File(filename).getAbsolutePath() ); - project.addBuildListener(new AntTestListener()); + project.addBuildListener(new AntTestListener(logLevel)); ProjectHelper.configureProject(project, new File(filename)); } @@ -407,6 +417,16 @@ public abstract class BuildFileTest extends TestCase { * our own personal build listener */ private class AntTestListener implements BuildListener { + private int logLevel; + + /** + * Constructs a test listener which will ignore log events + * above the given level + */ + public AntTestListener(int logLevel) { + this.logLevel = logLevel; + } + /** * Fired before any targets are started. */ @@ -467,6 +487,11 @@ public abstract class BuildFileTest extends TestCase { * @see BuildEvent#getPriority() */ public void messageLogged(BuildEvent event) { + if (event.getPriority() > logLevel) { + // ignore event + return; + } + if (event.getPriority() == Project.MSG_INFO || event.getPriority() == Project.MSG_WARN || event.getPriority() == Project.MSG_ERR) { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java new file mode 100644 index 000000000..2d57e7afb --- /dev/null +++ b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java @@ -0,0 +1,87 @@ +/* + * 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 "The Jakarta Project", "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 + * . + */ + +package org.apache.tools.ant.taskdefs; + +import org.apache.tools.ant.BuildFileTest; +import org.apache.tools.ant.Project; + +/** + * @author Conor MacNeill + */ +public class ImportTest extends BuildFileTest { + + public ImportTest(String name) { + super(name); + } + + public void setUp() { + } + + public void tearDown() { + } + + public void testSimpleImport() { + configureProject("src/etc/testcases/taskdefs/import/import.xml"); + } + + public void testUnnamedNesting() { + configureProject("src/etc/testcases/taskdefs/import/unnamedImport.xml", + Project.MSG_WARN); + String log = getLog(); + assertTrue("Warnings logged when not expected: " + log, + log.length() == 0); + } +} +