diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-01 16:01:30 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-01 16:01:30 -0700 |
| commit | f888bc4dfe75c990874a8ca793a6217d38ef2757 (patch) | |
| tree | ecbb610f851183c290499c584df9c5bfd6f5c9eb /test-runner | |
| parent | f907ec4268dc2e0a32fcd38b61d0c658e83e06fc (diff) | |
| parent | 441cb04efc0048585b3a6e6fa3d564e3d1b26f62 (diff) | |
| download | frameworks_base-f888bc4dfe75c990874a8ca793a6217d38ef2757.zip frameworks_base-f888bc4dfe75c990874a8ca793a6217d38ef2757.tar.gz frameworks_base-f888bc4dfe75c990874a8ca793a6217d38ef2757.tar.bz2 | |
am 441cb04e: Merge change 5732 into donut
Merge commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62'
* commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62':
Fix assertContentsInOrder (bug 1790350).
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/android/test/MoreAsserts.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test-runner/android/test/MoreAsserts.java b/test-runner/android/test/MoreAsserts.java index 2e74644..9e0d018 100644 --- a/test-runner/android/test/MoreAsserts.java +++ b/test-runner/android/test/MoreAsserts.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.ArrayList; import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -316,8 +317,11 @@ public final class MoreAsserts { */ public static void assertContentsInOrder( String message, Iterable<?> actual, Object... expected) { - Assert.assertEquals(message, - Arrays.asList(expected), Lists.newArrayList(actual)); + ArrayList actualList = new ArrayList(); + for (Object o : actual) { + actualList.add(o); + } + Assert.assertEquals(message, Arrays.asList(expected), actualList); } /** |