test: sharpen button label unit test

Using different strings for the device tree node labels and the label
property of buttons sharpens the button label unit test.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
This commit is contained in:
Heinrich Schuchardt 2020-09-14 12:50:54 +02:00 committed by Tom Rini
parent 9ea0a1ee93
commit 39916bb45f
4 changed files with 12 additions and 12 deletions

View File

@ -18,14 +18,14 @@
buttons { buttons {
compatible = "gpio-keys"; compatible = "gpio-keys";
summer { btn1 {
gpios = <&gpio_a 3 0>; gpios = <&gpio_a 3 0>;
label = "summer"; label = "button1";
}; };
christmas { btn2 {
gpios = <&gpio_a 4 0>; gpios = <&gpio_a 4 0>;
label = "christmas"; label = "button2";
}; };
}; };

View File

@ -55,14 +55,14 @@
buttons { buttons {
compatible = "gpio-keys"; compatible = "gpio-keys";
summer { btn1 {
gpios = <&gpio_a 3 0>; gpios = <&gpio_a 3 0>;
label = "summer"; label = "button1";
}; };
christmas { btn2 {
gpios = <&gpio_a 4 0>; gpios = <&gpio_a 4 0>;
label = "christmas"; label = "button2";
}; };
}; };

View File

@ -57,17 +57,17 @@ static int dm_test_button_label(struct unit_test_state *uts)
{ {
struct udevice *dev, *cmp; struct udevice *dev, *cmp;
ut_assertok(button_get_by_label("summer", &dev)); ut_assertok(button_get_by_label("button1", &dev));
ut_asserteq(1, device_active(dev)); ut_asserteq(1, device_active(dev));
ut_assertok(uclass_get_device(UCLASS_BUTTON, 1, &cmp)); ut_assertok(uclass_get_device(UCLASS_BUTTON, 1, &cmp));
ut_asserteq_ptr(dev, cmp); ut_asserteq_ptr(dev, cmp);
ut_assertok(button_get_by_label("christmas", &dev)); ut_assertok(button_get_by_label("button2", &dev));
ut_asserteq(1, device_active(dev)); ut_asserteq(1, device_active(dev));
ut_assertok(uclass_get_device(UCLASS_BUTTON, 2, &cmp)); ut_assertok(uclass_get_device(UCLASS_BUTTON, 2, &cmp));
ut_asserteq_ptr(dev, cmp); ut_asserteq_ptr(dev, cmp);
ut_asserteq(-ENODEV, button_get_by_label("spring", &dev)); ut_asserteq(-ENODEV, button_get_by_label("nobutton", &dev));
return 0; return 0;
} }

View File

@ -11,7 +11,7 @@ def test_button_exit_statuses(u_boot_console):
expected_response = 'rc:0' expected_response = 'rc:0'
response = u_boot_console.run_command('button list; echo rc:$?') response = u_boot_console.run_command('button list; echo rc:$?')
assert(expected_response in response) assert(expected_response in response)
response = u_boot_console.run_command('button summer; echo rc:$?') response = u_boot_console.run_command('button button1; echo rc:$?')
assert(expected_response in response) assert(expected_response in response)
expected_response = 'rc:1' expected_response = 'rc:1'