Merge "More test-related changes" into lmp-mr1-dev
diff --git a/tests/src/com/android/dialer/CallDetailActivityTest.java b/tests/src/com/android/dialer/CallDetailActivityTest.java
index 1e16fe4..f9f0a58 100644
--- a/tests/src/com/android/dialer/CallDetailActivityTest.java
+++ b/tests/src/com/android/dialer/CallDetailActivityTest.java
@@ -48,7 +48,8 @@
import java.util.Locale;
/**
- * Unit tests for the {@link CallDetailActivity}.
+ * Unit tests for the {@link CallDetailActivity}. NOTE: The screen needs to be on for the
+ * UI-related tests to pass.
*/
@LargeTest
public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<CallDetailActivity> {
diff --git a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
index c0347cf..30a84c2 100644
--- a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
@@ -22,6 +22,7 @@
import android.test.AndroidTestCase;
import android.view.View;
+import com.android.contacts.common.CallUtil;
import com.android.dialer.PhoneCallDetails;
import com.android.dialer.PhoneCallDetailsHelper;
import com.android.dialer.R;
@@ -323,8 +324,13 @@
null, Calls.FEATURES_VIDEO, null, null);
CharSequence description = mHelper.getCallDescription(getContext(), details);
+ final boolean isVideoEnabled = CallUtil.isVideoEnabled(getContext());
assertTrue(description.toString()
- .contains(this.mResources.getString(R.string.description_video_call, 2)));
+ .contains(this.mResources.getString(
+ isVideoEnabled
+ ? R.string.description_video_call
+ : R.string.description_num_calls,
+ 2)));
}
/** Asserts that the primary action view does not have a call intent. */