Merge "Fix failing GameManagerServiceTests" into sc-qpr1-dev (6925a160) · Commits · e / os / android_frameworks_base

services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -207,7 +207,7 @@ public class GameManagerServiceTests {
	}		}

	private void mockDeviceConfigInvalid() {		private void mockDeviceConfigInvalid() {
	String configString = "mode=2,downscaleFactor=0.55";		String configString = "";
	when(DeviceConfig.getProperty(anyString(), anyString()))		when(DeviceConfig.getProperty(anyString(), anyString()))
	.thenReturn(configString);		.thenReturn(configString);
	}		}
	@@ -373,11 +373,12 @@ public class GameManagerServiceTests {
	*/		*/
	@Test		@Test
	public void testSetGameModePermissionDenied() {		public void testSetGameModePermissionDenied() {
			mockModifyGameModeGranted();
			mockDeviceConfigAll();
	GameManagerService gameManagerService = new GameManagerService(mMockContext);		GameManagerService gameManagerService = new GameManagerService(mMockContext);
	gameManagerService.onUserStarting(USER_ID_1);		gameManagerService.onUserStarting(USER_ID_1);

	// Update the game mode so we can read back something valid.		// Update the game mode so we can read back something valid.
	mockModifyGameModeGranted();
	gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_STANDARD, USER_ID_1);		gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_STANDARD, USER_ID_1);
	assertEquals(GameManager.GAME_MODE_STANDARD,		assertEquals(GameManager.GAME_MODE_STANDARD,
	gameManagerService.getGameMode(mPackageName, USER_ID_1));		gameManagerService.getGameMode(mPackageName, USER_ID_1));