diff options
Diffstat (limited to 'tests/vboot_detach_menu_tests.c')
-rw-r--r-- | tests/vboot_detach_menu_tests.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c index a9034b33..68a8a2c2 100644 --- a/tests/vboot_detach_menu_tests.c +++ b/tests/vboot_detach_menu_tests.c @@ -456,7 +456,7 @@ static void VbBootDevTest(void) /* Pressing ENTER is equivalent to power button. */ ResetMocksForDeveloper(); - mock_keypress[0] = '\r'; + mock_keypress[0] = VB_KEY_ENTER; TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, "dev warning menu: ENTER is power button"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -469,7 +469,7 @@ static void VbBootDevTest(void) /* ENTER functionality is unaffected by GBB flag in detachable UI. */ ResetMocksForDeveloper(); sd->gbb_flags |= GBB_FLAG_ENTER_TRIGGERS_TONORM; - mock_keypress[0] = '\r'; + mock_keypress[0] = VB_KEY_ENTER; TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, "dev warning menu: ENTER unaffected by GBB"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -568,7 +568,7 @@ static void VbBootDevTest(void) /* Ctrl+D dismisses warning */ ResetMocksForDeveloper(); - mock_keypress[0] = 'D' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('D'); TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+D"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); @@ -583,7 +583,7 @@ static void VbBootDevTest(void) /* Ctrl+D doesn't boot legacy even if GBB flag is set */ ResetMocksForDeveloper(); - mock_keypress[0] = 'D' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('D'); sd->gbb_flags |= GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY; TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+D"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -605,7 +605,7 @@ static void VbBootDevTest(void) /* Ctrl+L tries legacy boot mode only if enabled */ ResetMocksForDeveloper(); - mock_keypress[0] = 'L' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('L'); TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+L normal"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -625,7 +625,7 @@ static void VbBootDevTest(void) /* Ctrl+L boots legacy if enabled by GBB flag */ ResetMocksForDeveloper(); sd->gbb_flags |= GBB_FLAG_FORCE_DEV_BOOT_LEGACY; - mock_keypress[0] = 'L' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+L force legacy"); @@ -644,7 +644,7 @@ static void VbBootDevTest(void) /* Ctrl+L boots legacy if enabled by NVRAM */ ResetMocksForDeveloper(); vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); - mock_keypress[0] = 'L' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+L nv legacy"); @@ -663,7 +663,7 @@ static void VbBootDevTest(void) /* Ctrl+L boots legacy if enabled by FWMP */ ResetMocksForDeveloper(); VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_LEGACY; - mock_keypress[0] = 'L' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+L fwmp legacy"); @@ -683,7 +683,7 @@ static void VbBootDevTest(void) /* Ctrl+U boots USB only if enabled */ ResetMocksForDeveloper(); - mock_keypress[0] = 'U' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('U'); TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+U not enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -704,7 +704,7 @@ static void VbBootDevTest(void) /* Ctrl+U enabled, with good USB boot */ ResetMocksForDeveloper(); vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); - mock_keypress[0] = 'U' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS, "Ctrl+U USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -720,7 +720,7 @@ static void VbBootDevTest(void) /* Ctrl+U enabled, without valid USB */ ResetMocksForDeveloper(); vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); - mock_keypress[0] = 'U' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('U'); TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+U without valid USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -740,7 +740,7 @@ static void VbBootDevTest(void) /* Ctrl+U enabled via GBB */ ResetMocksForDeveloper(); sd->gbb_flags |= GBB_FLAG_FORCE_DEV_BOOT_USB; - mock_keypress[0] = 0x15; + mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS, "Ctrl+U force USB"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -753,7 +753,7 @@ static void VbBootDevTest(void) /* Ctrl+U enabled via FWMP */ ResetMocksForDeveloper(); VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_USB; - mock_keypress[0] = 0x15; + mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS, "Ctrl+U force USB"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -766,7 +766,7 @@ static void VbBootDevTest(void) /* If no valid USB, eventually times out and tries fixed disk */ ResetMocksForDeveloper(); vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); - mock_keypress[0] = 'U' & 0x1f; + mock_keypress[0] = VB_KEY_CTRL('U'); TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Ctrl+U failed - no USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -1148,13 +1148,13 @@ static void VbBootDevTest(void) VbApiKernelGetFwmp()->flags |= FWMP_DEV_DISABLE_BOOT; audio_looping_calls_left = 1; /* Confirm audio doesn't tick down. */ i = 0; - mock_keypress[i++] = 'D' & 0x1f; /* Just stays on TONORM and flashes */ - mock_keypress[i++] = 'U' & 0x1f; /* same */ - mock_keypress[i++] = 'L' & 0x1f; /* same */ + mock_keypress[i++] = VB_KEY_CTRL('D'); /* Just stays on TONORM and flashes */ + mock_keypress[i++] = VB_KEY_CTRL('U'); /* same */ + mock_keypress[i++] = VB_KEY_CTRL('L'); /* same */ mock_keypress[i++] = VB_BUTTON_VOL_UP_LONG_PRESS; /* same */ mock_keypress[i++] = VB_BUTTON_VOL_DOWN_LONG_PRESS; /* same */ mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; /* noop */ - mock_keypress[i++] = '\r'; + mock_keypress[i++] = VB_KEY_ENTER; TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_REBOOT_REQUIRED, "FWMP dev disabled"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, @@ -1457,11 +1457,11 @@ static void VbBootRecTest(void) ResetMocks(); i = 0; mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - mock_keypress[i++] = 'D' & 0x1f; + mock_keypress[i++] = VB_KEY_CTRL('D'); mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - mock_keypress[i++] = 'U' & 0x1f; + mock_keypress[i++] = VB_KEY_CTRL('U'); mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - mock_keypress[i++] = 'L' & 0x1f; + mock_keypress[i++] = VB_KEY_CTRL('L'); mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; @@ -1485,11 +1485,11 @@ static void VbBootRecTest(void) ResetMocksForManualRecovery(); i = 0; mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - mock_keypress[i++] = 'D' & 0x1f; + mock_keypress[i++] = VB_KEY_CTRL('D'); mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - mock_keypress[i++] = 'U' & 0x1f; + mock_keypress[i++] = VB_KEY_CTRL('U'); mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - mock_keypress[i++] = 'L' & 0x1f; + mock_keypress[i++] = VB_KEY_CTRL('L'); mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_UP_LONG_PRESS; mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; |