Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 5732 into donut

Browse Source 
* changes:
  Fix assertContentsInOrder (bug 1790350).
This commit is contained in:
Android (Google) Code Review
2009-06-30 12:17:48 -07:00
parent 2f8d58b7ae 97eb32e2ca
commit 441cb04efc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test-runner/android/test/MoreAsserts.java
View File

@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.ArrayList;
import java.util.regex.MatchResult; import java.util.regex.MatchResult;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -316,8 +317,11 @@ public final class MoreAsserts {
*/ */
public static void assertContentsInOrder( public static void assertContentsInOrder(
String message, Iterable<?> actual, Object... expected) { String message, Iterable<?> actual, Object... expected) {
Assert.assertEquals(message, ArrayList actualList = new ArrayList();
Arrays.asList(expected), Lists.newArrayList(actual)); for (Object o : actual) {
actualList.add(o);
}
Assert.assertEquals(message, Arrays.asList(expected), actualList);
} }
/** /**