Merge branch 'fix-testsetfactory'
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5748 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/eclipse/settings/code-style/gwt.importorder b/eclipse/settings/code-style/gwt.importorder
index c919edd..8ed1f2a 100644
--- a/eclipse/settings/code-style/gwt.importorder
+++ b/eclipse/settings/code-style/gwt.importorder
@@ -1,9 +1,16 @@
#Organize Import Order
-#Thu Jul 20 15:01:42 EDT 2006
-6=javax
-5=java
-4=org
-3=net
-2=junit
-1=com
-0=com.google
+#Wed Jul 15 12:38:37 PDT 2009
+9=org
+8=\#org
+7=net
+6=\#net
+5=junit
+13=javax
+4=\#junit
+12=\#javax
+3=com
+11=java
+2=\#com
+10=\#java
+1=com.google
+0=\#com.google
diff --git a/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java b/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java
index 4a68669..adbf839 100644
--- a/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java
+++ b/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java
@@ -15,17 +15,17 @@
*/
package com.google.gwt.user.client.rpc;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeMap;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeSet;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializableDoublyLinkedNode;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializablePrivateNoArg;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializableWithTwoArrays;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertSame;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -41,7 +41,10 @@
import java.util.Map.Entry;
/**
- * TODO: document me.
+ * Misnamed set of static validation methods used by various
+ * collection class tests.
+ * <p>
+ * TODO: could add generics to require args to be of the same type
*/
public class TestSetValidator {
@@ -153,7 +156,7 @@
return true;
}
- public static boolean equals(Iterator expected, Iterator actual) {
+ public static boolean equals(Iterator<?> expected, Iterator<?> actual) {
while (expected.hasNext() && actual.hasNext()) {
if (!expected.next().equals(actual.next())) {
return false;
@@ -231,12 +234,12 @@
return true;
}
- public static boolean isValid(ArrayList list) {
+ public static boolean isValid(ArrayList<?> list) {
if (list == null) {
return false;
}
- ArrayList reference = TestSetFactory.createArrayList();
+ ArrayList<?> reference = TestSetFactory.createArrayList();
if (reference.size() != list.size()) {
return false;
}
@@ -244,7 +247,7 @@
return reference.equals(list);
}
- public static boolean isValid(HashMap expected, HashMap map) {
+ public static boolean isValid(HashMap<?,?> expected, HashMap<?,?> map) {
if (map == null) {
return false;
}
@@ -253,10 +256,10 @@
return false;
}
- Set entries = expected.entrySet();
- Iterator entryIter = entries.iterator();
+ Set<?> entries = expected.entrySet();
+ Iterator<?> entryIter = entries.iterator();
while (entryIter.hasNext()) {
- Entry entry = (Entry) entryIter.next();
+ Entry<?,?> entry = (Entry<?,?>) entryIter.next();
Object value = map.get(entry.getKey());
@@ -274,7 +277,7 @@
return true;
}
- public static boolean isValid(HashSet expected, HashSet actual) {
+ public static boolean isValid(HashSet<?> expected, HashSet<?> actual) {
if (actual == null) {
return false;
}
@@ -283,7 +286,7 @@
return false;
}
- Iterator entryIter = expected.iterator();
+ Iterator<?> entryIter = expected.iterator();
while (entryIter.hasNext()) {
Object entry = entryIter.next();
@@ -295,19 +298,19 @@
return true;
}
- public static boolean isValid(LinkedHashMap expected, LinkedHashMap map) {
- if (isValid((HashMap) expected, (HashMap) map)) {
- Iterator expectedEntries = expected.entrySet().iterator();
- Iterator actualEntries = map.entrySet().iterator();
+ public static boolean isValid(LinkedHashMap<?,?> expected, LinkedHashMap<?,?> map) {
+ if (isValid((HashMap<?,?>) expected, (HashMap<?,?>) map)) {
+ Iterator<?> expectedEntries = expected.entrySet().iterator();
+ Iterator<?> actualEntries = map.entrySet().iterator();
return equals(expectedEntries, actualEntries);
}
return false;
}
- public static boolean isValid(LinkedHashSet expected, LinkedHashSet map) {
- if (isValid((HashSet) expected, (HashSet) map)) {
- Iterator expectedEntries = expected.iterator();
- Iterator actualEntries = map.iterator();
+ public static boolean isValid(LinkedHashSet<?> expected, LinkedHashSet<?> map) {
+ if (isValid((HashSet<?>) expected, (HashSet<?>) map)) {
+ Iterator<?> expectedEntries = expected.iterator();
+ Iterator<?> actualEntries = map.iterator();
return equals(expectedEntries, actualEntries);
}
return false;
@@ -383,7 +386,7 @@
return true;
}
- public static boolean isValid(Vector expected, Vector actual) {
+ public static boolean isValid(Vector<?> expected, Vector<?> actual) {
if (actual == null) {
return false;
}
@@ -429,12 +432,12 @@
return true;
}
- public static boolean isValidAsList(List list) {
+ public static boolean isValidAsList(List<?> list) {
if (list == null) {
return false;
}
- List reference = TestSetFactory.createArraysAsList();
+ List<?> reference = TestSetFactory.createArraysAsList();
if (reference.size() != list.size()) {
return false;
}
