aboutsummaryrefslogtreecommitdiff
path: root/tests/unit/src/com/android/tv/MainActivityTest.java
diff options
context:
space:
mode:
authorNick Chalko <nchalko@google.com>2015-09-01 09:05:04 -0700
committerNick Chalko <nchalko@google.com>2015-09-16 06:46:50 -0700
commit07b043dc3db83d6d20f0e8513b946830ab00e37b (patch)
tree705ade719e5c2853c070fe40b8518a56ac37f6d0 /tests/unit/src/com/android/tv/MainActivityTest.java
parentb5429e4406a580953bbdac5817e421cf0ab7aae3 (diff)
downloadTV-07b043dc3db83d6d20f0e8513b946830ab00e37b.tar.gz
Sync to ub-tv-friends at 1.06.202
git hash 3c1965f5dcc60243f1fe600cb35f19bd5f01fc27 Change-Id: I90b77790f9074677ecef72a23235d2b33eacb76a
Diffstat (limited to 'tests/unit/src/com/android/tv/MainActivityTest.java')
-rw-r--r--tests/unit/src/com/android/tv/MainActivityTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/unit/src/com/android/tv/MainActivityTest.java b/tests/unit/src/com/android/tv/MainActivityTest.java
index ae789895..04271a7b 100644
--- a/tests/unit/src/com/android/tv/MainActivityTest.java
+++ b/tests/unit/src/com/android/tv/MainActivityTest.java
@@ -51,6 +51,7 @@ public class MainActivityTest extends BaseMainActivityTestCase {
public void testShowProgramGuide() throws Throwable {
tuneToChannel(TvTestInputConstants.CH_2);
showProgramGuide();
+ getInstrumentation().waitForIdleSync();
assertChannelBannerShown(false);
assertProgramGuide(true);
}
@@ -70,8 +71,8 @@ public class MainActivityTest extends BaseMainActivityTestCase {
assertEquals("Channel Name", displayName, channelNameView.getText());
}
- private View assertProgramGuide(boolean isShown) {
- return assertViewIsShown("Program Guide", R.id.program_guide, isShown);
+ private void assertProgramGuide(boolean isShown) {
+ assertViewIsShown("Program Guide", R.id.program_guide, isShown);
}
private ChannelBannerView assertChannelBannerShown(boolean isShown) {