From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17558 invoked by alias); 1 May 2006 22:31:24 -0000 Received: (qmail 17549 invoked by uid 22791); 1 May 2006 22:31:23 -0000 X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 01 May 2006 22:31:21 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k41MVJp8014594 for ; Mon, 1 May 2006 18:31:19 -0400 Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com [172.16.14.4]) by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k41MVJWC018182 for ; Mon, 1 May 2006 18:31:19 -0400 Received: from [172.16.14.67] (towel.toronto.redhat.com [172.16.14.67]) by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id k41MVJbj004807 for ; Mon, 1 May 2006 18:31:19 -0400 Message-ID: <44568C37.5090504@redhat.com> Date: Mon, 01 May 2006 22:31:00 -0000 From: Bryce McKinlay User-Agent: Thunderbird 1.5 (X11/20051025) MIME-Version: 1.0 To: mauve-discuss@sources.redhat.com Subject: FYI: Fix HashMap / LinkedHashMap tests Content-Type: multipart/mixed; boundary="------------010006060307040407010904" Mailing-List: contact mauve-discuss-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: mauve-discuss-owner@sourceware.org X-SW-Source: 2006-q2/txt/msg00001.txt.bz2 This is a multi-part message in MIME format. --------------010006060307040407010904 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 205 Classpath has been changed so that Iterator.hasNext() no longer checks for concurrent modification, causing two tests to fail. This patch updates the tests to look for the new behaviour instead. Bryce --------------010006060307040407010904 Content-Type: text/x-patch; name="mauve-iterator-concurrentmodification.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mauve-iterator-concurrentmodification.patch" Content-length: 1987 2006-05-01 Bryce McKinlay * gnu/testlet/java/util/HashMap/AcuniaHashMapTest.java (test_entrySet): Iterator.hasNext() does not throw ConcurrentModificationException - update test accordingly. * gnu/testlet/java/util/LinkedHashMap/LinkedHashMapTest.java (test_entrySet): Likewise. Index: gnu/testlet/java/util/HashMap/AcuniaHashMapTest.java =================================================================== RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/HashMap/AcuniaHashMapTest.java,v retrieving revision 1.4 diff -u -r1.4 AcuniaHashMapTest.java --- gnu/testlet/java/util/HashMap/AcuniaHashMapTest.java 21 Feb 2005 15:52:50 -0000 1.4 +++ gnu/testlet/java/util/HashMap/AcuniaHashMapTest.java 1 May 2006 22:15:16 -0000 @@ -326,10 +326,10 @@ th.check( s.size() == 15 ); try { th.check(it.hasNext()); - th.fail("it.hasNext after hm.remove should throw ConcurrentModificationException"); + th.check(true); } catch(ConcurrentModificationException cme) { - th.check(true); + th.fail("it.hasNext should not throw ConcurrentModificationException"); } try { it.next(); Index: gnu/testlet/java/util/LinkedHashMap/LinkedHashMapTest.java =================================================================== RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/LinkedHashMap/LinkedHashMapTest.java,v retrieving revision 1.2 diff -u -r1.2 LinkedHashMapTest.java --- gnu/testlet/java/util/LinkedHashMap/LinkedHashMapTest.java 19 Feb 2005 03:03:34 -0000 1.2 +++ gnu/testlet/java/util/LinkedHashMap/LinkedHashMapTest.java 1 May 2006 22:15:16 -0000 @@ -258,10 +258,10 @@ th.check( hm.size() == 15 ); try { th.check(it.hasNext()); - th.fail("it.hasNext after hm.remove should throw ConcurrentModificationException"); + th.check(true); } catch(ConcurrentModificationException cme) { - th.check(true); + th.fail("it.hasNext should not throw ConcurrentModificationException"); } try { it.next(); --------------010006060307040407010904--