WifiTrackerLibTests - remove dependency on hide API

Bug: 148980222
Test: atest com.android.wifitrackerlib
Change-Id: I1973f5eb24d4c95110f4ab459249f37edd6c3a38

5 files changed, 21 insertions, 15 deletions

diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
index 4bba228a3..f1a203455 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
@@ -38,13 +38,16 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import com.android.internal.annotations.VisibleForTesting;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * WifiEntry representation of a subscribed Passpoint network, uniquely identified by FQDN.
  */
-class PasspointWifiEntry extends WifiEntry {
+@VisibleForTesting
+public class PasspointWifiEntry extends WifiEntry {
     static final String KEY_PREFIX = "PasspointWifiEntry:";
 
     private final List<ScanResult> mCurrentHomeScanResults = new ArrayList<>();
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index b5646bc3d..751c6099c 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -49,6 +49,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import com.android.internal.annotations.VisibleForTesting;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -62,7 +64,8 @@ import java.util.stream.Collectors;
  *
  * This type of WifiEntry can represent both open and saved networks.
  */
-class StandardWifiEntry extends WifiEntry {
+@VisibleForTesting
+public class StandardWifiEntry extends WifiEntry {
     static final String KEY_PREFIX = "StandardWifiEntry:";
 
     @Retention(RetentionPolicy.SOURCE)
diff --git a/libs/WifiTrackerLib/tests/Android.bp b/libs/WifiTrackerLib/tests/Android.bp
index b30a2f1a3..0abd40148 100644
--- a/libs/WifiTrackerLib/tests/Android.bp
+++ b/libs/WifiTrackerLib/tests/Android.bp
@@ -28,6 +28,5 @@ android_test {
         "android.test.mock",
     ],
 
-    defaults: ["framework-wifi-test-defaults"],
-    certificate: "platform", // need platform certificate to access @hide APIs
+    platform_apis: true,
 }
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
index 11e598b6a..2c00d32aa 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
@@ -16,9 +16,9 @@
 
 package com.android.wifitrackerlib;
 
-
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -54,9 +54,8 @@ public class PasspointWifiEntryTest {
 
     @Test
     public void testGetSummary_expiredTimeNotAvailable_notShowExpired() {
-        long notSpecifiedExpiredTimeMilli = -1;
+        // default SubscriptionExpirationTimeInMillis is unset
         PasspointConfiguration passpointConfiguration = getPasspointConfiguration();
-        passpointConfiguration.setSubscriptionExpirationTimeInMillis(notSpecifiedExpiredTimeMilli);
         String expired = "Expired";
         when(mMockResources.getString(R.string.wifi_passpoint_expired)).thenReturn(expired);
 
@@ -68,16 +67,15 @@ public class PasspointWifiEntryTest {
 
     @Test
     public void testGetSummary_expired_showExpired() {
-        long expiredTimeMilli = 100;
         PasspointConfiguration passpointConfiguration = getPasspointConfiguration();
-        passpointConfiguration.setSubscriptionExpirationTimeInMillis(expiredTimeMilli);
         String expired = "Expired";
         when(mMockResources.getString(R.string.wifi_passpoint_expired)).thenReturn(expired);
-
         PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockContext, mTestHandler,
                 passpointConfiguration, mMockWifiManager);
+        PasspointWifiEntry spyEntry = spy(passpointWifiEntry);
+        when(spyEntry.isExpired()).thenReturn(true);
 
-        assertThat(passpointWifiEntry.getSummary()).isEqualTo(expired);
+        assertThat(spyEntry.getSummary()).isEqualTo(expired);
     }
 
     private PasspointConfiguration getPasspointConfiguration() {
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
index 577ea96db..09dfb033c 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
@@ -33,6 +33,7 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -408,10 +409,13 @@ public class StandardWifiEntryTest {
         config.SSID = "\"ssid\"";
         config.networkId = 1;
         config.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT;
-        config.setRandomizedMacAddress(MacAddress.fromString(randomizedMac));
+        WifiConfiguration spyConfig = spy(config);
+        when(spyConfig.getRandomizedMacAddress())
+                .thenReturn(MacAddress.fromString(randomizedMac));
+
         final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityToStandardWifiEntryKey("ssid", SECURITY_EAP),
-                config, mMockWifiManager);
+                spyConfig, mMockWifiManager);
 
         final String macAddress = entry.getMacAddress();
 
@@ -556,8 +560,7 @@ public class StandardWifiEntryTest {
         when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mockConnectivityManager);
 
-        final WifiInfo wifiInfo = new WifiInfo();
-        wifiInfo.setNetworkId(networkId);
+        final WifiInfo wifiInfo = new WifiInfo.Builder().setNetworkId(networkId).build();
         final NetworkInfo networkInfo =
                 new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
         networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");