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

Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda

Browse Source 
Change-Id: I260656236087cc7a0bff2f278a90dc7f3d52b688
This commit is contained in:
TreeHugger Robot
2020-03-18 05:37:14 +00:00
committed by Automerger Merge Worker
parent 1b14eb0eef a2a1056dda
commit 17962d8186
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
View File

@@ -71,7 +71,8 @@ public class ConfigureWifiEntryFragment extends InstrumentedFragment implements
private Button mSubmitBtn;
private Button mCancelBtn;
private WifiEntry mWifiEntry;
private NetworkDetailsTracker mNetworkDetailsTracker;
@VisibleForTesting
NetworkDetailsTracker mNetworkDetailsTracker;
private HandlerThread mWorkerThread;
@Override

13
tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java
View File

@@ -24,21 +24,17 @@ import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.wifitrackerlib.NetworkDetailsTracker;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.androidx.fragment.FragmentController;
// TODO(b/70983952): Can't test because b/146802959, should remove @Ignore tag after it's fixed.
@Ignore
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowConnectivityManager.class)
public class ConfigureWifiEntryFragmentTest {
private static final String KEY_SSID = "key_ssid";
@@ -46,6 +42,9 @@ public class ConfigureWifiEntryFragmentTest {
private ConfigureWifiEntryFragment mConfigureWifiEntryFragment;
@Mock
private NetworkDetailsTracker mNetworkDetailsTracker;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -55,6 +54,8 @@ public class ConfigureWifiEntryFragmentTest {
bundle.putInt(KEY_SECURITY, 1 /* WEP */);
mConfigureWifiEntryFragment = spy(new ConfigureWifiEntryFragment());
mConfigureWifiEntryFragment.setArguments(bundle);
mConfigureWifiEntryFragment.mNetworkDetailsTracker = mNetworkDetailsTracker;
FragmentController.setupFragment(mConfigureWifiEntryFragment);
}