diff options
Diffstat (limited to 'tests/unit/src/com/android/tv/data')
8 files changed, 90 insertions, 28 deletions
diff --git a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java index 574dac8d..9f9ada1f 100644 --- a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java @@ -25,13 +25,13 @@ import android.database.Cursor; import android.media.tv.TvContract; import android.media.tv.TvContract.Channels; import android.net.Uri; +import android.support.test.filters.SmallTest; import android.test.AndroidTestCase; import android.test.MoreAsserts; import android.test.UiThreadTest; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; import android.test.mock.MockCursor; -import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; @@ -107,11 +107,7 @@ public class ChannelDataManagerTest extends AndroidTestCase { private void startAndWaitForComplete() throws Exception { mChannelDataManager.start(); - try { - assertTrue(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); - } catch (InterruptedException e) { - throw e; - } + assertTrue(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); } private void restart() throws Exception { diff --git a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java index 1dd18da0..4e6e9f3c 100644 --- a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java @@ -17,7 +17,7 @@ package com.android.tv.data; import static com.android.tv.data.ChannelNumber.parseChannelNumber; -import android.test.suitebuilder.annotation.SmallTest; +import android.support.test.filters.SmallTest; import com.android.tv.testing.ComparableTester; diff --git a/tests/unit/src/com/android/tv/data/ChannelTest.java b/tests/unit/src/com/android/tv/data/ChannelTest.java index c39942d9..95e3ee90 100644 --- a/tests/unit/src/com/android/tv/data/ChannelTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelTest.java @@ -21,8 +21,8 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; +import android.support.test.filters.SmallTest; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; import com.android.tv.testing.ComparatorTester; import com.android.tv.util.TvInputManagerHelper; @@ -188,8 +188,7 @@ public class ChannelTest extends AndroidTestCase { @Override public Boolean answer(InvocationOnMock invocation) throws Throwable { String inputId = (String) invocation.getArguments()[0]; - boolean isPartner = PARTNER_INPUT_ID.equals(inputId); - return isPartner; + return PARTNER_INPUT_ID.equals(inputId); } }); Comparator<Channel> comparator = new TestChannelComparator(manager); diff --git a/tests/unit/src/com/android/tv/data/GenreItemTest.java b/tests/unit/src/com/android/tv/data/GenreItemTest.java index 643768f8..fb48fd41 100644 --- a/tests/unit/src/com/android/tv/data/GenreItemTest.java +++ b/tests/unit/src/com/android/tv/data/GenreItemTest.java @@ -18,9 +18,8 @@ package com.android.tv.data; import android.media.tv.TvContract.Programs.Genres; import android.os.Build; -import android.support.test.filters.SdkSuppress; +import android.support.test.filters.SmallTest; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; /** * Tests for {@link Channel}. diff --git a/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java b/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java index 96ecefdf..430eef91 100644 --- a/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java +++ b/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java @@ -22,17 +22,17 @@ import android.database.Cursor; import android.media.tv.TvContract; import android.net.Uri; import android.os.HandlerThread; +import android.support.test.filters.SmallTest; import android.test.AndroidTestCase; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; import android.test.mock.MockCursor; -import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; import android.util.SparseArray; import com.android.tv.testing.Constants; -import com.android.tv.testing.ProgramInfo; import com.android.tv.testing.FakeClock; +import com.android.tv.testing.ProgramInfo; import com.android.tv.util.Utils; import java.util.ArrayList; @@ -78,7 +78,7 @@ public class ProgramDataManagerTest extends AndroidTestCase { mHandlerThread = new HandlerThread(TAG); mHandlerThread.start(); mProgramDataManager = new ProgramDataManager( - mContentResolver, mClock, mHandlerThread.getLooper()); + mContentResolver, mClock, mHandlerThread.getLooper(), null); mProgramDataManager.setPrefetchEnabled(true); mProgramDataManager.addListener(mListener); } diff --git a/tests/unit/src/com/android/tv/data/ProgramTest.java b/tests/unit/src/com/android/tv/data/ProgramTest.java index 25856e18..7e474cd6 100644 --- a/tests/unit/src/com/android/tv/data/ProgramTest.java +++ b/tests/unit/src/com/android/tv/data/ProgramTest.java @@ -18,11 +18,20 @@ package com.android.tv.data; import static android.media.tv.TvContract.Programs.Genres.COMEDY; import static android.media.tv.TvContract.Programs.Genres.FAMILY_KIDS; -import android.test.suitebuilder.annotation.SmallTest; +import com.android.tv.data.Program.CriticScore; +import com.android.tv.dvr.SeriesRecording; + +import android.media.tv.TvContentRating; +import android.media.tv.TvContract.Programs.Genres; +import android.os.Parcel; +import android.support.test.filters.SmallTest; +import android.util.Log; import junit.framework.TestCase; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; /** * Tests for {@link Program}. @@ -85,6 +94,71 @@ public class ProgramTest extends TestCase { assertHasGenre(program, GenreItems.ID_ALL_CHANNELS, true); } + public void testParcelable() throws Exception { + List<CriticScore> criticScores = new ArrayList<>(); + criticScores.add(new CriticScore("1", "2", "3")); + criticScores.add(new CriticScore("4", "5", "6")); + TvContentRating[] ratings = new TvContentRating[2]; + ratings[0] = TvContentRating.unflattenFromString("1/2/3"); + ratings[1] = TvContentRating.unflattenFromString("4/5/6"); + Program p = new Program.Builder() + .setId(1) + .setPackageName("2") + .setChannelId(3) + .setTitle("4") + .setSeriesId("5") + .setEpisodeTitle("6") + .setSeasonNumber("7") + .setSeasonTitle("8") + .setEpisodeNumber("9") + .setStartTimeUtcMillis(10) + .setEndTimeUtcMillis(11) + .setDescription("12") + .setLongDescription("12-long") + .setVideoWidth(13) + .setVideoHeight(14) + .setCriticScores(criticScores) + .setPosterArtUri("15") + .setThumbnailUri("16") + .setCanonicalGenres(Genres.encode(Genres.SPORTS, Genres.SHOPPING)) + .setContentRatings(ratings) + .setRecordingProhibited(true) + .build(); + Parcel p1 = Parcel.obtain(); + Parcel p2 = Parcel.obtain(); + try { + p.writeToParcel(p1, 0); + byte[] bytes = p1.marshall(); + p2.unmarshall(bytes, 0, bytes.length); + p2.setDataPosition(0); + Program r2 = Program.fromParcel(p2); + assertEquals(p, r2); + } finally { + p1.recycle(); + p2.recycle(); + } + } + + public void testParcelableWithCriticScore() { + Program program = new Program.Builder() + .setTitle("MyTitle") + .addCriticScore(new CriticScore( + "default source", + "5/10", + "https://testurl/testimage.jpg")) + .build(); + Parcel parcel = Parcel.obtain(); + program.writeToParcel(parcel, 0); + parcel.setDataPosition(0); + Program programFromParcel = Program.CREATOR.createFromParcel(parcel); + + assertNotNull(programFromParcel.getCriticScores()); + assertEquals(programFromParcel.getCriticScores().get(0).source, "default source"); + assertEquals(programFromParcel.getCriticScores().get(0).score, "5/10"); + assertEquals(programFromParcel.getCriticScores().get(0).logoUrl, + "https://testurl/testimage.jpg"); + } + private static void assertNullCanonicalGenres(Program program) { String[] actual = program.getCanonicalGenres(); assertNull("Expected null canonical genres but was " + Arrays.toString(actual), actual); diff --git a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java index 6b2bc8e5..f5504d48 100644 --- a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java +++ b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java @@ -16,12 +16,11 @@ package com.android.tv.data; -import android.annotation.SuppressLint; import android.content.pm.ResolveInfo; import android.media.tv.TvInputInfo; +import android.support.test.filters.SmallTest; +import android.support.test.filters.Suppress; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.Pair; import com.android.tv.testing.ComparatorTester; @@ -42,7 +41,6 @@ import java.util.LinkedHashMap; */ @SmallTest public class TvInputNewComparatorTest extends AndroidTestCase { - @Suppress // http://b/26903987 public void testComparator() throws Exception { final LinkedHashMap<String, Pair<Boolean, Boolean>> INPUT_ID_TO_NEW_INPUT = new LinkedHashMap<>(); diff --git a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java index eb99cb88..c86bb724 100644 --- a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java +++ b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java @@ -16,10 +16,10 @@ package com.android.tv.data; +import android.support.test.filters.SmallTest; +import android.support.test.filters.Suppress; import android.test.AndroidTestCase; import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; import com.android.tv.data.WatchedHistoryManager.WatchedRecord; import com.android.tv.testing.Utils; @@ -58,11 +58,7 @@ public class WatchedHistoryManagerTest extends AndroidTestCase { private void startAndWaitForComplete() throws Exception { mWatchedHistoryManager.start(); - try { - assertTrue(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); - } catch (InterruptedException e) { - throw e; - } + assertTrue(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); } @UiThreadTest @@ -135,7 +131,7 @@ public class WatchedHistoryManagerTest extends AndroidTestCase { } private class TestWatchedHistoryManagerListener implements WatchedHistoryManager.Listener { - public CountDownLatch loadFinishedLatch = new CountDownLatch(1); + public final CountDownLatch loadFinishedLatch = new CountDownLatch(1); @Override public void onLoadFinished() { |