Add scanning feature and improve the keyboard test case.

Add scanning feature and class code dictionary to determine which device to connect. Improve the keyboard test case.

1 files changed, 13 insertions, 11 deletions

diff --git a/jobs/bluetooth.txt.in b/jobs/bluetooth.txt.in
index 76f60d0..82e925d 100644
--- a/jobs/bluetooth.txt.in
+++ b/jobs/bluetooth.txt.in
@@ -168,9 +168,11 @@ plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::bluetooth
 id: bluetooth4/HOGP-mouse
 depends: bluetooth/detect-output
-requires: manifest.has_bt_smart == 'True'
+requires:
+ manifest.has_bt_smart == 'True'
+ package.name == 'zenity'
 estimated_duration: 30.0
-command: bt_connect --mac `zenity --entry`
+command: bt_connect --mac `zenity --entry --title="device MAC" --text="Please enter the MAC address for testing"`
 _description:
 PURPOSE:
 This test will check that you can use a HID Over GATT Profile (HOGP) with your Bluetooth Smart mouse.
@@ -186,18 +188,18 @@ plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::bluetooth
 id: bluetooth4/HOGP-keyboard
 depends: bluetooth/detect-output
-requires: manifest.has_bt_smart == 'True'
+requires:
+ manifest.has_bt_smart == 'True'
+ package.name == 'zenity'
 estimated_duration: 30.0
-command: keyboard_test
+command: bt_connect --mac `zenity --entry --title="device MAC" --text="Please enter the MAC address for testing"` && keyboard_test
 _description:
 PURPOSE:
 This test will check that you can use a HID Over GATT Profile (HOGP) with your Bluetooth Smart keyboard.
 STEPS:
- 1. Enable either a Bluetooth Smart keyboard.
- 2. Click on the bluetooth icon in the menu bar
- 3. Select 'Setup new device'
- 4. Look for the device in the list and select it
- 5. For mice, perform actions such as moving the pointer, right and left button clicks and double clicks
- 6. For keyboards, commence the test to launch a small tool. Enter some text into the tool and close it.
+ 1. Enable a Bluetooth Smart keyboard, and put it into paring mode.
+ 2. Use "hcitool scan" command in another terminal to get the MAC address of it.
+ 3. Commence the test to do the auto-pairing, you will be asked to enter the MAC address and PIN code.
+ 4. After it's paired and connected, enter some text with your keyboard and close the small input test tool.
 VERIFICATION:
- Did the device work as expected?
+ Did the Bluetooth Smart keyboard work as expected?