From 576d4448a9e5f8c400a16425cf52c3dc5d8f5ada Mon Sep 17 00:00:00 2001 From: Pavlin Radoslavov Date: Wed, 7 Feb 2018 17:23:12 -0800 Subject: [PATCH] Use proper string formatting for the "Active device" string Updated testContextMock() how it checks the bluetooth_connected string. Bug: 72317067 Test: Unit test updated: make ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest \ RunSettingsRoboTests Manual: two headsets and switching the active device Change-Id: I3db178d71543e4dfa437544350c58241860ae703 Merged-In: I3db178d71543e4dfa437544350c58241860ae703 (cherry picked from commit b58b006e44ecf73ad31f79bade8149df7d903dc3) --- .../bluetooth/BluetoothDetailsHeaderControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 98a3580a361..d99e057dcf9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -79,7 +79,7 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro */ @Test public void testContextMock() { - assertThat(mContext.getString(R.string.bluetooth_connected)).isEqualTo("Connected"); + assertThat(mContext.getString(R.string.bluetooth_connected)).isNotNull(); } @Test