FYI: TextAction/augmentList() order doesn't matter

[Mark Wielaard <mark at klomp dot org>]

Hi,

The order of the elements returned by TextAction.augmentList() doesn't
seem to matter. This patch makes it so:

2006-02-12  Mark Wielaard  <mark@klomp.org>

   * gnu/testlet/javax/swing/text/TextAction/augmentList.java: Order
   of elements doesn't matter, as long as all elements are present.

Committed,

Mark

Index: gnu/testlet/javax/swing/text/TextAction/augmentList.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/text/TextAction/augmentList.java,v
retrieving revision 1.1
diff -u -r1.1 augmentList.java
--- gnu/testlet/javax/swing/text/TextAction/augmentList.java	25 Dec 2004 18:47:08 -0000	1.1
+++ gnu/testlet/javax/swing/text/TextAction/augmentList.java	12 Feb 2006 13:03:04 -0000
@@ -1,6 +1,7 @@
 // Tags: JDK1.4
 
 // Copyright (C) 2004 Michael Koch <konqueror@gmx.de>
+// Copyright (C) 2006 Mark Wielaard <mark@klomp.org>
 
 // This file is part of Mauve.
 
@@ -128,9 +129,12 @@
       {
       }
 
-    h.check(ok, "invalid arguments");
-    h.check(result.length, 2, "invalid array length");
-    h.check(result[0], data[1], "invalid content");
-    h.check(result[1], data[0], "invalid content");
+    // The length is guaranteed, and so is the content, but not the order.
+    h.check(ok, "arguments");
+    h.check(result.length, 2, "array length");
+    
+    h.check(result[0] == data[0] || result[0] == data[1], "content");
+    h.check(result[1] == data[0] || result[1] == data[1], "content");
+    h.check(result[0] != result[1], "content");
   }
 }

Attachment: signature.asc
Description: This is a digitally signed message part