commit ed3338bf36ed39e318f9e53ebadf1b94b9b69580
author scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Apr 25 05:01:02 2008 +0000
committer scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Apr 25 05:01:02 2008 +0000
tree 5fd3dbe1bfb3ed199d34cc1539921f7aa4c1f0d9
parent 79b4c9cc279be31cf0e36d8fada0043eeb90ea66

Build fix for a latent problem uncovered by allowing binary only annotations in; we were comparing arrays of annotations without sorting them.


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@2582 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java

diff --git a/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java b/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java
index cfeb03b..d00e716 100644
--- a/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java
+++ b/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java
@@ -19,12 +19,20 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
+import java.util.Comparator;
 
 /**
  * Base test cases for all {@link JDelegatingClassType}s.
  */
 public abstract class JDelegatingClassTypeTestBase extends TestCase {
 
+  private static final Comparator<? super Annotation> ANNOTATION_COMPARATOR = new Comparator<Annotation>() {
+    public int compare(Annotation o1, Annotation o2) {
+      // Just use toString, it contains all info.
+      return o1.toString().compareTo(o2.toString());
+    }
+  };
+
   protected static void assertArraysEqual(Object[] expected, Object[] actual) {
     assertTrue("Expected: \n" + Arrays.toString(expected) + ",\n Actual: \n"
         + Arrays.toString(actual), Arrays.equals(expected, actual));
@@ -64,6 +72,8 @@
 
   protected static void validateAnnotations(Annotation[] expected,
       Annotation[] actual) {
+    Arrays.sort(expected, ANNOTATION_COMPARATOR);
+    Arrays.sort(actual, ANNOTATION_COMPARATOR);
     assertArraysEqual(expected, actual);
   }
 
@@ -82,6 +92,8 @@
 
   protected static void validateDeclaredAnnotations(Annotation[] expected,
       Annotation[] actual) {
+    Arrays.sort(expected, ANNOTATION_COMPARATOR);
+    Arrays.sort(actual, ANNOTATION_COMPARATOR);
     assertArraysEqual(expected, actual);
   }
 
@@ -218,6 +230,7 @@
     }
   }
 
+  @SuppressWarnings("deprecation")
   protected static void validateMetaData(HasMetaData md1, HasMetaData md2) {
     validateMetaDataTags(md1, md2);
 
@@ -234,6 +247,7 @@
     }
   }
 
+  @SuppressWarnings("deprecation")
   protected static void validateMetaDataTags(HasMetaData md1, HasMetaData md2) {
     assertEquals(md1.getMetaDataTags().length, md2.getMetaDataTags().length);
   }