From: jackqdyulei Date: Mon, 6 Nov 2017 18:59:21 +0000 (-0800) Subject: Fix crash in settings robo test. X-Git-Tag: android-x86-9.0-r1~163^2~6^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=65370d21fd2d80d95d50f4c33d28ed96b03638a9;p=android-x86%2Fpackages-apps-Settings.git Fix crash in settings robo test. This is a regression from ag/3120176. In AnomalyDialogFragment when creating the real dialog, it creates the RuntimePermissionPresenter which causes the stub error. In this cl we shadow the RuntimePermissionPresenter since in this test we only focus on that created dialog has the correct message (dialog title, dialog message) Bug: 68941201 Test: RunSettingsRoboTests Change-Id: I9c09922453f7797f375d0f61b9d8eba660bfbfef --- diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java index 8431fde4da..6b3791ad7d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java @@ -27,12 +27,15 @@ import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.pm.permission.RuntimePermissionPresenter; import android.os.Build; import com.android.settings.R; import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; +import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.testutils.shadow.ShadowRuntimePermissionPresenter; import org.junit.Before; import org.junit.Test; @@ -46,7 +49,8 @@ import org.robolectric.shadows.ShadowDialog; import org.robolectric.util.FragmentTestUtil; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, + shadows = ShadowRuntimePermissionPresenter.class) public class AnomalyDialogFragmentTest { private static final String PACKAGE_NAME = "com.android.app"; private static final String DISPLAY_NAME = "app"; @@ -56,6 +60,8 @@ public class AnomalyDialogFragmentTest { private AnomalyUtils mAnomalyUtils; @Mock private AnomalyAction mAnomalyAction; + @Mock + private RuntimePermissionPresenter mRuntimePermissionPresenter; private Anomaly mWakeLockAnomaly; private Anomaly mWakeupAlarmAnomaly; private Anomaly mWakeupAlarmAnomaly2; @@ -67,7 +73,7 @@ public class AnomalyDialogFragmentTest { public void setUp() { MockitoAnnotations.initMocks(this); - mContext = RuntimeEnvironment.application; + mContext = spy(RuntimeEnvironment.application); mWakeLockAnomaly = new Anomaly.Builder() .setType(Anomaly.AnomalyType.WAKE_LOCK) .setUid(UID) @@ -93,6 +99,8 @@ public class AnomalyDialogFragmentTest { .setPackageName(PACKAGE_NAME) .setDisplayName(DISPLAY_NAME) .build(); + FakeFeatureFactory.setupForTest(mContext); + ShadowRuntimePermissionPresenter.setRuntimePermissionPresenter(mRuntimePermissionPresenter); } @Test diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java new file mode 100644 index 0000000000..834d285c95 --- /dev/null +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.testutils.shadow; + +import android.content.Context; +import android.content.pm.permission.RuntimePermissionPresenter; + + +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; + +@Implements(RuntimePermissionPresenter.class) +public class ShadowRuntimePermissionPresenter { + private static RuntimePermissionPresenter mRuntimePermissionPresenter; + + @Implementation + public static RuntimePermissionPresenter getInstance(Context context) { + return mRuntimePermissionPresenter; + } + + public static void setRuntimePermissionPresenter( + RuntimePermissionPresenter runtimePermissionPresenter) { + mRuntimePermissionPresenter = runtimePermissionPresenter; + } +}