PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move default payment app to special app access.

Browse Source 
Bug: 124452117
Bug: 124522992
Test: build
Change-Id: I58e7127920d939dc3635bcc2e608cee6baa21998
This commit is contained in:
Hai Zhang
2019-04-06 16:21:32 +08:00
parent 6010c3a9a8
commit 470ec69461
6 changed files with 65 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceControllerTest.java
View File

@@ -14,13 +14,11 @@
* limitations under the License.
*/
package com.android.settings.applications.defaultapps;
package com.android.settings.applications.specialaccess;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -28,17 +26,12 @@ import android.content.pm.PackageManager;
import android.nfc.NfcAdapter;
import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.nfc.PaymentBackend;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
@@ -52,11 +45,8 @@ public class DefaultPaymentSettingsPreferenceControllerTest {
private UserManager mUserManager;
@Mock
private PackageManager mPackageManager;
@Mock
private PaymentBackend mPaymentBackend;
private DefaultPaymentSettingsPreferenceController mController;
private Preference mPreference;
@Before
public void setUp() {
@@ -64,11 +54,9 @@ public class DefaultPaymentSettingsPreferenceControllerTest {
when(mContext.getApplicationContext()).thenReturn(mContext);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = new DefaultPaymentSettingsPreferenceController(mContext);
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
mController = new DefaultPaymentSettingsPreferenceController(mContext, "key");
ReflectionHelpers.setField(mController, "mNfcAdapter", mNfcAdapter);
mPreference = new Preference(RuntimeEnvironment.application);
}
@Test
@@ -88,17 +76,4 @@ public class DefaultPaymentSettingsPreferenceControllerTest {
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void updateState_shouldSetSummaryToDefaultPaymentApp() {
final PaymentBackend.PaymentAppInfo defaultApp = mock(PaymentBackend.PaymentAppInfo.class);
defaultApp.label = "test_payment_app";
when(mPaymentBackend.getDefaultApp()).thenReturn(defaultApp);
ReflectionHelpers.setField(mController, "mPaymentBackend", mPaymentBackend);
mController.updateState(mPreference);
verify(mPaymentBackend).refresh();
assertThat(mPreference.getSummary()).isEqualTo(defaultApp.label);
}
}