Merge remote-tracking branch 'origin/develop' into xap

keyboards/anavi/knobs3/keyboard.json

@@ -23,9 +23,6 @@
     "rgblight": {
         "led_count": 1,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "max_brightness": 255,
         "animations": {
             "alternating": true,
             "breathing": true,

keyboards/anavi/macropad10/keyboard.json

@@ -22,9 +22,6 @@
     "rgblight": {
         "led_count": 4,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "max_brightness": 255,
         "animations": {
             "alternating": true,
             "breathing": true,

keyboards/ask55/keyboard.json

@@ -36,9 +36,7 @@
             "static_gradient": true
         },
         "brightness_steps": 8,
-        "hue_steps": 8,
         "led_count": 8,
-        "max_brightness": 255,
         "saturation_steps": 8,
         "sleep": true
     },

keyboards/cannonkeys/ripple/keyboard.json

@@ -36,8 +36,6 @@
     "rgblight": {
         "led_count": 20,
         "hue_steps": 17,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "animations": {
             "static_gradient": true,
             "twinkle": true,

keyboards/chickenman/ciel65/keyboard.json

@@ -26,10 +26,8 @@
     },
     "rgblight": {
         "led_count": 14,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
-        "max_brightness": 255,
         "sleep": true,
         "animations": {
             "alternating": true,

keyboards/clueboard/17/keyboard.json

@@ -32,10 +32,8 @@
       "static_gradient": true,
       "twinkle": true
     },
-    "brightness_steps": 17,
     "hue_steps": 10,
-    "led_count": 4,
+    "led_count": 4
-    "saturation_steps": 17
   },
   "ws2812": {
     "pin": "F6"

keyboards/clueboard/2x1800/2018/keyboard.json

@@ -44,7 +44,6 @@
       "twinkle": true
     },
     "brightness_steps": 8,
-    "hue_steps": 8,
     "led_count": 16,
     "saturation_steps": 8
   },

keyboards/clueboard/66/rev1/keyboard.json

@@ -33,10 +33,8 @@
       "static_gradient": true,
       "twinkle": true
     },
-    "brightness_steps": 17,
     "hue_steps": 10,
-    "led_count": 14,
+    "led_count": 14
-    "saturation_steps": 17
   },
   "ws2812": {
     "pin": "B2"

keyboards/clueboard/66/rev2/keyboard.json

@@ -34,10 +34,8 @@
       "static_gradient": true,
       "twinkle": true
     },
-    "brightness_steps": 17,
     "hue_steps": 32,
-    "led_count": 14,
+    "led_count": 14
-    "saturation_steps": 17
   },
   "ws2812": {
     "pin": "D7"

keyboards/clueboard/66/rev3/keyboard.json

@@ -34,10 +34,8 @@
       "static_gradient": true,
       "twinkle": true
     },
-    "brightness_steps": 17,
     "hue_steps": 32,
-    "led_count": 18,
+    "led_count": 18
-    "saturation_steps": 17
   },
   "ws2812": {
     "pin": "D7"

keyboards/clueboard/66/rev4/keyboard.json

@@ -32,10 +32,8 @@
       "static_gradient": true,
       "twinkle": true
     },
-    "brightness_steps": 17,
     "hue_steps": 32,
-    "led_count": 18,
+    "led_count": 18
-    "saturation_steps": 17
   },
   "ws2812": {
     "pin": "D7"

keyboards/clueboard/66_hotswap/prototype/keyboard.json

@@ -39,10 +39,8 @@
       "static_gradient": true,
       "twinkle": true
     },
-    "brightness_steps": 17,
     "hue_steps": 32,
