Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

1 files changed, 0 insertions, 172 deletions

diff --git a/tests/unit/src/com/android/tv/common/TvContentRatingCacheTest.java b/tests/unit/src/com/android/tv/common/TvContentRatingCacheTest.java
deleted file mode 100644
index eadc50d5..00000000
--- a/tests/unit/src/com/android/tv/common/TvContentRatingCacheTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2015 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.tv.common;
-
-import android.content.ComponentCallbacks2;
-import android.media.tv.TvContentRating;
-import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import com.android.tv.testing.TvContentRatingConstants;
-import com.android.tv.util.Utils;
-
-/**
- * Test for {@link android.media.tv.TvContentRating} tests in {@link Utils}.
- */
-@SmallTest
-public class TvContentRatingCacheTest extends AndroidTestCase {
-
-    /**
-     * US_TV_MA and US_TV_Y7 in order
-     */
-    public static final String MA_AND_Y7 = TvContentRatingConstants.STRING_US_TV_MA + ","
-            + TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV;
-
-    /**
-     * US_TV_MA and US_TV_Y7 not in order
-     */
-    public static final String Y7_AND_MA = TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV + ","
-            + TvContentRatingConstants.STRING_US_TV_MA;
-    final TvContentRatingCache mCache = TvContentRatingCache.getInstance();
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mCache.performTrimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mCache.performTrimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-        super.tearDown();
-    }
-
-    public void testGetRatings_US_TV_MA() {
-        TvContentRating[] result = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        MoreAsserts.assertEquals(asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA), result);
-    }
-
-    public void testGetRatings_US_TV_MA_same() {
-        TvContentRating[] first = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        TvContentRating[] second = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        assertSame(first, second);
-    }
-
-    public void testGetRatings_US_TV_MA_diffAfterClear() {
-        TvContentRating[] first = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        mCache.performTrimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-        TvContentRating[] second = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        assertNotSame(first, second);
-    }
-
-    public void testGetRatings_TWO_orderDoesNotMatter() {
-        TvContentRating[] first = mCache.getRatings(MA_AND_Y7);
-        TvContentRating[] second = mCache.getRatings(Y7_AND_MA);
-        assertSame(first, second);
-    }
-
-    public void testContentRatingsToString_null() {
-        String result = TvContentRatingCache.contentRatingsToString(null);
-        assertEquals("ratings string", null, result);
-    }
-
-    public void testContentRatingsToString_none() {
-        String result = TvContentRatingCache.contentRatingsToString(asArray());
-        assertEquals("ratings string", null, result);
-    }
-
-    public void testContentRatingsToString_one() {
-        String result = TvContentRatingCache
-                .contentRatingsToString(asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA));
-        assertEquals("ratings string", TvContentRatingConstants.STRING_US_TV_MA, result);
-    }
-
-    public void testContentRatingsToString_twoInOrder() {
-        String result = TvContentRatingCache.contentRatingsToString(
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                        TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV));
-        assertEquals("ratings string", MA_AND_Y7, result);
-    }
-
-    public void testContentRatingsToString_twoNotInOrder() {
-        String result = TvContentRatingCache.contentRatingsToString(asArray(
-                TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV,
-                TvContentRatingConstants.CONTENT_RATING_US_TV_MA));
-        assertEquals("ratings string", MA_AND_Y7, result);
-    }
-
-    public void testContentRatingsToString_double() {
-        String result = TvContentRatingCache.contentRatingsToString(asArray(
-                TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                TvContentRatingConstants.CONTENT_RATING_US_TV_MA));
-        assertEquals("ratings string", TvContentRatingConstants.STRING_US_TV_MA, result);
-    }
-
-    public void testStringToContentRatings_null() {
-        assertNull(TvContentRatingCache.stringToContentRatings(null));
-    }
-
-    public void testStringToContentRatings_none() {
-        assertNull(TvContentRatingCache.stringToContentRatings(""));
-    }
-
-    public void testStringToContentRatings_bad() {
-        assertNull(TvContentRatingCache.stringToContentRatings("bad"));
-    }
-
-    public void testStringToContentRatings_oneGoodOneBad() {
-        TvContentRating[] results = TvContentRatingCache
-                .stringToContentRatings(TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV + ",bad");
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_one() {
-        TvContentRating[] results = TvContentRatingCache
-                .stringToContentRatings(TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV);
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_twoNotInOrder() {
-        TvContentRating[] results = TvContentRatingCache.stringToContentRatings(Y7_AND_MA);
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                        TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_twoInOrder() {
-        TvContentRating[] results = TvContentRatingCache.stringToContentRatings(MA_AND_Y7);
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                        TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_double() {
-        TvContentRating[] results = TvContentRatingCache.stringToContentRatings(
-                TvContentRatingConstants.STRING_US_TV_MA + ","
-                        + TvContentRatingConstants.STRING_US_TV_MA);
-        MoreAsserts
-                .assertEquals("ratings", asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA),
-                        results);
-    }
-
-    private static TvContentRating[] asArray(TvContentRating... ratings) {
-        return ratings;
-    }
-}