Browse Source

Make test pass on OS X

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276897 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 21 years ago
parent
commit
9844e736fe
1 changed files with 20 additions and 10 deletions
  1. +20
    -10
      src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java

+ 20
- 10
src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java View File

@@ -594,16 +594,25 @@ public class IntrospectionHelperTest extends TestCase {

public void testGetExtensionPoints() {
List extensions = ih.getExtensionPoints();
assertEquals("extension count", 3, extensions.size());

assertExtMethod(extensions.get(0), "add", Number.class,
new Integer(2), new Integer(3));
final int adders = 2;
assertEquals("extension count", adders, extensions.size());

// this original test assumed something about the order of
// add(Number) and addConfigured(Map) returned by reflection.
// Unfortunately the assumption doesn't hold for all VMs
// (failed on MacOS X using JDK 1.4.2_05) and the possible
// combinatorics are too hard to check. We really only want
// to ensure that the more derived Hashtable can be found
// before Map.
// assertExtMethod(extensions.get(0), "add", Number.class,
// new Integer(2), new Integer(3));

// addConfigured(Hashtable) should come before addConfigured(Map)
assertExtMethod(extensions.get(1), "addConfigured", Hashtable.class,
assertExtMethod(extensions.get(adders - 2),
"addConfigured", Hashtable.class,
makeTable("key", "value"), makeTable("1", "2"));

assertExtMethod(extensions.get(2), "addConfigured", Map.class,
assertExtMethod(extensions.get(adders - 1), "addConfigured", Map.class,
new HashMap(), makeTable("1", "2"));
}

@@ -644,10 +653,11 @@ public class IntrospectionHelperTest extends TestCase {
return null;
}

public void add(Number n) {
// Valid extension point
assertEquals(2, n.intValue());
}
// see comments in testGetExtensionPoints
// public void add(Number n) {
// // Valid extension point
// assertEquals(2, n.intValue());
// }

public void add(List l, int i) {
// INVALID extension point


Loading…
Cancel
Save