Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 18025 invoked from network); 30 Sep 2004 09:27:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 30 Sep 2004 09:27:12 -0000 Received: (qmail 98764 invoked by uid 500); 30 Sep 2004 09:27:09 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 98721 invoked by uid 500); 30 Sep 2004 09:27:09 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 98708 invoked by uid 500); 30 Sep 2004 09:27:09 -0000 Received: (qmail 98704 invoked by uid 99); 30 Sep 2004 09:27:09 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 30 Sep 2004 02:27:08 -0700 Received: (qmail 17973 invoked by uid 1146); 30 Sep 2004 09:27:07 -0000 Date: 30 Sep 2004 09:27:07 -0000 Message-ID: <20040930092707.17972.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/testcases/org/apache/tools/ant IntrospectionHelperTest.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2004/09/30 02:27:07 Modified: src/testcases/org/apache/tools/ant IntrospectionHelperTest.java Log: Make test pass on OS X Revision Changes Path 1.24 +19 -9 ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java Index: IntrospectionHelperTest.java =================================================================== RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- IntrospectionHelperTest.java 13 Sep 2004 13:26:32 -0000 1.23 +++ IntrospectionHelperTest.java 30 Sep 2004 09:27:07 -0000 1.24 @@ -594,16 +594,25 @@ public void testGetExtensionPoints() { List extensions = ih.getExtensionPoints(); - assertEquals("extension count", 3, extensions.size()); + final int adders = 2; + assertEquals("extension count", adders, extensions.size()); - assertExtMethod(extensions.get(0), "add", Number.class, - new Integer(2), new Integer(3)); + // 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 @@ 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 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org