From 07e96569da1066e47796400522fade6c24d93e96 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 23 Oct 2001 10:23:18 +0000 Subject: [PATCH] Account for a change in JUnit - TestCase.name() has been removed. Now use reflection to invoke either getName or name, whichever is available, so that the formatters will still support JUnit prior to version 3.7 - once we decide to drop this support, this workaround will be backed out. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269813 13f79535-47bb-0310-9956-ffa450edef68 --- .../optional/junit/JUnitVersionHelper.java | 97 +++++++++++++++++++ .../junit/PlainJUnitResultFormatter.java | 4 +- .../junit/XMLJUnitResultFormatter.java | 3 +- 3 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java new file mode 100644 index 000000000..3babbe902 --- /dev/null +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java @@ -0,0 +1,97 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001 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.optional.junit; + +import java.lang.reflect.Method; + +import junit.framework.TestCase; + +/** + * Work around for some changes to the public JUnit API between + * different JUnit releases. + * + * @author Stefan Bodewig + * @version $Revision$ + */ +public class JUnitVersionHelper { + + private static Method testCaseName = null; + static { + try { + testCaseName = TestCase.class.getMethod("getName", new Class[0]); + } catch (NoSuchMethodException e) { + // pre JUnit 3.7 + try { + testCaseName = TestCase.class.getMethod("name", new Class[0]); + } catch (NoSuchMethodException e2) {} + } + } + + /** + * JUnit 3.7 introduces TestCase.getName() and subsequent versions + * of JUnit remove the old name() method. This method provides + * access to the name of a TestCase via reflection that is + * supposed to work with version before and after JUnit 3.7. + */ + public static String getTestCaseName(TestCase t) { + if (testCaseName != null) { + try { + return (String) testCaseName.invoke(t, new Object[0]); + } catch (Throwable e) {} + } + return "unknown"; + } + +} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java index 851f9cfbc..213aa69ee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java @@ -185,7 +185,8 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter { */ public void startTest(Test t) { lastTestStart = System.currentTimeMillis(); - wri.print("Testcase: " + ((TestCase) t).name()); + wri.print("Testcase: " + + JUnitVersionHelper.getTestCaseName((TestCase) t)); failed = false; } @@ -240,4 +241,5 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter { t.printStackTrace(wri); wri.println(""); } + } // PlainJUnitResultFormatter diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index b93642357..95a7538c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -183,7 +183,8 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan public void startTest(Test t) { lastTestStart = System.currentTimeMillis(); currentTest = doc.createElement(TESTCASE); - currentTest.setAttribute(ATTR_NAME, ((TestCase) t).name()); + currentTest.setAttribute(ATTR_NAME, + JUnitVersionHelper.getTestCaseName((TestCase) t)); rootElement.appendChild(currentTest); }