Merge "Fix failing tests."
This commit is contained in:
commit
20bf78222b
@ -194,9 +194,9 @@ public class UtilityUnitTests extends AndroidTestCase {
|
||||
Log.w(Email.LOG_TAG, "TelephonyManager not supported. Skipping.");
|
||||
return;
|
||||
}
|
||||
final String deviceId = Utility.getConsistentDeviceId(getContext());
|
||||
assertNotNull(deviceId);
|
||||
|
||||
// Note null is a valid return value. But still it should be consistent.
|
||||
final String deviceId = Utility.getConsistentDeviceId(getContext());
|
||||
final String deviceId2 = Utility.getConsistentDeviceId(getContext());
|
||||
// Should be consistent.
|
||||
assertEquals(deviceId, deviceId2);
|
||||
|
@ -41,6 +41,12 @@ public class SyncManagerAccountTests extends AccountTestCase {
|
||||
super();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
mMockContext = getMockContext();
|
||||
}
|
||||
|
||||
public void testReleaseSyncHolds() {
|
||||
Context context = mMockContext;
|
||||
SyncManager syncManager = new SyncManager();
|
||||
|
Loading…
Reference in New Issue
Block a user