Update Robolectric to 3.4.2
Bug: 66693279 Test: m RunSettingsRoboTests m RunSettingsRoboTests-jacoco Change-Id: I9df619c3d68f0af2ee2ae944a15998275129f7c2
This commit is contained in:
@@ -41,7 +41,6 @@ import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
@@ -18,6 +18,7 @@ package com.android.settings.accounts;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.accounts.Account;
|
||||
@@ -76,6 +77,7 @@ public class AccountHeaderPreferenceControllerTest {
|
||||
FakeFeatureFactory.setupForTest(mContext);
|
||||
mHeaderPreference = new LayoutPreference(
|
||||
RuntimeEnvironment.application, R.layout.settings_entity_header);
|
||||
doReturn(mContext).when(mActivity).getApplicationContext();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -17,7 +17,6 @@ package com.android.settings.accounts;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserManager;
|
||||
import android.provider.SearchIndexableResource;
|
||||
|
||||
@@ -25,7 +24,6 @@ import com.android.settings.R;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.dashboard.SummaryLoader;
|
||||
import com.android.settingslib.drawer.CategoryKey;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
Reference in New Issue
Block a user