Merge "ArrayUtils.indexOf(), containsAll() with tests." into jb-mr2-dev (4861966c) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/Signature.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package android.content.pm;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.internal.util.ArrayUtils;

		import java.io.ByteArrayInputStream;
		import java.lang.ref.SoftReference;
		import java.security.PublicKey;
		@@ -198,4 +200,13 @@ public class Signature implements Parcelable {
		private Signature(Parcel source) {
		mSignature = source.createByteArray();
		}

		/**
		* Test if given {@link Signature} sets are exactly equal.
		*
		* @hide
		*/
		public static boolean areExactMatch(Signature[] a, Signature[] b) {
		return ArrayUtils.containsAll(a, b) && ArrayUtils.containsAll(b, a);
		}
		}

core/java/com/android/internal/util/ArrayUtils.java

+25 −5

Original line number	Diff line number	Diff line
		@@ -123,15 +123,35 @@ public class ArrayUtils
		* @return true if the value is present in the array
		*/
		public static <T> boolean contains(T[] array, T value) {
		for (T element : array) {
		if (element == null) {
		if (value == null) return true;
		return indexOf(array, value) != -1;
		}

		/**
		* Return first index of {@code value} in {@code array}, or {@code -1} if
		* not found.
		*/
		public static <T> int indexOf(T[] array, T value) {
		for (int i = 0; i < array.length; i++) {
		if (array[i] == null) {
		if (value == null) return i;
		} else {
		if (value != null && element.equals(value)) return true;
		if (value != null && array[i].equals(value)) return i;
		}
		}
		return -1;
		}

		/**
		* Test if all {@code check} items are contained in {@code array}.
		*/
		public static <T> boolean containsAll(T[] array, T[] check) {
		for (T checkItem : check) {
		if (!contains(array, checkItem)) {
		return false;
		}
		}
		return true;
		}

		public static boolean contains(int[] array, int value) {
		for (int element : array) {

core/tests/coretests/src/com/android/internal/util/ArrayUtilsTest.java

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.util;

		import junit.framework.TestCase;

		/**
		* Tests for {@link ArrayUtils}
		*/
		public class ArrayUtilsTest extends TestCase {
		public void testContains() throws Exception {
		final Object A = new Object();
		final Object B = new Object();
		final Object C = new Object();
		final Object D = new Object();

		assertTrue(ArrayUtils.contains(new Object[] { A, B, C }, A));
		assertTrue(ArrayUtils.contains(new Object[] { A, B, C }, B));
		assertTrue(ArrayUtils.contains(new Object[] { A, B, C }, C));
		assertTrue(ArrayUtils.contains(new Object[] { A, null, C }, null));

		assertFalse(ArrayUtils.contains(new Object[] { A, B, C }, null));
		assertFalse(ArrayUtils.contains(new Object[] { }, null));
		assertFalse(ArrayUtils.contains(new Object[] { null }, A));
		}

		public void testIndexOf() throws Exception {
		final Object A = new Object();
		final Object B = new Object();
		final Object C = new Object();
		final Object D = new Object();

		assertEquals(0, ArrayUtils.indexOf(new Object[] { A, B, C }, A));
		assertEquals(1, ArrayUtils.indexOf(new Object[] { A, B, C }, B));
		assertEquals(2, ArrayUtils.indexOf(new Object[] { A, B, C }, C));
		assertEquals(-1, ArrayUtils.indexOf(new Object[] { A, B, C }, D));

		assertEquals(-1, ArrayUtils.indexOf(new Object[] { A, B, C }, null));
		assertEquals(-1, ArrayUtils.indexOf(new Object[] { }, A));
		assertEquals(-1, ArrayUtils.indexOf(new Object[] { }, null));

		assertEquals(0, ArrayUtils.indexOf(new Object[] { null, null }, null));
		assertEquals(1, ArrayUtils.indexOf(new Object[] { A, null, B }, null));
		assertEquals(2, ArrayUtils.indexOf(new Object[] { A, null, B }, B));
		}

		public void testContainsAll() throws Exception {
		final Object A = new Object();
		final Object B = new Object();
		final Object C = new Object();

		assertTrue(ArrayUtils.containsAll(new Object[] { C, B, A }, new Object[] { A, B, C }));
		assertTrue(ArrayUtils.containsAll(new Object[] { A, B }, new Object[] { A }));
		assertTrue(ArrayUtils.containsAll(new Object[] { A }, new Object[] { A }));
		assertTrue(ArrayUtils.containsAll(new Object[] { A }, new Object[] { }));
		assertTrue(ArrayUtils.containsAll(new Object[] { }, new Object[] { }));
		assertTrue(ArrayUtils.containsAll(new Object[] { null }, new Object[] { }));
		assertTrue(ArrayUtils.containsAll(new Object[] { null }, new Object[] { null }));
		assertTrue(ArrayUtils.containsAll(new Object[] { A, null, C }, new Object[] { C, null }));

		assertFalse(ArrayUtils.containsAll(new Object[] { }, new Object[] { A }));
		assertFalse(ArrayUtils.containsAll(new Object[] { B }, new Object[] { A }));
		assertFalse(ArrayUtils.containsAll(new Object[] { }, new Object[] { null }));
		assertFalse(ArrayUtils.containsAll(new Object[] { A }, new Object[] { null }));
		}
		}