-    "led_count": 26,
+    "led_count": 26
-    "saturation_steps": 17
   },
   "ws2812": {
     "pin": "D7"

keyboards/clueboard/card/keyboard.json

@@ -25,10 +25,8 @@
     "rows": ["F0", "F5", "F4", "B4"]
   },
   "rgblight": {
-    "brightness_steps": 17,
     "hue_steps": 10,
-    "led_count": 4,
+    "led_count": 4
-    "saturation_steps": 17
   },
   "ws2812": {
     "pin": "E6"

keyboards/ghs/jem/info.json

@@ -29,8 +29,6 @@
     "rgblight": {
         "led_count": 22,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "animations": {
             "breathing": true,
             "rainbow_mood": true,

keyboards/hillside/46/0_1/keyboard.json

@@ -40,7 +40,6 @@
     "rgblight": {
         "led_count": 4,
         "split": true,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "sleep": true

keyboards/hillside/48/0_1/keyboard.json

@@ -40,7 +40,6 @@
     "rgblight": {
         "led_count": 5,
         "split": true,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "sleep": true

keyboards/hillside/52/0_1/keyboard.json

@@ -40,7 +40,6 @@
     "rgblight": {
         "led_count": 5,
         "split": true,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "sleep": true

keyboards/jaykeeb/kamigakushi/keyboard.json

@@ -19,10 +19,8 @@
     },
     "rgblight": {
         "led_count": 2,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
-        "max_brightness": 255,
     "animations": {
         "alternating": true,
         "breathing": true,

keyboards/jaykeeb/sriwedari70/keyboard.json

@@ -30,10 +30,8 @@
     },
     "rgblight": {
         "led_count": 8,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
-        "max_brightness": 255,
         "animations": {
             "alternating": true,
             "breathing": true,

keyboards/kbdfans/odinmini/keyboard.json

@@ -35,7 +35,6 @@
             "twinkle": true
     },
         "brightness_steps": 8,
-        "hue_steps": 8,
         "led_count": 4,
         "max_brightness": 180,
         "saturation_steps": 8,

keyboards/keycapsss/3w6_2040/keyboard.json

@@ -42,7 +42,6 @@
             "sat": 232,
             "speed": 2
         },
-        "hue_steps": 8,
         "led_count": 2,
         "max_brightness": 100,
         "saturation_steps": 8,

keyboards/keyspensory/kp60/keyboard.json

@@ -26,7 +26,6 @@
     },
     "rgblight": {
         "led_count": 8,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "animations": {

keyboards/kprepublic/jj50/rev2/keyboard.json

@@ -39,7 +39,6 @@
             "twinkle": true
         },
         "brightness_steps": 8,
-        "hue_steps": 8,
         "led_count": 6,
         "saturation_steps": 8
     },

keyboards/lxxt/keyboard.json

@@ -26,10 +26,8 @@
     },
     "rgblight": {
     "led_count": 16,
-    "hue_steps": 8,
     "saturation_steps": 8,
     "brightness_steps": 8,
-    "max_brightness": 255,
     "sleep": true,
     "animations": {
             "alternating": true,

keyboards/mechwild/bde/info.json

@@ -10,8 +10,7 @@
     },
     "development_board": "promicro",
     "rgblight": {
-        "sleep": true,
+        "sleep": true
-        "max_brightness": 255
     },
     "tapping": {
         "tap_keycode_delay": 10,

keyboards/mechwild/bde/rev2/keyboard.json

@@ -34,7 +34,6 @@
         "animations": {
             "rainbow_swirl": true
         },
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8
     },

keyboards/mechwild/sugarglider/info.json

@@ -18,8 +18,6 @@
     },
     "rgblight": {
         "led_count": 10,
-        "max_brightness": 255,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "animations": {

keyboards/mk65/keyboard.json

@@ -34,10 +34,8 @@
     },
     "rgblight": {
         "led_count": 7,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
-        "max_brightness": 255,
         "sleep": true,
         "animations": {
             "alternating": true,

keyboards/mlego/m65/rev1/keyboard.json

@@ -42,7 +42,6 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "hue_steps": 8,
         "layers": {
             "enabled": true
         },

keyboards/mlego/m65/rev2/keyboard.json

@@ -41,7 +41,6 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "hue_steps": 8,
         "layers": {
             "enabled": true
         },

keyboards/mlego/m65/rev3/keyboard.json

@@ -42,7 +42,6 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "hue_steps": 8,
         "layers": {
             "enabled": true
         },

keyboards/mlego/m65/rev4/keyboard.json

@@ -44,7 +44,6 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "hue_steps": 8,
         "layers": {
             "enabled": true
         },

keyboards/mwstudio/mw80/keyboard.json

@@ -29,8 +29,6 @@
     "rgblight": {
         "led_count": 16,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "animations": {
             "alternating": true,
             "breathing": true,

keyboards/nightly_boards/octopadplus/keyboard.json

@@ -52,9 +52,7 @@
             "twinkle": true
         },
         "brightness_steps": 8,
-        "hue_steps": 8,
         "led_count": 8,
-        "max_brightness": 255,
         "saturation_steps": 8,
         "sleep": true
     },

keyboards/pauperboards/brick/keyboard.json

@@ -35,7 +35,6 @@
     },
     "rgblight": {
         "led_count": 8,
-        "hue_steps": 8,
         "brightness_steps": 8,
         "saturation_steps": 8,
         "animations": {

keyboards/plywrks/allaro/keyboard.json

@@ -26,8 +26,6 @@
     "rgblight": {
         "led_count": 16,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "animations": {
             "alternating": true,
             "breathing": true,

keyboards/prototypist/oceanographer/keyboard.json

@@ -29,8 +29,6 @@
         "led_count": 3,
         "sleep": true,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "max_brightness": 155,
         "animations": {
             "alternating": true,

keyboards/rastersoft/minitkl/keyboard.json

@@ -24,7 +24,6 @@
     "rgblight": {
         "led_count": 3,
         "pin": "B2",
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "animations": {

keyboards/reedskeebs/alish40/keyboard.json

@@ -34,10 +34,8 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "brightness_steps": 17,
         "hue_steps": 10,
-        "led_count": 10,
+        "led_count": 10
-        "saturation_steps": 17
     },
     "ws2812": {
         "pin": "F5"

keyboards/salicylic_acid3/guide68/keyboard.json

@@ -39,7 +39,6 @@
                "twinkle": true
         },
         "sleep": true,
-        "max_brightness": 255,
         "split": true,
         "split_count": [6, 6]
     },

keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json

@@ -26,10 +26,8 @@
     },
     "rgblight": {
         "led_count": 18,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
-        "max_brightness": 255,
         "sleep": true,
         "animations": {
             "alternating": true,

keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json

@@ -26,10 +26,8 @@
     },
     "rgblight": {
         "led_count": 18,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
-        "max_brightness": 255,
         "sleep": true,
         "animations": {
             "alternating": true,

keyboards/studiokestra/galatea/rev2/keyboard.json

@@ -40,7 +40,6 @@
     },
     "rgblight": {
         "led_count": 24,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "max_brightness": 200,

keyboards/studiokestra/galatea/rev3/keyboard.json

@@ -36,7 +36,6 @@
     },
     "rgblight": {
         "led_count": 24,
-        "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "max_brightness": 200,

keyboards/takashicompany/goat51/keyboard.json

@@ -32,8 +32,6 @@
     "rgblight": {
         "led_count": 11,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "animations": {
             "alternating": true,
             "breathing": true,

keyboards/takashicompany/spreadwriter/keyboard.json

@@ -31,8 +31,6 @@
     "rgblight": {
         "led_count": 53,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "animations": {
             "alternating": true,
             "breathing": true,

keyboards/tau4/keyboard.json

@@ -47,7 +47,6 @@
             "twinkle": true
         },
         "brightness_steps": 8,
-        "hue_steps": 8,
         "layers": {
             "blink": false,
             "enabled": true,

keyboards/tweetydabird/lbs4/keyboard.json

@@ -36,9 +36,6 @@
     },
     "rgblight": {
         "led_count": 6,
-        "hue_steps": 8,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "max_brightness": 175,
         "animations": {
             "alternating": true,

keyboards/tweetydabird/lbs6/keyboard.json

@@ -39,9 +39,6 @@
     },
     "rgblight": {
         "led_count": 8,
-        "hue_steps": 8,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
         "max_brightness": 200,
         "animations": {
             "alternating": true,

keyboards/vinhcatba/uncertainty/keyboard.json

@@ -47,7 +47,6 @@
             "override_rgb": true
         },
         "led_count": 14,
-        "max_brightness": 255,
         "sleep": true
     },
     "url": "",

keyboards/work_louder/micro/keyboard.json

@@ -38,7 +38,6 @@
             "hue": 213
         },
         "brightness_steps": 8,
-        "hue_steps": 8,
         "led_count": 8,
         "max_brightness": 150,
         "saturation_steps": 8,

keyboards/work_louder/numpad/keyboard.json

@@ -99,7 +99,6 @@
             "hue": 213
         },
         "brightness_steps": 8,
-        "hue_steps": 8,
         "led_count": 8,
         "max_brightness": 120,
         "saturation_steps": 8,

keyboards/yoichiro/lunakey_pico/keyboard.json

@@ -41,10 +41,8 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "hue_steps": 8,
         "saturation_steps": 8,
-        "brightness_steps": 8,
+        "brightness_steps": 8
-        "max_brightness": 255
     },
     "split": {
         "enabled": true,

quantum/process_keycode/process_caps_word.c

@@ -160,7 +160,12 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
             case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
             case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
             case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
+#ifdef TRI_LAYER_ENABLE // Ignore Tri Layer keys.
             case QK_TRI_LAYER_LOWER ... QK_TRI_LAYER_UPPER:
+#endif                   // TRI_LAYER_ENABLE
+#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key.
+            case QK_LAYER_LOCK:
+#endif // LAYER_LOCK_ENABLE
        // Ignore AltGr.
             case KC_RALT:
             case OSM(MOD_RALT):

quantum/process_keycode/process_repeat_key.c

@@ -42,6 +42,9 @@ static bool remember_last_key(uint16_t keycode, keyrecord_t* record, uint8_t* re
         case QK_TRI_LAYER_LOWER:
         case QK_TRI_LAYER_UPPER:
 #endif                   // TRI_LAYER_ENABLE
+#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key.
+        case QK_LAYER_LOCK:
+#endif // LAYER_LOCK_ENABLE
             return false;
 
             // Ignore hold events on tap-hold keys.

tests/caps_word/test.mk

@@ -15,5 +15,7 @@
 
 CAPS_WORD_ENABLE = yes
 COMMAND_ENABLE = no
+LAYER_LOCK_ENABLE = yes
 SPACE_CADET_ENABLE = yes
+TRI_LAYER_ENABLE = yes
 

tests/caps_word/test_caps_word.cpp

@@ -156,21 +156,22 @@ TEST_F(CapsWord, IdleTimeout) {
     // Turn on Caps Word and tap "A".
     caps_word_on();
     tap_key(key_a);
-
     VERIFY_AND_CLEAR(driver);
 
+    EXPECT_EMPTY_REPORT(driver);
     idle_for(CAPS_WORD_IDLE_TIMEOUT);
     run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
 
     // Caps Word should be off and mods should be clear.
     EXPECT_EQ(is_caps_word_on(), false);
     EXPECT_EQ(get_mods() | get_weak_mods(), 0);
 
-    EXPECT_EMPTY_REPORT(driver).Times(AnyNumber());
     // Expect unshifted "A".
     EXPECT_REPORT(driver, (KC_A));
+    EXPECT_EMPTY_REPORT(driver);
     tap_key(key_a);
-
+    run_one_scan_loop();
     VERIFY_AND_CLEAR(driver);
 }
 
@@ -244,6 +245,7 @@ TEST_F(CapsWord, ShiftsAltGrSymbols) {
     // clang-format off
     EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
                 KeyboardReport(),
+                KeyboardReport(KC_LSFT),
                 KeyboardReport(KC_RALT),
                 KeyboardReport(KC_LSFT, KC_RALT))))
         .Times(AnyNumber());
@@ -259,6 +261,9 @@ TEST_F(CapsWord, ShiftsAltGrSymbols) {
     tap_key(key_a);
     run_one_scan_loop();
     key_altgr.release();
+    run_one_scan_loop();
+
+    idle_for(CAPS_WORD_IDLE_TIMEOUT);
 
     VERIFY_AND_CLEAR(driver);
 }
@@ -274,6 +279,7 @@ TEST_F(CapsWord, ShiftsModTapAltGrSymbols) {
     // clang-format off
     EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
                 KeyboardReport(),
+                KeyboardReport(KC_LSFT),
                 KeyboardReport(KC_RALT),
                 KeyboardReport(KC_LSFT, KC_RALT))))
         .Times(AnyNumber());
@@ -289,8 +295,11 @@ TEST_F(CapsWord, ShiftsModTapAltGrSymbols) {
     tap_key(key_a);
     run_one_scan_loop();
     key_altgr_t.release();
-
+    run_one_scan_loop();
     EXPECT_TRUE(is_caps_word_on());
+
+    idle_for(CAPS_WORD_IDLE_TIMEOUT);
+
     VERIFY_AND_CLEAR(driver);
 }
 
@@ -535,7 +544,11 @@ TEST_P(CapsWordDoubleTapShift, Activation) {
     // machine at this point. This due to imperfect test isolation which can't
     // reset the caps word double shift timer on test case setup.
     idle_for(CAPS_WORD_IDLE_TIMEOUT);
+
+    EXPECT_REPORT(driver, (KC_ESC));
+    EXPECT_EMPTY_REPORT(driver);
     tap_key(esc);
+    VERIFY_AND_CLEAR(driver);
 }
 
 // Double tap doesn't count if another key is pressed between the taps.
@@ -589,6 +602,7 @@ TEST_P(CapsWordDoubleTapShift, SlowTaps) {
 
     EXPECT_EQ(is_caps_word_on(), false); // Caps Word is still off.
     clear_oneshot_mods();
+    send_keyboard_report();
 
     VERIFY_AND_CLEAR(driver);
 }
@@ -626,7 +640,7 @@ TEST_F(CapsWord, IgnoresOSLHold) {
     run_one_scan_loop();
     tap_key(key_b);
     key_osl.release();
-    run_one_scan_loop();
+    idle_for(CAPS_WORD_IDLE_TIMEOUT + 1);
 
     VERIFY_AND_CLEAR(driver);
 }
@@ -645,15 +659,39 @@ TEST_F(CapsWord, IgnoresOSLTap) {
                 KeyboardReport(),
                 KeyboardReport(KC_LSFT))))
         .Times(AnyNumber());
+    // clang-format on
 
     EXPECT_REPORT(driver, (KC_LSFT, KC_B));
     caps_word_on();
 
     tap_key(key_osl);
     tap_key(key_b);
-    run_one_scan_loop();
+    idle_for(CAPS_WORD_IDLE_TIMEOUT);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(CapsWord, IgnoresLayerLockKey) {
+    TestDriver driver;
+    KeymapKey  key_llock(0, 1, 0, QK_LAYER_LOCK);
+    KeymapKey  key_b(0, 0, 0, KC_B);
+    set_keymap({key_llock, key_b});
+
+    // Allow any number of reports with no keys or only modifiers.
+    // clang-format off
+    EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
+                KeyboardReport(),
+                KeyboardReport(KC_LSFT))))
+        .Times(AnyNumber());
+    // clang-format on
+
+    EXPECT_REPORT(driver, (KC_LSFT, KC_B));
+    caps_word_on();
+
+    tap_key(key_llock);
+    tap_key(key_b);
+    idle_for(CAPS_WORD_IDLE_TIMEOUT);
 
     VERIFY_AND_CLEAR(driver);
 }
-// clang-format on
 } // namespace

tests/repeat_key/test.mk

@@ -16,3 +16,4 @@
 REPEAT_KEY_ENABLE = yes
 
 AUTO_SHIFT_ENABLE = yes
+LAYER_LOCK_ENABLE = yes

tests/repeat_key/test_repeat_key.cpp

@@ -751,4 +751,37 @@ TEST_F(RepeatKey, RepeatKeyInvoke) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 }
 
+// Check that mods and Layer Lock are not remembered.
+TEST_F(RepeatKey, IgnoredKeys) {
+    TestDriver driver;
+    KeymapKey  regular_key(0, 0, 0, KC_A);
+    KeymapKey  key_repeat(0, 1, 0, QK_REP);
+    KeymapKey  key_lsft(0, 2, 0, KC_LSFT);
+    KeymapKey  key_lctl(0, 3, 0, KC_LCTL);
+    KeymapKey  key_llck(0, 4, 0, QK_LAYER_LOCK);
+    set_keymap({regular_key, key_repeat, key_lsft, key_lctl, key_llck});
+
+    // Allow any number of empty reports.
+    EXPECT_EMPTY_REPORT(driver).Times(AnyNumber());
+    {
+        InSequence seq;
+        EXPECT_REPORT(driver, (KC_A));
+        EXPECT_REPORT(driver, (KC_LSFT));
+        EXPECT_REPORT(driver, (KC_LCTL));
+        EXPECT_REPORT(driver, (KC_A));
+        EXPECT_REPORT(driver, (KC_A));
+    }
+
+    tap_key(regular_key); // Taps the KC_A key.
+
+    // Tap Shift, Ctrl, and Layer Lock keys, which should not be remembered.
+    tap_keys(key_lsft, key_lctl, key_llck);
+    EXPECT_KEYCODE_EQ(get_last_keycode(), KC_A);
+
+    // Tapping the Repeat Key should still reproduce KC_A.
+    tap_keys(key_repeat, key_repeat);
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
 } // namespace