From: Maurice Lam Date: Fri, 8 Sep 2017 20:08:03 +0000 (-0700) Subject: Add FakeFeatureFactory.setupForTest X-Git-Tag: android-x86-9.0-r1~203^2^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=563af1cda94bcaadee75250d7e2f339604f2bffc;p=android-x86%2Fpackages-apps-Settings.git Add FakeFeatureFactory.setupForTest In AssisGestureSettingsTest, FakeFeatureFactory was used but was missing a setupForTest call. Test: cd tests/robotests && \ ROBOTEST_FILTER=AssistGestureSettingsTest mma Change-Id: Ie78232d854aee00c7969a3d2dc148354be7de484 --- diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 1f5c9be173..7ea42b8d07 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -32,6 +32,7 @@ import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; @@ -43,7 +44,7 @@ import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class AssistGestureSettingsTest { - @Mock + @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext; private FakeFeatureFactory mFakeFeatureFactory; private AssistGestureSettings mSettings; @@ -51,6 +52,7 @@ public class AssistGestureSettingsTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + FakeFeatureFactory.setupForTest(mContext); mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); mSettings = new AssistGestureSettings(); }