Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d9177a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide saved network preference when there is none."

parents 5baaa7ae 015c7706

src/com/android/settings/wifi/WifiSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ public class WifiSettings extends RestrictedSettingsFragment 


            case WifiManager.WIFI_STATE_DISABLED:

                setOffMessage();

                setAdditionalSettingsSummaries();

                setProgressBarVisible(false);

                break;

        }

tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

+33 −18
Original line number Diff line number Diff line
@@ -15,20 +15,6 @@ 
 */

package com.android.settings.wifi;



import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;

import static android.support.test.espresso.assertion.ViewAssertions.matches;

import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;

import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;

import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;

import static android.support.test.espresso.matcher.ViewMatchers.withText;

import static com.google.common.truth.Truth.assertThat;

import static org.hamcrest.Matchers.allOf;

import static org.hamcrest.Matchers.not;

import static org.hamcrest.Matchers.startsWith;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.Fragment;

import android.content.Context;

import android.content.Intent;
@@ -41,12 +27,15 @@ import android.net.wifi.WifiSsid; 
import android.support.test.InstrumentationRegistry;

import android.support.test.rule.ActivityTestRule;

import android.support.test.runner.AndroidJUnit4;



import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settingslib.wifi.AccessPoint;

import com.android.settingslib.wifi.WifiTracker;

import com.android.settingslib.wifi.WifiTracker.WifiListener;

import com.android.settingslib.wifi.WifiTrackerFactory;



import com.google.common.collect.Lists;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -56,6 +45,20 @@ import org.mockito.MockitoAnnotations; 


import java.util.List;



import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;

import static android.support.test.espresso.assertion.ViewAssertions.matches;

import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;

import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;

import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;

import static android.support.test.espresso.matcher.ViewMatchers.withText;

import static com.google.common.truth.Truth.assertThat;

import static org.hamcrest.Matchers.allOf;

import static org.hamcrest.Matchers.not;

import static org.hamcrest.Matchers.startsWith;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



@RunWith(AndroidJUnit4.class)

public class WifiSettingsUiTest {
@@ -76,8 +79,10 @@ public class WifiSettingsUiTest { 
    private static final int TEST_RSSI = 123;

    private static final int TEST_NETWORK_ID = 1;



    @Mock private WifiTracker mWifiTracker;

    @Mock private WifiManager mWifiManager;

    @Mock

    private WifiTracker mWifiTracker;

    @Mock

    private WifiManager mWifiManager;

    private Context mContext;

    private WifiListener mWifiListener;
@@ -152,7 +157,7 @@ public class WifiSettingsUiTest { 
    }



    @Test

    public void noSavedNetworks_shouldNotShowSavedNetworksButton() {

    public void noSavedNetworks_wifiEnabled_shouldNotShowSavedNetworksButton() {

        setWifiState(WifiManager.WIFI_STATE_ENABLED);

        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
@@ -161,6 +166,16 @@ public class WifiSettingsUiTest { 
        onView(withText(SAVED_NETWORKS)).check(matches(not(isDisplayed())));

    }



    @Test

    public void noSavedNetworks_wifiDisabled_shouldNotShowSavedNetworksButton() {

        setWifiState(WifiManager.WIFI_STATE_DISABLED);

        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);



        launchActivity();



        onView(withText(SAVED_NETWORKS)).check(doesNotExist());

    }



    @Test

    public void savedNetworksExist_shouldShowSavedNetworksButton() {

        setWifiState(WifiManager.WIFI_STATE_ENABLED);