c5fb6b4348dc01aa02846bf7b56e1b0a8a11013c

Message

Refactoring successive press() -> release() calls (#23573)

Diff

This diff is truncated to protect this page.

  1diff --git a/tests/basic/test_one_shot_keys.cpp b/tests/basic/test_one_shot_keys.cpp
  2index 9748dad7daf656abda30b70744eb612bf6f49344..64a8673a5cdb03c49f773391bfcd9bc2f12ac573 100644
  3--- a/tests/basic/test_one_shot_keys.cpp
  4+++ b/tests/basic/test_one_shot_keys.cpp
  5@@ -32,10 +32,7 @@ TEST_F(OneShot, OSMWithoutAdditionalKeypressDoesNothing) {
  6 
  7     /* Press and release OSM key*/
  8     EXPECT_NO_REPORT(driver);
  9-    osm_key.press();
 10-    run_one_scan_loop();
 11-    osm_key.release();
 12-    run_one_scan_loop();
 13+    tap_key(osm_key);
 14     VERIFY_AND_CLEAR(driver);
 15 
 16     /* OSM are added when an actual report is send */
 17@@ -88,10 +85,7 @@ TEST_P(OneShotParametrizedTestFixture, OSMWithAdditionalKeypress) {
 18 
 19     /* Press and release OSM */
 20     EXPECT_NO_REPORT(driver);
 21-    osm_key.press();
 22-    run_one_scan_loop();
 23-    osm_key.release();
 24-    run_one_scan_loop();
 25+    tap_key(osm_key);
 26     VERIFY_AND_CLEAR(driver);
 27 
 28     /* Press regular key */
 29@@ -171,18 +165,12 @@ TEST_F(OneShot, OSMChainingTwoOSMs) {
 30 
 31     /* Press and release OSM1 */
 32     EXPECT_NO_REPORT(driver);
 33-    osm_key1.press();
 34-    run_one_scan_loop();
 35-    osm_key1.release();
 36-    run_one_scan_loop();
 37+    tap_key(osm_key1);
 38     VERIFY_AND_CLEAR(driver);
 39 
 40     /* Press and relesea OSM2 */
 41     EXPECT_NO_REPORT(driver);
 42-    osm_key2.press();
 43-    run_one_scan_loop();
 44-    osm_key2.release();
 45-    run_one_scan_loop();
 46+    tap_key(osm_key2);
 47     VERIFY_AND_CLEAR(driver);
 48 
 49     /* Press regular key */
 50@@ -209,22 +197,13 @@ TEST_F(OneShot, OSMDoubleTapNotLockingOSMs) {
 51 
 52     /* Press and release OSM1 */
 53     EXPECT_NO_REPORT(driver);
 54-    osm_key1.press();
 55-    run_one_scan_loop();
 56-    osm_key1.release();
 57-    run_one_scan_loop();
 58+    tap_key(osm_key1);
 59     VERIFY_AND_CLEAR(driver);
 60 
 61     /* Press and release OSM2 twice */
 62     EXPECT_NO_REPORT(driver);
 63-    osm_key2.press();
 64-    run_one_scan_loop();
 65-    osm_key2.release();
 66-    run_one_scan_loop();
 67-    osm_key2.press();
 68-    run_one_scan_loop();
 69-    osm_key2.release();
 70-    run_one_scan_loop();
 71+    tap_key(osm_key2);
 72+    tap_key(osm_key2);
 73     VERIFY_AND_CLEAR(driver);
 74 
 75     /* Press regular key */
 76@@ -263,10 +242,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
 77 
 78     /* Press and release OSM1 */
 79     EXPECT_NO_REPORT(driver);
 80-    osm_key1.press();
 81-    run_one_scan_loop();
 82-    osm_key1.release();
 83-    run_one_scan_loop();
 84+    tap_key(osm_key1);
 85     VERIFY_AND_CLEAR(driver);
 86 
 87     /* Press and hold OSM2 */
 88@@ -279,10 +255,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
 89     /* Press and release regular key */
 90     EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code, regular_key.report_code)).Times(1);
 91     EXPECT_REPORT(driver, (osm_key2.report_code)).Times(1);
 92-    regular_key.press();
 93-    run_one_scan_loop();
 94-    regular_key.release();
 95-    run_one_scan_loop();
 96+    tap_key(regular_key);
 97     VERIFY_AND_CLEAR(driver);
 98 
 99     /* Release OSM2 */
100@@ -362,10 +335,7 @@ TEST_F(OneShot, OSLWithOsmAndAdditionalKeypress) {
101 
102     /* Press and release OSM */
103     EXPECT_NO_REPORT(driver);
104-    osm_key.press();