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

Merge changes from topic "remove_wrappers" into pi-dev

Browse Source 
* changes:
  Remove wrapper class for NotificationGroup.
  Remove more wrappers in favor of new Robolectric support
This commit is contained in:
TreeHugger Robot
2018-03-31 01:26:16 +00:00
committed by Android (Google) Code Review
parent 8608f6b000 1781cf2cef
commit e6a18f8105
32 changed files with 160 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
View File

@@ -23,11 +23,11 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.ActionListener;
import android.os.Handler;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.WifiManagerWrapper;
import com.android.settingslib.wifi.AccessPoint;
import org.junit.Before;
@@ -40,12 +40,18 @@ import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
public class SavedAccessPointsWifiSettingsTest {
@Mock private WifiManagerWrapper mockWifiManager;
@Mock private WifiDialog mockWifiDialog;
@Mock private WifiConfigController mockConfigController;
@Mock private WifiConfiguration mockWifiConfiguration;
@Mock private AccessPoint mockAccessPoint;
@Mock private Handler mHandler;
@Mock
private WifiManager mockWifiManager;
@Mock
private WifiDialog mockWifiDialog;
@Mock
private WifiConfigController mockConfigController;
@Mock
private WifiConfiguration mockWifiConfiguration;
@Mock
private AccessPoint mockAccessPoint;
@Mock
private Handler mHandler;
private SavedAccessPointsWifiSettings mSettings;
@@ -97,6 +103,6 @@ public class SavedAccessPointsWifiSettingsTest {
when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
mSettings.onForget(mockWifiDialog);
verify(mockWifiManager)
.forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
.forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
}
}

9
tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
View File

@@ -21,11 +21,11 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.view.inputmethod.InputMethodManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
import com.android.settings.wrapper.WifiManagerWrapper;
import org.junit.After;
import org.junit.Before;
@@ -42,9 +42,9 @@ import org.robolectric.util.ReflectionHelpers;
public class WriteWifiConfigToNfcDialogTest {
@Mock
Activity mActivity;
private Activity mActivity;
@Mock
WifiManagerWrapper mWifiManager;
private WifiManager mWifiManager;
private WriteWifiConfigToNfcDialog mWriteWifiConfigToNfcDialog;
@@ -56,7 +56,8 @@ public class WriteWifiConfigToNfcDialogTest {
.thenReturn(ReflectionHelpers.newInstance(InputMethodManager.class));
mWriteWifiConfigToNfcDialog = new WriteWifiConfigToNfcDialog(RuntimeEnvironment.application,
0 /* security */, mWifiManager);
0 /* security */);
ReflectionHelpers.setField(mWriteWifiConfigToNfcDialog, "mWifiManager", mWifiManager);
mWriteWifiConfigToNfcDialog.setOwnerActivity(mActivity);
mWriteWifiConfigToNfcDialog.onCreate(null /* savedInstanceState */);
}