Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f888bc4d authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 441cb04e: Merge change 5732 into donut 

Merge commit '441cb04e'

* commit '441cb04e':
  Fix assertContentsInOrder (bug 1790350).
parents f907ec42 441cb04e

test-runner/android/test/MoreAsserts.java

+6 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**