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

Merge "Fix a failing robotest"

Browse Source
This commit is contained in:
Fan Zhang
2018-02-16 16:51:29 +00:00
committed by Android (Google) Code Review
parent 36bfc04c85 aa220b68f5
commit a8d70f7c4d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.datausage; package com.android.settings.datausage;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.doReturn;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
@@ -68,8 +71,10 @@ public class DataUsageSummaryPreferenceControllerTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = spy(RuntimeEnvironment.application);
doReturn("%1$s %2%s").when(mContext)
.getString(com.android.internal.R.string.fileSizeSuffix);
mController = new DataUsageSummaryPreferenceController( mController = new DataUsageSummaryPreferenceController(
mContext, mContext,
mDataUsageController, mDataUsageController,