From 97eb32e2cad1871f89f9d7e91681b2977c8a4d19 Mon Sep 17 00:00:00 2001 From: Karl Rosaen Date: Mon, 29 Jun 2009 18:06:40 -0700 Subject: [PATCH] Fix assertContentsInOrder (bug 1790350). if we ever get an updated Lists class that includes a Lists.newArrayList(Iterable implementation, that would work too. --- test-runner/android/test/MoreAsserts.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test-runner/android/test/MoreAsserts.java b/test-runner/android/test/MoreAsserts.java index 2e746440403c5..9e0d018b0afb5 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); } /**