diff options
Diffstat (limited to 'tests/unit/src/com/android/tv/data')
8 files changed, 260 insertions, 224 deletions
diff --git a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java index 9b81f5d5..0adfd1be 100644 --- a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java @@ -18,8 +18,9 @@ package com.android.tv.data; import static android.support.test.InstrumentationRegistry.getInstrumentation; import static android.support.test.InstrumentationRegistry.getTargetContext; -import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth.assertWithMessage; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import android.content.ContentProvider; import android.content.ContentUris; @@ -31,7 +32,6 @@ import android.media.tv.TvContract; import android.media.tv.TvContract.Channels; import android.net.Uri; import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.test.MoreAsserts; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; @@ -39,8 +39,8 @@ import android.test.mock.MockCursor; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; -import com.android.tv.testing.constants.Constants; -import com.android.tv.testing.data.ChannelInfo; +import com.android.tv.testing.ChannelInfo; +import com.android.tv.testing.Constants; import com.android.tv.util.TvInputManagerHelper; import java.util.ArrayList; import java.util.Arrays; @@ -50,7 +50,6 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mockito; @@ -61,7 +60,6 @@ import org.mockito.Mockito; * the methods of {@link ChannelDataManager} should be called from the UI thread. */ @SmallTest -@RunWith(AndroidJUnit4.class) public class ChannelDataManagerTest { private static final boolean DEBUG = false; private static final String TAG = "ChannelDataManagerTest"; @@ -79,9 +77,7 @@ public class ChannelDataManagerTest { @Before public void setUp() { - assertWithMessage("More than 2 channels to test") - .that(Constants.UNIT_TEST_CHANNEL_COUNT > 2) - .isTrue(); + assertTrue("More than 2 channels to test", Constants.UNIT_TEST_CHANNEL_COUNT > 2); mContentProvider = new FakeContentProvider(getTargetContext()); mContentResolver = new FakeContentResolver(); @@ -125,8 +121,7 @@ public class ChannelDataManagerTest { mChannelDataManager.start(); } }); - assertThat(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertTrue(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); } private void restart() throws InterruptedException { @@ -145,7 +140,7 @@ public class ChannelDataManagerTest { @Test public void testIsDbLoadFinished() throws InterruptedException { startAndWaitForComplete(); - assertThat(mChannelDataManager.isDbLoadFinished()).isTrue(); + assertTrue(mChannelDataManager.isDbLoadFinished()); } /** @@ -157,8 +152,7 @@ public class ChannelDataManagerTest { startAndWaitForComplete(); // Test {@link ChannelDataManager#getChannelCount} - assertThat(mChannelDataManager.getChannelCount()) - .isEqualTo(Constants.UNIT_TEST_CHANNEL_COUNT); + assertEquals(Constants.UNIT_TEST_CHANNEL_COUNT, mChannelDataManager.getChannelCount()); // Test {@link ChannelDataManager#getChannelList} List<ChannelInfo> channelInfoList = new ArrayList<>(); @@ -169,18 +163,19 @@ public class ChannelDataManagerTest { for (Channel channel : channelList) { boolean found = false; for (ChannelInfo channelInfo : channelInfoList) { - if (TextUtils.equals(channelInfo.name, channel.getDisplayName())) { + if (TextUtils.equals(channelInfo.name, channel.getDisplayName()) + && TextUtils.equals(channelInfo.name, channel.getDisplayName())) { found = true; channelInfoList.remove(channelInfo); break; } } - assertWithMessage("Cannot find (" + channel + ")").that(found).isTrue(); + assertTrue("Cannot find (" + channel + ")", found); } // Test {@link ChannelDataManager#getChannelIndex()} for (Channel channel : channelList) { - assertThat(mChannelDataManager.getChannel(channel.getId())).isEqualTo(channel); + assertEquals(channel, mChannelDataManager.getChannel(channel.getId())); } } @@ -189,7 +184,7 @@ public class ChannelDataManagerTest { public void testGetChannels_noChannels() throws InterruptedException { mContentProvider.clear(); startAndWaitForComplete(); - assertThat(mChannelDataManager.getChannelCount()).isEqualTo(0); + assertEquals(0, mChannelDataManager.getChannelCount()); } /** @@ -205,9 +200,9 @@ public class ChannelDataManagerTest { List<Channel> browsableChannelList = mChannelDataManager.getBrowsableChannelList(); for (Channel browsableChannel : browsableChannelList) { boolean found = channelList.remove(browsableChannel); - assertWithMessage("Cannot find (" + browsableChannel + ")").that(found).isTrue(); + assertTrue("Cannot find (" + browsableChannel + ")", found); } - assertThat(channelList).isEmpty(); + assertEquals(0, channelList.size()); // Prepare for next tests. channelList = mChannelDataManager.getChannelList(); @@ -218,8 +213,8 @@ public class ChannelDataManagerTest { // Test {@link ChannelDataManager#updateBrowsable} & notification. mChannelDataManager.updateBrowsable(channel1.getId(), false, false); - assertThat(mListener.channelBrowsableChangedCalled).isTrue(); - assertThat(mChannelDataManager.getBrowsableChannelList()).doesNotContain(channel1); + assertTrue(mListener.channelBrowsableChangedCalled); + assertFalse(mChannelDataManager.getBrowsableChannelList().contains(channel1)); MoreAsserts.assertContentsInAnyOrder(channelListener.updatedChannels, channel1); channelListener.reset(); @@ -229,8 +224,8 @@ public class ChannelDataManagerTest { mChannelDataManager.applyUpdatedValuesToDb(); restart(); browsableChannelList = mChannelDataManager.getBrowsableChannelList(); - assertThat(browsableChannelList).hasSize(Constants.UNIT_TEST_CHANNEL_COUNT - 1); - assertThat(browsableChannelList).doesNotContain(channel1); + assertEquals(Constants.UNIT_TEST_CHANNEL_COUNT - 1, browsableChannelList.size()); + assertFalse(browsableChannelList.contains(channel1)); } /** @@ -254,10 +249,10 @@ public class ChannelDataManagerTest { mChannelDataManager.updateBrowsable(channel1.getId(), false, true); mChannelDataManager.updateBrowsable(channel2.getId(), false, true); mChannelDataManager.updateBrowsable(channel1.getId(), true, true); - assertThat(mListener.channelBrowsableChangedCalled).isFalse(); + assertFalse(mListener.channelBrowsableChangedCalled); List<Channel> browsableChannelList = mChannelDataManager.getBrowsableChannelList(); - assertThat(browsableChannelList).contains(channel1); - assertThat(browsableChannelList).doesNotContain(channel2); + assertTrue(browsableChannelList.contains(channel1)); + assertFalse(browsableChannelList.contains(channel2)); // Test {@link ChannelDataManager#applyUpdatedValuesToDb} // Disable the update notification to avoid the unwanted call of "onLoadFinished". @@ -265,8 +260,8 @@ public class ChannelDataManagerTest { mChannelDataManager.applyUpdatedValuesToDb(); restart(); browsableChannelList = mChannelDataManager.getBrowsableChannelList(); - assertThat(browsableChannelList).hasSize(Constants.UNIT_TEST_CHANNEL_COUNT - 1); - assertThat(browsableChannelList).doesNotContain(channel2); + assertEquals(Constants.UNIT_TEST_CHANNEL_COUNT - 1, browsableChannelList.size()); + assertFalse(browsableChannelList.contains(channel2)); } /** @@ -280,7 +275,7 @@ public class ChannelDataManagerTest { // Test if all channels aren't locked at the first time. List<Channel> channelList = mChannelDataManager.getChannelList(); for (Channel channel : channelList) { - assertWithMessage(channel + " is locked").that(channel.isLocked()).isFalse(); + assertFalse(channel + " is locked", channel.isLocked()); } // Prepare for next tests. @@ -288,14 +283,14 @@ public class ChannelDataManagerTest { // Test {@link ChannelDataManager#updateLocked} mChannelDataManager.updateLocked(channel.getId(), true); - assertThat(mChannelDataManager.getChannel(channel.getId()).isLocked()).isTrue(); + assertTrue(mChannelDataManager.getChannel(channel.getId()).isLocked()); // Test {@link ChannelDataManager#applyUpdatedValuesToDb}. // Disable the update notification to avoid the unwanted call of "onLoadFinished". mContentResolver.mNotifyDisabled = true; mChannelDataManager.applyUpdatedValuesToDb(); restart(); - assertThat(mChannelDataManager.getChannel(channel.getId()).isLocked()).isTrue(); + assertTrue(mChannelDataManager.getChannel(channel.getId()).isLocked()); // Cleanup mChannelDataManager.updateLocked(channel.getId(), false); @@ -312,10 +307,9 @@ public class ChannelDataManagerTest { ChannelInfo testChannelInfo = ChannelInfo.create(getTargetContext(), (int) testChannelId); testChannelId = Constants.UNIT_TEST_CHANNEL_COUNT + 1; mContentProvider.simulateInsert(testChannelInfo); - assertThat(mListener.channelListUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); - assertThat(mChannelDataManager.getChannelCount()) - .isEqualTo(Constants.UNIT_TEST_CHANNEL_COUNT + 1); + assertTrue( + mListener.channelListUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); + assertEquals(Constants.UNIT_TEST_CHANNEL_COUNT + 1, mChannelDataManager.getChannelCount()); // Test channel update mListener.reset(); @@ -324,41 +318,35 @@ public class ChannelDataManagerTest { mChannelDataManager.addChannelListener(testChannelId, channelListener); String newName = testChannelInfo.name + "_test"; mContentProvider.simulateUpdate(testChannelId, newName); - assertThat(mListener.channelListUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); - assertThat( - channelListener.channelChangedLatch.await( - WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); - assertThat(channelListener.removedChannels).isEmpty(); - assertThat(channelListener.updatedChannels).hasSize(1); + assertTrue( + mListener.channelListUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); + assertTrue( + channelListener.channelChangedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); + assertEquals(0, channelListener.removedChannels.size()); + assertEquals(1, channelListener.updatedChannels.size()); Channel updatedChannel = channelListener.updatedChannels.get(0); - assertThat(updatedChannel.getId()).isEqualTo(testChannelId); - assertThat(updatedChannel.getDisplayNumber()).isEqualTo(testChannelInfo.number); - assertThat(updatedChannel.getDisplayName()).isEqualTo(newName); - assertThat(mChannelDataManager.getChannelCount()) - .isEqualTo(Constants.UNIT_TEST_CHANNEL_COUNT + 1); + assertEquals(testChannelId, updatedChannel.getId()); + assertEquals(testChannelInfo.number, updatedChannel.getDisplayNumber()); + assertEquals(newName, updatedChannel.getDisplayName()); + assertEquals(Constants.UNIT_TEST_CHANNEL_COUNT + 1, mChannelDataManager.getChannelCount()); // Test channel remove. mListener.reset(); channelListener.reset(); mContentProvider.simulateDelete(testChannelId); - assertThat(mListener.channelListUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); - assertThat( - channelListener.channelChangedLatch.await( - WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); - assertThat(channelListener.removedChannels).hasSize(1); - assertThat(channelListener.updatedChannels).isEmpty(); + assertTrue( + mListener.channelListUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); + assertTrue( + channelListener.channelChangedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); + assertEquals(1, channelListener.removedChannels.size()); + assertEquals(0, channelListener.updatedChannels.size()); Channel removedChannel = channelListener.removedChannels.get(0); - assertThat(removedChannel.getDisplayName()).isEqualTo(newName); - assertThat(removedChannel.getDisplayNumber()).isEqualTo(testChannelInfo.number); - assertThat(mChannelDataManager.getChannelCount()) - .isEqualTo(Constants.UNIT_TEST_CHANNEL_COUNT); + assertEquals(newName, removedChannel.getDisplayName()); + assertEquals(testChannelInfo.number, removedChannel.getDisplayNumber()); + assertEquals(Constants.UNIT_TEST_CHANNEL_COUNT, mChannelDataManager.getChannelCount()); } - private static class ChannelInfoWrapper { + private class ChannelInfoWrapper { public ChannelInfo channelInfo; public boolean browsable; public boolean locked; @@ -525,9 +513,9 @@ public class ChannelDataManagerTest { } private void assertChannelUri(Uri uri) { - assertWithMessage("Uri(" + uri + ") isn't channel uri") - .that(uri.toString().startsWith(Channels.CONTENT_URI.toString())) - .isTrue(); + assertTrue( + "Uri(" + uri + ") isn't channel uri", + uri.toString().startsWith(Channels.CONTENT_URI.toString())); } public void clear() { @@ -548,7 +536,7 @@ public class ChannelDataManagerTest { } private class FakeCursor extends MockCursor { - private final String[] allColumns = { + private final String[] ALL_COLUMNS = { Channels._ID, Channels.COLUMN_DISPLAY_NAME, Channels.COLUMN_DISPLAY_NUMBER, @@ -562,7 +550,7 @@ public class ChannelDataManagerTest { private int mPosition; public FakeCursor(String[] columns) { - mColumns = (columns == null) ? allColumns : columns; + mColumns = (columns == null) ? ALL_COLUMNS : columns; mPosition = -1; } @@ -587,7 +575,6 @@ public class ChannelDataManagerTest { switch (columnName) { case Channels._ID: return mContentProvider.keyAt(mPosition); - default: // fall out } if (DEBUG) { Log.d(TAG, "Column (" + columnName + ") is ignored in getLong()"); @@ -608,7 +595,6 @@ public class ChannelDataManagerTest { return DUMMY_INPUT_ID; case Channels.COLUMN_VIDEO_FORMAT: return channel.channelInfo.getVideoFormat(); - default: // fall out } if (DEBUG) { Log.d(TAG, "Column (" + columnName + ") is ignored in getString()"); @@ -627,7 +613,6 @@ public class ChannelDataManagerTest { return channel.browsable ? 1 : 0; case COLUMN_LOCKED: return channel.locked ? 1 : 0; - default: // fall out } if (DEBUG) { Log.d(TAG, "Column (" + columnName + ") is ignored in getInt()"); @@ -651,7 +636,7 @@ public class ChannelDataManagerTest { } } - private static class TestChannelDataManagerListener implements ChannelDataManager.Listener { + private class TestChannelDataManagerListener implements ChannelDataManager.Listener { public CountDownLatch loadFinishedLatch = new CountDownLatch(1); public CountDownLatch channelListUpdatedLatch = new CountDownLatch(1); public boolean channelBrowsableChangedCalled; @@ -678,7 +663,7 @@ public class ChannelDataManagerTest { } } - private static class TestChannelDataManagerChannelListener + private class TestChannelDataManagerChannelListener implements ChannelDataManager.ChannelListener { public CountDownLatch channelChangedLatch = new CountDownLatch(1); public final List<Channel> removedChannels = new ArrayList<>(); diff --git a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java new file mode 100644 index 00000000..86d27efa --- /dev/null +++ b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java @@ -0,0 +1,89 @@ +/* + * 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.data; + +import static com.android.tv.data.ChannelNumber.parseChannelNumber; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import android.support.test.filters.SmallTest; +import com.android.tv.testing.ComparableTester; +import org.junit.Test; + +/** Tests for {@link ChannelNumber}. */ +@SmallTest +public class ChannelNumberTest { + /** Test method for {@link ChannelNumber#ChannelNumber()}. */ + @Test + public void testChannelNumber() { + assertChannelEquals(new ChannelNumber(), "", false, ""); + } + + /** + * Test method for {@link + * com.android.tv.data.ChannelNumber#parseChannelNumber(java.lang.String)}. + */ + @Test + public void testParseChannelNumber() { + assertNull(parseChannelNumber("")); + assertNull(parseChannelNumber("-")); + assertNull(parseChannelNumber("abcd12")); + assertNull(parseChannelNumber("12abcd")); + assertNull(parseChannelNumber("-12")); + assertChannelEquals(parseChannelNumber("1"), "1", false, ""); + assertChannelEquals(parseChannelNumber("1234-4321"), "1234", true, "4321"); + assertChannelEquals(parseChannelNumber("3-4"), "3", true, "4"); + assertChannelEquals(parseChannelNumber("5-6"), "5", true, "6"); + } + + /** Test method for {@link ChannelNumber#compareTo(com.android.tv.data.ChannelNumber)}. */ + @Test + public void testCompareTo() { + new ComparableTester<ChannelNumber>() + .addEquivalentGroup(parseChannelNumber("1"), parseChannelNumber("1")) + .addEquivalentGroup(parseChannelNumber("2")) + .addEquivalentGroup(parseChannelNumber("2-1")) + .addEquivalentGroup(parseChannelNumber("2-2")) + .addEquivalentGroup(parseChannelNumber("2-10")) + .addEquivalentGroup(parseChannelNumber("3")) + .addEquivalentGroup(parseChannelNumber("4"), parseChannelNumber("4-0")) + .addEquivalentGroup(parseChannelNumber("10")) + .addEquivalentGroup(parseChannelNumber("100")) + .test(); + } + + /** Test method for {@link ChannelNumber#compare(java.lang.String, java.lang.String)}. */ + @Test + public void testCompare() { + // Only need to test nulls, the reset is tested by testCompareTo + assertEquals("compareTo(null,null)", 0, ChannelNumber.compare(null, null)); + assertEquals("compareTo(1,1)", 0, ChannelNumber.compare("1", "1")); + assertEquals("compareTo(null,1)<0", true, ChannelNumber.compare(null, "1") < 0); + assertEquals("compareTo(mal-formatted,1)<0", true, ChannelNumber.compare("abcd", "1") < 0); + assertEquals("compareTo(mal-formatted,1)<0", true, ChannelNumber.compare(".4", "1") < 0); + assertEquals("compareTo(1,null)>0", true, ChannelNumber.compare("1", null) > 0); + } + + private void assertChannelEquals( + ChannelNumber actual, + String expectedMajor, + boolean expectedHasDelimiter, + String expectedMinor) { + assertEquals(actual + " major", actual.majorNumber, expectedMajor); + assertEquals(actual + " hasDelimiter", actual.hasDelimiter, expectedHasDelimiter); + assertEquals(actual + " minor", actual.minorNumber, expectedMinor); + } +} diff --git a/tests/unit/src/com/android/tv/data/ChannelTest.java b/tests/unit/src/com/android/tv/data/ChannelTest.java index 1f30a819..a7bac9fb 100644 --- a/tests/unit/src/com/android/tv/data/ChannelTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelTest.java @@ -16,8 +16,7 @@ package com.android.tv.data; -import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth.assertWithMessage; +import static org.junit.Assert.assertEquals; import android.content.ComponentName; import android.content.Context; @@ -26,13 +25,11 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import com.android.tv.testing.ComparatorTester; import com.android.tv.util.TvInputManagerHelper; import java.util.Comparator; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -40,20 +37,17 @@ import org.mockito.stubbing.Answer; /** Tests for {@link Channel}. */ @SmallTest -@RunWith(AndroidJUnit4.class) public class ChannelTest { // Used for testing TV inputs with invalid input package. This could happen when a TV input is // uninstalled while drawing an app link card. - private static final String INVALID_TV_INPUT_PACKAGE_NAME = - "com.android.tv.invalid_tv_input"; + private static final String INVALID_TV_INPUT_PACKAGE_NAME = "com.android.tv.invalid_tv_input"; // Used for testing TV inputs defined inside of Live TV. private static final String LIVE_CHANNELS_PACKAGE_NAME = "com.android.tv"; // Used for testing a TV input which doesn't have its leanback launcher activity. private static final String NONE_LEANBACK_TV_INPUT_PACKAGE_NAME = "com.android.tv.none_leanback_tv_input"; // Used for testing a TV input which has its leanback launcher activity. - private static final String LEANBACK_TV_INPUT_PACKAGE_NAME = - "com.android.tv.leanback_tv_input"; + private static final String LEANBACK_TV_INPUT_PACKAGE_NAME = "com.android.tv.leanback_tv_input"; private static final String TEST_APP_LINK_TEXT = "test_app_link_text"; private static final String PARTNER_INPUT_ID = "partner"; private static final ActivityInfo TEST_ACTIVITY_INFO = new ActivityInfo(); @@ -133,7 +127,6 @@ public class ChannelTest { assertAppLinkType(Channel.APP_LINK_TYPE_APP, LEANBACK_TV_INPUT_PACKAGE_NAME, null, null); } - @Test public void testGetAppLinkType_NoText_InvalidIntent() { assertAppLinkType( Channel.APP_LINK_TYPE_NONE, INVALID_TV_INPUT_PACKAGE_NAME, null, mInvalidIntent); @@ -148,7 +141,6 @@ public class ChannelTest { Channel.APP_LINK_TYPE_APP, LEANBACK_TV_INPUT_PACKAGE_NAME, null, mInvalidIntent); } - @Test public void testGetAppLinkType_NoText_ValidIntent() { assertAppLinkType( Channel.APP_LINK_TYPE_NONE, INVALID_TV_INPUT_PACKAGE_NAME, null, mValidIntent); @@ -163,7 +155,6 @@ public class ChannelTest { Channel.APP_LINK_TYPE_APP, LEANBACK_TV_INPUT_PACKAGE_NAME, null, mValidIntent); } - @Test public void testGetAppLinkType_HasText_NoIntent() { assertAppLinkType( Channel.APP_LINK_TYPE_NONE, @@ -184,7 +175,6 @@ public class ChannelTest { null); } - @Test public void testGetAppLinkType_HasText_InvalidIntent() { assertAppLinkType( Channel.APP_LINK_TYPE_NONE, @@ -208,7 +198,6 @@ public class ChannelTest { mInvalidIntent); } - @Test public void testGetAppLinkType_HasText_ValidIntent() { assertAppLinkType( Channel.APP_LINK_TYPE_CHANNEL, @@ -245,13 +234,14 @@ public class ChannelTest { ? null : appLinkIntent.toUri(Intent.URI_INTENT_SCHEME)) .build(); - assertWithMessage("Unexpected app-link type for for " + testChannel) - .that(testChannel.getAppLinkType(mMockContext)) - .isEqualTo(expectedType); + assertEquals( + "Unexpected app-link type for for " + testChannel, + expectedType, + testChannel.getAppLinkType(mMockContext)); } - @Test public void testComparator() { + TvInputManagerHelper manager = Mockito.mock(TvInputManagerHelper.class); Mockito.when(manager.isPartnerInput(Matchers.anyString())) .thenAnswer( @@ -303,7 +293,6 @@ public class ChannelTest { * <p>Sort partner inputs first, then sort by input label, then by input id. See <a * href="http://b/23031603">b/23031603</a>. */ - @Test public void testComparatorLabel() { TvInputManagerHelper manager = Mockito.mock(TvInputManagerHelper.class); Mockito.when(manager.isPartnerInput(Matchers.anyString())) @@ -332,7 +321,6 @@ public class ChannelTest { comparatorTester.test(); } - @Test public void testNormalizeChannelNumber() { assertNormalizedDisplayNumber(null, null); assertNormalizedDisplayNumber("", ""); @@ -353,10 +341,10 @@ public class ChannelTest { } private void assertNormalizedDisplayNumber(String displayNumber, String normalized) { - assertThat(Channel.normalizeDisplayNumber(displayNumber)).isEqualTo(normalized); + assertEquals(normalized, Channel.normalizeDisplayNumber(displayNumber)); } - private static final class TestChannelComparator extends Channel.DefaultComparator { + private class TestChannelComparator extends Channel.DefaultComparator { public TestChannelComparator(TvInputManagerHelper manager) { super(null, manager); } @@ -367,8 +355,7 @@ public class ChannelTest { } } - private static final class ChannelComparatorWithDescriptionAsLabel - extends Channel.DefaultComparator { + private static class ChannelComparatorWithDescriptionAsLabel extends Channel.DefaultComparator { public ChannelComparatorWithDescriptionAsLabel(TvInputManagerHelper manager) { super(null, manager); } diff --git a/tests/unit/src/com/android/tv/data/GenreItemTest.java b/tests/unit/src/com/android/tv/data/GenreItemTest.java index 02bf4b30..dbf99eac 100644 --- a/tests/unit/src/com/android/tv/data/GenreItemTest.java +++ b/tests/unit/src/com/android/tv/data/GenreItemTest.java @@ -17,18 +17,18 @@ package com.android.tv.data; import static android.support.test.InstrumentationRegistry.getTargetContext; -import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import android.media.tv.TvContract.Programs.Genres; import android.os.Build; import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import org.junit.Test; -import org.junit.runner.RunWith; /** Tests for {@link Channel}. */ @SmallTest -@RunWith(AndroidJUnit4.class) public class GenreItemTest { private static final String INVALID_GENRE = "INVALID GENRE"; @@ -41,17 +41,17 @@ public class GenreItemTest { @Test public void testGetCanonicalGenre() { int count = GenreItems.getGenreCount(); - assertThat(GenreItems.getCanonicalGenre(GenreItems.ID_ALL_CHANNELS)).isNull(); + assertNull(GenreItems.getCanonicalGenre(GenreItems.ID_ALL_CHANNELS)); for (int i = 1; i < count; ++i) { - assertThat(GenreItems.getCanonicalGenre(i)).isNotNull(); + assertNotNull(GenreItems.getCanonicalGenre(i)); } } @Test public void testGetId_base() { int count = GenreItems.getGenreCount(); - assertThat(GenreItems.getId(null)).isEqualTo(GenreItems.ID_ALL_CHANNELS); - assertThat(GenreItems.getId(INVALID_GENRE)).isEqualTo(GenreItems.ID_ALL_CHANNELS); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(null)); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(INVALID_GENRE)); assertInRange(GenreItems.getId(Genres.FAMILY_KIDS), 1, count - 1); assertInRange(GenreItems.getId(Genres.SPORTS), 1, count - 1); assertInRange(GenreItems.getId(Genres.SHOPPING), 1, count - 1); @@ -68,13 +68,12 @@ public class GenreItemTest { @Test public void testGetId_lmp_mr1() { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { - assertThat(GenreItems.getId(Genres.ARTS)).isEqualTo(GenreItems.ID_ALL_CHANNELS); - assertThat(GenreItems.getId(Genres.ENTERTAINMENT)) - .isEqualTo(GenreItems.ID_ALL_CHANNELS); - assertThat(GenreItems.getId(Genres.LIFE_STYLE)).isEqualTo(GenreItems.ID_ALL_CHANNELS); - assertThat(GenreItems.getId(Genres.MUSIC)).isEqualTo(GenreItems.ID_ALL_CHANNELS); - assertThat(GenreItems.getId(Genres.PREMIER)).isEqualTo(GenreItems.ID_ALL_CHANNELS); - assertThat(GenreItems.getId(Genres.TECH_SCIENCE)).isEqualTo(GenreItems.ID_ALL_CHANNELS); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(Genres.ARTS)); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(Genres.ENTERTAINMENT)); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(Genres.LIFE_STYLE)); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(Genres.MUSIC)); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(Genres.PREMIER)); + assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(Genres.TECH_SCIENCE)); } else { int count = GenreItems.getGenreCount(); assertInRange(GenreItems.getId(Genres.ARTS), 1, count - 1); @@ -87,6 +86,6 @@ public class GenreItemTest { } private void assertInRange(int value, int lower, int upper) { - assertThat(value >= lower && value <= upper).isTrue(); + assertTrue(value >= lower && value <= upper); } } diff --git a/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java b/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java index c1d670fe..2b75ee4b 100644 --- a/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java +++ b/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java @@ -17,8 +17,10 @@ package com.android.tv.data; import static android.support.test.InstrumentationRegistry.getTargetContext; -import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth.assertWithMessage; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import android.content.Context; import android.database.ContentObserver; @@ -28,15 +30,14 @@ import android.net.Uri; import android.os.HandlerThread; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; import android.test.mock.MockCursor; import android.util.Log; import android.util.SparseArray; +import com.android.tv.testing.Constants; import com.android.tv.testing.FakeClock; -import com.android.tv.testing.constants.Constants; -import com.android.tv.testing.data.ProgramInfo; +import com.android.tv.testing.ProgramInfo; import com.android.tv.util.Utils; import java.util.ArrayList; import java.util.Arrays; @@ -45,14 +46,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; /** Test for {@link com.android.tv.data.ProgramDataManager} */ @SmallTest -@RunWith(AndroidJUnit4.class) -@Ignore("b/69836704") public class ProgramDataManagerTest { private static final boolean DEBUG = false; private static final String TAG = "ProgramDataManagerTest"; @@ -97,8 +94,7 @@ public class ProgramDataManagerTest { private void startAndWaitForComplete() throws InterruptedException { mProgramDataManager.start(); - assertThat(mListener.programUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertTrue(mListener.programUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); } /** Test for {@link ProgramInfo#getIndex} and {@link ProgramInfo#getStartTimeMs}. */ @@ -109,8 +105,8 @@ public class ProgramDataManagerTest { int index = stub.getIndex(mClock.currentTimeMillis(), channelId); long startTimeMs = stub.getStartTimeMs(index, channelId); ProgramInfo programAt = stub.build(InstrumentationRegistry.getContext(), index); - assertThat(startTimeMs).isAtMost(mClock.currentTimeMillis()); - assertThat(mClock.currentTimeMillis()).isLessThan(startTimeMs + programAt.durationMs); + assertTrue(startTimeMs <= mClock.currentTimeMillis()); + assertTrue(mClock.currentTimeMillis() < startTimeMs + programAt.durationMs); } } @@ -134,11 +130,9 @@ public class ProgramDataManagerTest { for (long channelId = 1; channelId <= Constants.UNIT_TEST_CHANNEL_COUNT; channelId++) { Program currentProgram = mProgramDataManager.getCurrentProgram(channelId); // Test {@link ProgramDataManager#getCurrentProgram(long)}. - assertThat( - currentProgram.getStartTimeUtcMillis() <= mClock.currentTimeMillis() - && mClock.currentTimeMillis() - <= currentProgram.getEndTimeUtcMillis()) - .isTrue(); + assertTrue( + currentProgram.getStartTimeUtcMillis() <= mClock.currentTimeMillis() + && mClock.currentTimeMillis() <= currentProgram.getEndTimeUtcMillis()); // Test {@link ProgramDataManager#getPrograms(long)}. // Case #1: Normal case @@ -155,14 +149,14 @@ public class ProgramDataManagerTest { // Case #2: Corner cases where there's a program that starts at the start of the range. long startTimeMs = programs.get(0).getStartTimeUtcMillis(); programs = mProgramDataManager.getPrograms(channelId, startTimeMs); - assertThat(programs.get(0).getStartTimeUtcMillis()).isEqualTo(startTimeMs); + assertEquals(startTimeMs, programs.get(0).getStartTimeUtcMillis()); // Test {@link ProgramDataManager#setPrefetchTimeRange(long)}. programs = mProgramDataManager.getPrograms( channelId, prefetchTimeRangeStartMs - TimeUnit.HOURS.toMillis(1)); for (Program program : programs) { - assertThat(program.getEndTimeUtcMillis()).isAtLeast(prefetchTimeRangeStartMs); + assertTrue(program.getEndTimeUtcMillis() >= prefetchTimeRangeStartMs); } } } @@ -192,14 +186,12 @@ public class ProgramDataManagerTest { TestProgramDataManagerOnCurrentProgramUpdatedListener listener = new TestProgramDataManagerOnCurrentProgramUpdatedListener(); mProgramDataManager.addOnCurrentProgramUpdatedListener(testChannelId, listener); - assertThat( - listener.currentProgramUpdatedLatch.await( - WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); - assertThat(listener.updatedChannelId).isEqualTo(testChannelId); + assertTrue( + listener.currentProgramUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); + assertEquals(testChannelId, listener.updatedChannelId); Program currentProgram = mProgramDataManager.getCurrentProgram(testChannelId); assertProgramEquals(nextProgramStartTimeMs, nextProgramInfo, currentProgram); - assertThat(currentProgram).isEqualTo(listener.updatedProgram); + assertEquals(listener.updatedProgram, currentProgram); } /** Test if program data is refreshed after the program insertion. */ @@ -212,15 +204,14 @@ public class ProgramDataManagerTest { mListener.reset(); List<Program> programList = mProgramDataManager.getPrograms(testChannelId, mClock.currentTimeMillis()); - assertThat(programList).isNotNull(); + assertNotNull(programList); long lastProgramEndTime = programList.get(programList.size() - 1).getEndTimeUtcMillis(); // Make change in content provider mContentProvider.simulateAppend(testChannelId); - assertThat(mListener.programUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertTrue(mListener.programUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS)); programList = mProgramDataManager.getPrograms(testChannelId, mClock.currentTimeMillis()); - assertThat(lastProgramEndTime) - .isLessThan(programList.get(programList.size() - 1).getEndTimeUtcMillis()); + assertTrue( + lastProgramEndTime < programList.get(programList.size() - 1).getEndTimeUtcMillis()); } /** Test for {@link ProgramDataManager#setPauseProgramUpdate(boolean)}. */ @@ -233,28 +224,23 @@ public class ProgramDataManagerTest { mListener.reset(); mProgramDataManager.setPauseProgramUpdate(true); mContentProvider.simulateAppend(testChannelId); - assertThat(mListener.programUpdatedLatch.await(FAILURE_TIME_OUT_MS, TimeUnit.MILLISECONDS)) - .isFalse(); + assertFalse( + mListener.programUpdatedLatch.await(FAILURE_TIME_OUT_MS, TimeUnit.MILLISECONDS)); } public static void assertProgramEquals( long expectedStartTime, ProgramInfo expectedInfo, Program actualProgram) { - assertWithMessage("title").that(actualProgram.getTitle()).isEqualTo(expectedInfo.title); - assertWithMessage("episode") - .that(actualProgram.getEpisodeTitle()) - .isEqualTo(expectedInfo.episode); - assertWithMessage("description") - .that(actualProgram.getDescription()) - .isEqualTo(expectedInfo.description); - assertWithMessage("startTime") - .that(actualProgram.getStartTimeUtcMillis()) - .isEqualTo(expectedStartTime); - assertWithMessage("endTime") - .that(actualProgram.getEndTimeUtcMillis()) - .isEqualTo(expectedStartTime + expectedInfo.durationMs); + assertEquals("title", expectedInfo.title, actualProgram.getTitle()); + assertEquals("episode", expectedInfo.episode, actualProgram.getEpisodeTitle()); + assertEquals("description", expectedInfo.description, actualProgram.getDescription()); + assertEquals("startTime", expectedStartTime, actualProgram.getStartTimeUtcMillis()); + assertEquals( + "endTime", + expectedStartTime + expectedInfo.durationMs, + actualProgram.getEndTimeUtcMillis()); } - private final class FakeContentResolver extends MockContentResolver { + private class FakeContentResolver extends MockContentResolver { @Override public void notifyChange(Uri uri, ContentObserver observer, boolean syncToNetwork) { super.notifyChange(uri, observer, syncToNetwork); @@ -269,7 +255,7 @@ public class ProgramDataManagerTest { } } - private static final class ProgramInfoWrapper { + private static class ProgramInfoWrapper { private final int index; private final long startTimeMs; private final ProgramInfo programInfo; @@ -283,7 +269,7 @@ public class ProgramDataManagerTest { // This implements the minimal methods in content resolver // and detailed assumptions are written in each method. - private final class FakeContentProvider extends MockContentProvider { + private class FakeContentProvider extends MockContentProvider { private final SparseArray<List<ProgramInfoWrapper>> mProgramInfoList = new SparseArray<>(); /** @@ -374,9 +360,9 @@ public class ProgramDataManagerTest { } private void assertProgramUri(Uri uri) { - assertWithMessage("Uri(" + uri + ") isn't channel uri") - .that(uri.toString().startsWith(TvContract.Programs.CONTENT_URI.toString())) - .isTrue(); + assertTrue( + "Uri(" + uri + ") isn't channel uri", + uri.toString().startsWith(TvContract.Programs.CONTENT_URI.toString())); } public ProgramInfoWrapper get(long channelId, int position) { @@ -388,8 +374,8 @@ public class ProgramDataManagerTest { } } - private final class FakeCursor extends MockCursor { - private final String[] allColumns = { + private class FakeCursor extends MockCursor { + private final String[] ALL_COLUMNS = { TvContract.Programs.COLUMN_CHANNEL_ID, TvContract.Programs.COLUMN_TITLE, TvContract.Programs.COLUMN_SHORT_DESCRIPTION, @@ -417,7 +403,7 @@ public class ProgramDataManagerTest { * @param endTimeMs end of the time range to query programs. */ public FakeCursor(String[] columns, long channelId, long startTimeMs, long endTimeMs) { - mColumns = (columns == null) ? allColumns : columns; + mColumns = (columns == null) ? ALL_COLUMNS : columns; mIsQueryForSingleChannel = (channelId > 0); mChannelId = channelId; mProgramPosition = -1; @@ -480,12 +466,11 @@ public class ProgramDataManagerTest { return mCurrentProgram.startTimeMs; case TvContract.Programs.COLUMN_END_TIME_UTC_MILLIS: return mCurrentProgram.startTimeMs + mCurrentProgram.programInfo.durationMs; - default: - if (DEBUG) { - Log.d(TAG, "Column (" + columnName + ") is ignored in getLong()"); - } - return 0; } + if (DEBUG) { + Log.d(TAG, "Column (" + columnName + ") is ignored in getLong()"); + } + return 0; } @Override @@ -498,12 +483,11 @@ public class ProgramDataManagerTest { return mCurrentProgram.programInfo.description; case TvContract.Programs.COLUMN_EPISODE_TITLE: return mCurrentProgram.programInfo.episode; - default: - if (DEBUG) { - Log.d(TAG, "Column (" + columnName + ") is ignored in getString()"); - } - return null; } + if (DEBUG) { + Log.d(TAG, "Column (" + columnName + ") is ignored in getString()"); + } + return null; } @Override diff --git a/tests/unit/src/com/android/tv/data/ProgramTest.java b/tests/unit/src/com/android/tv/data/ProgramTest.java index 3f2a9f26..a69688d2 100644 --- a/tests/unit/src/com/android/tv/data/ProgramTest.java +++ b/tests/unit/src/com/android/tv/data/ProgramTest.java @@ -17,24 +17,22 @@ 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 static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth.assertWithMessage; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import android.media.tv.TvContentRating; import android.media.tv.TvContract.Programs.Genres; import android.os.Parcel; import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import com.android.tv.data.Program.CriticScore; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.junit.Test; -import org.junit.runner.RunWith; /** Tests for {@link Program}. */ @SmallTest -@RunWith(AndroidJUnit4.class) public class ProgramTest { private static final int NOT_FOUND_GENRE = 987; @@ -45,7 +43,7 @@ public class ProgramTest { @Test public void testBuild() { Program program = new Program.Builder().build(); - assertWithMessage("isValid").that(program.isValid()).isFalse(); + assertEquals("isValid", false, program.isValid()); } @Test @@ -129,7 +127,7 @@ public class ProgramTest { p2.unmarshall(bytes, 0, bytes.length); p2.setDataPosition(0); Program r2 = Program.fromParcel(p2); - assertThat(r2).isEqualTo(p); + assertEquals(p, r2); } finally { p1.recycle(); p2.recycle(); @@ -143,36 +141,34 @@ public class ProgramTest { .setTitle("MyTitle") .addCriticScore( new CriticScore( - "default source", "5/10", "http://testurl/testimage.jpg")) + "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); - assertThat(programFromParcel.getCriticScores()).isNotNull(); - assertThat(programFromParcel.getCriticScores().get(0).source).isEqualTo("default source"); - assertThat(programFromParcel.getCriticScores().get(0).score).isEqualTo("5/10"); - assertThat(programFromParcel.getCriticScores().get(0).logoUrl) - .isEqualTo("http://testurl/testimage.jpg"); + 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(); - assertWithMessage("Expected null canonical genres but was " + Arrays.toString(actual)) - .that(actual) - .isNull(); + assertNull("Expected null canonical genres but was " + Arrays.toString(actual), actual); } private static void assertCanonicalGenres(Program program, String... expected) { - assertWithMessage("canonical genres") - .that(Arrays.asList(program.getCanonicalGenres())) - .isEqualTo(Arrays.asList(expected)); + assertEquals( + "canonical genres", + Arrays.asList(expected), + Arrays.asList(program.getCanonicalGenres())); } private static void assertHasGenre(Program program, int genreId, boolean expected) { - assertWithMessage("hasGenre(" + genreId + ")") - .that(program.hasGenre(genreId)) - .isEqualTo(expected); + assertEquals("hasGenre(" + genreId + ")", expected, program.hasGenre(genreId)); } } diff --git a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java index 8bf3efbc..496d1018 100644 --- a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java +++ b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java @@ -19,7 +19,6 @@ package com.android.tv.data; import android.content.pm.ResolveInfo; import android.media.tv.TvInputInfo; import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Pair; import com.android.tv.testing.ComparatorTester; import com.android.tv.util.SetupUtils; @@ -28,7 +27,6 @@ import com.android.tv.util.TvInputManagerHelper; import java.util.Comparator; import java.util.LinkedHashMap; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -36,7 +34,6 @@ import org.mockito.stubbing.Answer; /** Test for {@link TvInputNewComparator} */ @SmallTest -@RunWith(AndroidJUnit4.class) public class TvInputNewComparatorTest { @Test public void testComparator() throws Exception { diff --git a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java index 539698bf..e65a71fb 100644 --- a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java +++ b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java @@ -17,16 +17,16 @@ package com.android.tv.data; import static android.support.test.InstrumentationRegistry.getTargetContext; -import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import android.os.Looper; import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; import com.android.tv.data.WatchedHistoryManager.WatchedRecord; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; /** * Test for {@link com.android.tv.data.WatchedHistoryManagerTest} @@ -34,7 +34,6 @@ import org.junit.runner.RunWith; * <p>This is a medium test because it load files which accessing SharedPreferences. */ @MediumTest -@RunWith(AndroidJUnit4.class) public class WatchedHistoryManagerTest { // Wait time for expected success. private static final int MAX_HISTORY_SIZE = 100; @@ -54,13 +53,13 @@ public class WatchedHistoryManagerTest { private void startAndWaitForComplete() throws InterruptedException { mWatchedHistoryManager.start(); - assertThat(mListener.mLoadFinished).isTrue(); + assertTrue(mListener.mLoadFinished); } @Test public void testIsLoaded() throws InterruptedException { startAndWaitForComplete(); - assertThat(mWatchedHistoryManager.isLoaded()).isTrue(); + assertTrue(mWatchedHistoryManager.isLoaded()); } @Test @@ -75,10 +74,10 @@ public class WatchedHistoryManagerTest { WatchedRecord record = mWatchedHistoryManager.getRecord(0); WatchedRecord recordFromSharedPreferences = mWatchedHistoryManager.getRecordFromSharedPreferences(0); - assertThat(fakeId).isEqualTo(record.channelId); - assertThat(time - duration).isEqualTo(record.watchedStartTime); - assertThat(duration).isEqualTo(record.duration); - assertThat(recordFromSharedPreferences).isEqualTo(record); + assertEquals(record.channelId, fakeId); + assertEquals(record.watchedStartTime, time - duration); + assertEquals(record.duration, duration); + assertEquals(record, recordFromSharedPreferences); } @Test @@ -97,21 +96,22 @@ public class WatchedHistoryManagerTest { WatchedRecord record = mWatchedHistoryManager.getRecord(i); WatchedRecord recordFromSharedPreferences = mWatchedHistoryManager.getRecordFromSharedPreferences(i); - assertThat(recordFromSharedPreferences).isEqualTo(record); - assertThat(startChannelId + size - 1 - i).isEqualTo(record.channelId); + assertEquals(record, recordFromSharedPreferences); + assertEquals(record.channelId, startChannelId + size - 1 - i); } // Since the WatchedHistory is a circular queue, the value for 0 and maxHistorySize // are same. - assertThat(mWatchedHistoryManager.getRecordFromSharedPreferences(MAX_HISTORY_SIZE)) - .isEqualTo(mWatchedHistoryManager.getRecordFromSharedPreferences(0)); + assertEquals( + mWatchedHistoryManager.getRecordFromSharedPreferences(0), + mWatchedHistoryManager.getRecordFromSharedPreferences(MAX_HISTORY_SIZE)); } @Test public void testWatchedRecordEquals() { - assertThat(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 2, 3))).isTrue(); - assertThat(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 2, 4))).isFalse(); - assertThat(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 4, 3))).isFalse(); - assertThat(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(4, 2, 3))).isFalse(); + assertTrue(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 2, 3))); + assertFalse(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 2, 4))); + assertFalse(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 4, 3))); + assertFalse(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(4, 2, 3))); } @Test @@ -122,11 +122,10 @@ public class WatchedHistoryManagerTest { WatchedRecord record = new WatchedRecord(fakeId, time, duration); WatchedRecord sameRecord = mWatchedHistoryManager.decode(mWatchedHistoryManager.encode(record)); - assertThat(sameRecord).isEqualTo(record); + assertEquals(record, sameRecord); } - private static final class TestWatchedHistoryManagerListener - implements WatchedHistoryManager.Listener { + private class TestWatchedHistoryManagerListener implements WatchedHistoryManager.Listener { boolean mLoadFinished; @Override |