bodewig 2002/09/16 07:19:33
Modified: src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_15_BRANCH JUnitVersionHelper.java
src/testcases/org/apache/tools/ant/taskdefs/optional/junit
Tag: ANT_15_BRANCH JUnitVersionHelperTest.java
Log:
accept name() as well - merge from HEAD.
Revision Changes Path
No revision
No revision
1.2.2.2 +11 -5
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
Index: JUnitVersionHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- JUnitVersionHelper.java 13 Sep 2002 10:13:40 -0000 1.2.2.1
+++ JUnitVersionHelper.java 16 Sep 2002 14:19:33 -0000 1.2.2.2
@@ -55,7 +55,6 @@
package org.apache.tools.ant.taskdefs.optional.junit;
import java.lang.reflect.Method;
-
import junit.framework.Test;
import junit.framework.TestCase;
@@ -97,9 +96,16 @@
} catch (Throwable e) {}
} else {
try {
- Method getNameMethod =
- t.getClass().getMethod("getName", new Class [0]);
- if (getNameMethod.getReturnType() == String.class) {
+ Method getNameMethod = null;
+ try {
+ getNameMethod =
+ t.getClass().getMethod("getName", new Class [0]);
+ } catch (NoSuchMethodException e) {
+ getNameMethod = t.getClass().getMethod("name",
+ new Class [0]);
+ }
+ if (getNameMethod != null &&
+ getNameMethod.getReturnType() == String.class) {
return (String) getNameMethod.invoke(t, new Object[0]);
}
} catch (Throwable e) {}
No revision
No revision
1.1.2.2 +11 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java
Index: JUnitVersionHelperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JUnitVersionHelperTest.java 13 Sep 2002 10:13:40 -0000 1.1.2.1
+++ JUnitVersionHelperTest.java 16 Sep 2002 14:19:33 -0000 1.1.2.2
@@ -87,6 +87,11 @@
JUnitVersionHelper.getTestCaseName(new Foo3()));
}
+ public void testNameNotGetName() {
+ assertEquals("I'm a foo, too",
+ JUnitVersionHelper.getTestCaseName(new Foo4()));
+ }
+
public void testNull() {
assertEquals("unknown", JUnitVersionHelper.getTestCaseName(null));
}
@@ -106,4 +111,9 @@
public static class Foo3 extends Foo {
}
+
+ public static class Foo4 extends Foo {
+ public String name() {return "I'm a foo, too";}
+ }
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
