[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest

Remove the @Ignore tag in ConfigureWifiEntryFragmentTest, and add a fake NetworkDetailsTracker to pass test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
Change-Id: Icf06d27030fa2c68d3c2bee03beb583592beb599
This commit is contained in:
govenliu
2020-03-17 17:58:41 +08:00
parent 42a906d874
commit 26b70a9bc7
2 changed files with 9 additions and 7 deletions

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

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);
}