Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java

Issue 2704263004: bluetooth: Add connected icon to Bluetooth Chooser on Android (Closed)
Patch Set: Change name Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java
index cc56e2fbfa8f01ceeeb7e10c1e4e77c21a3375ac..7a988b66448f5a193ff5353794df04fd848152ac 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java
@@ -226,8 +226,8 @@ public class BluetoothChooserDialogTest extends ChromeActivityTestCaseBase<Chrom
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
- mChooserDialog.addOrUpdateDevice("id-1", "Name 1");
- mChooserDialog.addOrUpdateDevice("id-2", "Name 2");
+ mChooserDialog.addOrUpdateDevice("id-1", "Name 1", false /* is_gatt_connected */);
juncai 2017/02/22 22:22:57 s/is_gatt_connected/isGATTConnected
ortuno 2017/02/28 01:42:48 Done.
+ mChooserDialog.addOrUpdateDevice("id-2", "Name 2", true /* is_gatt_connected */);
juncai 2017/02/22 22:22:57 ditto.
ortuno 2017/02/28 01:42:48 Done.
}
});
@@ -241,6 +241,14 @@ public class BluetoothChooserDialogTest extends ChromeActivityTestCaseBase<Chrom
assertEquals(View.VISIBLE, items.getVisibility());
assertEquals(View.GONE, progress.getVisibility());
+ ItemChooserDialog.ItemChooserRowIcon connectedIcon =
+ mChooserDialog.createConnectedRowIcon();
+
+ ItemChooserDialog.ItemAdapter itemAdapter =
+ mChooserDialog.mItemChooserDialog.getItemAdapterForTesting();
+ assertTrue(itemAdapter.getItem(0).hasSameContents("id-1", "Name 1", null));
juncai 2017/02/22 22:22:57 nit: add comment for null.
ortuno 2017/02/28 01:42:48 Done.
+ assertTrue(itemAdapter.getItem(1).hasSameContents("id-2", "Name 2", connectedIcon));
+
selectItem(mChooserDialog, 2);
assertEquals(

Powered by Google App Engine
This is Rietveld 408576698