aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNick Chalko <nchalko@google.com>2015-08-05 10:34:56 -0700
committerNick Chalko <nchalko@google.com>2015-08-05 13:37:24 -0700
commit516b6a59b79ecf950b32f1286f4d4d288484088f (patch)
treed6b2097aed7d38ad48bc44ce08ace35bc036c76b /tests
parente3f4ee114b1200b125f5b077ad40f802f4e832ac (diff)
downloadTV-516b6a59b79ecf950b32f1286f4d4d288484088f.tar.gz
Sync to ub-tv-er at d42edb5e9834a40dacf6dcd2d33f983362a33994
This changes the app name to "Live TV" Bug: 22959084 Change-Id: I66f5579e7b949485a73f80f1ac614a35f986c112
Diffstat (limited to 'tests')
-rw-r--r--tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java2
-rw-r--r--tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java2
-rw-r--r--tests/unit/src/com/android/tv/data/ChannelTest.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
index 949e0c9b..ffa45b35 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
@@ -11,7 +11,7 @@ import android.support.test.uiautomator.Until;
import junit.framework.Assert;
/**
- * Helper for testing the Live Channels Application.
+ * Helper for testing the Live TV Application.
*/
public class LiveChannelsUiDeviceHelper extends BaseUiDeviceHelper {
private static final int APPLICATION_START_TIMEOUT_MSEC = 500;
diff --git a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
index 0972034f..2ee18562 100644
--- a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
@@ -131,7 +131,7 @@ public class PlayControlsRowViewTest extends LiveChannelsTestCase {
mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_PAUSE);
mMenuHelper.assertWaitForMenu();
assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
- // Press HOME twice to visit the home screen and return to Live Channels.
+ // Press HOME twice to visit the home screen and return to Live TV.
mDevice.pressHome();
// Wait until home screen is shown.
mDevice.waitForIdle();
diff --git a/tests/unit/src/com/android/tv/data/ChannelTest.java b/tests/unit/src/com/android/tv/data/ChannelTest.java
index dc41fda0..f32bf02a 100644
--- a/tests/unit/src/com/android/tv/data/ChannelTest.java
+++ b/tests/unit/src/com/android/tv/data/ChannelTest.java
@@ -41,7 +41,7 @@ public class ChannelTest extends AndroidTestCase {
// uninstalled while drawing an app link card.
private static final String INVALID_TV_INPUT_PACKAGE_NAME =
"com.android.tv.invalid_tv_input";
- // Used for testing TV inputs defined inside of Live Channels.
+ // 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 =