summaryrefslogtreecommitdiff
path: root/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java')
-rw-r--r--libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java54
1 files changed, 21 insertions, 33 deletions
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
index f42b3d22c..42af91531 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
@@ -60,6 +60,7 @@ public class PasspointWifiEntryTest {
public static final int OKAY_RSSI = -60;
public static final int BAD_RSSI = -70;
+ @Mock private WifiTrackerInjector mMockInjector;
@Mock private Context mMockContext;
@Mock private WifiManager mMockWifiManager;
@Mock private Resources mMockResources;
@@ -76,13 +77,6 @@ public class PasspointWifiEntryTest {
@Before
public void setUp() {
- Utils.sFeatureFlagUtilsWrapper = new Utils.FeatureFlagUtilsWrapper() {
- @Override
- boolean isProviderModelEnabled(Context context) {
- return false;
- }
- };
-
MockitoAnnotations.initMocks(this);
mTestLooper = new TestLooper();
@@ -106,8 +100,8 @@ public class PasspointWifiEntryTest {
when(mMockResources.getString(R.string.wifitrackerlib_wifi_passpoint_expired))
.thenReturn(expired);
- PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockContext, mTestHandler,
- passpointConfiguration, mMockWifiManager, mMockScoreCache,
+ PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockInjector, mMockContext,
+ mTestHandler, passpointConfiguration, mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
assertThat(passpointWifiEntry.getSummary()).isNotEqualTo(expired);
@@ -119,8 +113,8 @@ public class PasspointWifiEntryTest {
String expired = "Expired";
when(mMockResources.getString(R.string.wifitrackerlib_wifi_passpoint_expired))
.thenReturn(expired);
- PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockContext, mTestHandler,
- passpointConfiguration, mMockWifiManager, mMockScoreCache,
+ PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockInjector, mMockContext,
+ mTestHandler, passpointConfiguration, mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
PasspointWifiEntry spyEntry = spy(passpointWifiEntry);
when(spyEntry.isExpired()).thenReturn(true);
@@ -139,7 +133,7 @@ public class PasspointWifiEntryTest {
@Test
public void testGetMeteredChoice_afterSetMeteredChoice_getCorrectValue() {
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
@@ -172,7 +166,7 @@ public class PasspointWifiEntryTest {
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
entry.updateConnectionInfo(wifiInfo, networkInfo);
@@ -183,13 +177,7 @@ public class PasspointWifiEntryTest {
}
@Test
- public void testGetSummary_providerModelConnectedButNotDefault_doesNotShowConnected() {
- Utils.sFeatureFlagUtilsWrapper = new Utils.FeatureFlagUtilsWrapper() {
- @Override
- boolean isProviderModelEnabled(Context context) {
- return true;
- }
- };
+ public void testGetSummary_connectedButNotDefault_doesNotShowConnected() {
String summarySeparator = " / ";
String[] wifiStatusArray = new String[]{"", "Scanning", "Connecting",
"Authenticating", "Obtaining IP address", "Connected"};
@@ -212,7 +200,7 @@ public class PasspointWifiEntryTest {
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
entry.updateConnectionInfo(wifiInfo, networkInfo);
@@ -232,7 +220,7 @@ public class PasspointWifiEntryTest {
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
@@ -258,8 +246,8 @@ public class PasspointWifiEntryTest {
when(mMockResources.getString(R.string.wifitrackerlib_wifi_security_passpoint))
.thenReturn(passpointSecurity);
- PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockContext, mTestHandler,
- passpointConfiguration, mMockWifiManager, mMockScoreCache,
+ PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockInjector, mMockContext,
+ mTestHandler, passpointConfiguration, mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
assertThat(passpointWifiEntry.getSecurityString(false)).isEqualTo(passpointSecurity);
@@ -279,7 +267,7 @@ public class PasspointWifiEntryTest {
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
@@ -310,7 +298,7 @@ public class PasspointWifiEntryTest {
@Test
public void testGetSpeed_cacheUpdated_speedValueChanges() {
when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
WifiConfiguration wifiConfig = new WifiConfiguration();
@@ -334,7 +322,7 @@ public class PasspointWifiEntryTest {
when(mMockWifiInfo.getRssi()).thenReturn(BAD_RSSI);
when(mMockWifiInfo.getSSID()).thenReturn("\"ssid\"");
when(mMockWifiInfo.getBSSID()).thenReturn("01:23:45:67:89:ab");
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
WifiConfiguration wifiConfig = new WifiConfiguration();
@@ -352,7 +340,7 @@ public class PasspointWifiEntryTest {
public void testGetSpeed_newScanResults_speedValueChanges() {
when(mMockScoredNetwork.calculateBadge(BAD_RSSI)).thenReturn(SPEED_SLOW);
when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
WifiConfiguration wifiConfig = new WifiConfiguration();
@@ -384,7 +372,7 @@ public class PasspointWifiEntryTest {
NetworkInfo networkInfo =
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
@@ -395,7 +383,7 @@ public class PasspointWifiEntryTest {
@Test
public void testIsAutoJoinEnabled_nullConfigs_returnsFalse() {
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
@@ -406,7 +394,7 @@ public class PasspointWifiEntryTest {
@Test
public void testCanSignIn_captivePortalCapability_returnsTrue() {
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
@@ -421,7 +409,7 @@ public class PasspointWifiEntryTest {
public void testUpdateNetworkCapabilities_userConnect_autoOpenCaptivePortalOnce() {
when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE))
.thenReturn(mMockConnectivityManager);
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
NetworkCapabilities captivePortalCapabilities = new NetworkCapabilities.Builder()
@@ -463,7 +451,7 @@ public class PasspointWifiEntryTest {
NetworkInfo networkInfo =
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
- PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+ PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
false /* forSavedNetworksPage */);
entry.updateConnectionInfo(wifiInfo, networkInfo);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 11:32:08 +0000