Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2016-08-26 16:52:02 +00:00
committed by Android (Google) Code Review
parent be1a09ef47 d954357860
commit 4be496d2d0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java
View File

@@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.accounts.Account; import android.accounts.Account;
import android.accounts.AccountManagerInternal;
import android.accounts.AuthenticatorDescription; import android.accounts.AuthenticatorDescription;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.Notification; import android.app.Notification;
@@ -44,6 +45,8 @@ import android.test.mock.MockContext;
import android.test.mock.MockPackageManager; import android.test.mock.MockPackageManager;
import android.util.Log; import android.util.Log;
import com.android.server.LocalServices;
import java.io.File; import java.io.File;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
@@ -73,6 +76,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
SQLiteDatabase.deleteDatabase(new File(mAms.getCeDatabaseName(UserHandle.USER_SYSTEM))); SQLiteDatabase.deleteDatabase(new File(mAms.getCeDatabaseName(UserHandle.USER_SYSTEM)));
SQLiteDatabase.deleteDatabase(new File(mAms.getDeDatabaseName(UserHandle.USER_SYSTEM))); SQLiteDatabase.deleteDatabase(new File(mAms.getDeDatabaseName(UserHandle.USER_SYSTEM)));
SQLiteDatabase.deleteDatabase(new File(mAms.getPreNDatabaseName(UserHandle.USER_SYSTEM))); SQLiteDatabase.deleteDatabase(new File(mAms.getPreNDatabaseName(UserHandle.USER_SYSTEM)));
LocalServices.removeServiceForTest(AccountManagerInternal.class);
super.tearDown(); super.tearDown();
} }
@@ -282,6 +286,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
private AccountManagerService createAccountManagerService(Context mockContext, private AccountManagerService createAccountManagerService(Context mockContext,
Context realContext) { Context realContext) {
LocalServices.removeServiceForTest(AccountManagerInternal.class);
return new MyAccountManagerService(mockContext, return new MyAccountManagerService(mockContext,
new MyMockPackageManager(), new MockAccountAuthenticatorCache(), realContext); new MyMockPackageManager(), new MockAccountAuthenticatorCache(), realContext);
} }
@@ -420,6 +425,11 @@ public class AccountManagerServiceTest extends AndroidTestCase {
public int checkSignatures(final int uid1, final int uid2) { public int checkSignatures(final int uid1, final int uid2) {
return PackageManager.SIGNATURE_MATCH; return PackageManager.SIGNATURE_MATCH;
} }
@Override
public void addOnPermissionsChangeListener(
OnPermissionsChangedListener listener) {
}
} }
static public class MyAccountManagerService extends AccountManagerService { static public class MyAccountManagerService extends AccountManagerService {