From 63ff6e1b5b993052126cbda1a5b8e23ede88e1ec Mon Sep 17 00:00:00 2001 From: Andy Yu Date: Thu, 5 Jan 2023 17:41:30 -0800 Subject: [PATCH] Update testGetGameModeInvalidPackageName test Previously this test verifies if the permission permission.MANAGE_GAME_MODE is granted, which is already tested in a separate test case. This patch updates the test to match the test name. Bug: 264528460 Test: atest GameManagerServiceTests Change-Id: Ie4a8645633edc6aa32458571e2cc54f0ac5222e9 --- .../server/app/GameManagerServiceTests.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java index 94cfa42868b0c..af3514753bab1 100644 --- a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java @@ -537,7 +537,7 @@ public class GameManagerServiceTests { } /** - * Test permission.MANAGE_GAME_MODE is checked + * Test invalid package name is queried */ @Test public void testGetGameModeInvalidPackageName() { @@ -546,16 +546,16 @@ public class GameManagerServiceTests { startUser(gameManagerService, USER_ID_1); try { + when(mMockPackageManager.getApplicationInfoAsUser(anyString(), anyInt(), anyInt())) + .thenThrow(new PackageManager.NameNotFoundException()); assertEquals(GameManager.GAME_MODE_UNSUPPORTED, gameManagerService.getGameMode(PACKAGE_NAME_INVALID, USER_ID_1)); - - fail("GameManagerService failed to generate SecurityException when " - + "permission.MANAGE_GAME_MODE is not granted."); - } catch (SecurityException ignored) { + } catch (PackageManager.NameNotFoundException e) { + // should never get here as isPackageGame() catches this exception + // fail this test if we ever get here + fail("Unexpected NameNotFoundException caught."); } - - // The test should throw an exception, so the test is passing if we get here. } /**