Update NetworkStackTests for jarjar usage
Make the tests pass regardless of class names.
Bug: 227694415
Test: atest ConnectivityCoverageTests
Change-Id: Ib5ca4dfc980c813b43eb55a5985e5023d23f077d
diff --git a/tests/unit/src/android/net/dhcp/DhcpResultsParcelableUtilTest.java b/tests/unit/src/android/net/dhcp/DhcpResultsParcelableUtilTest.java
index 8ab7404..126f6c2 100644
--- a/tests/unit/src/android/net/dhcp/DhcpResultsParcelableUtilTest.java
+++ b/tests/unit/src/android/net/dhcp/DhcpResultsParcelableUtilTest.java
@@ -25,6 +25,7 @@
import static org.junit.Assert.assertEquals;
import android.net.DhcpResults;
+import android.net.DhcpResultsParcelable;
import android.net.LinkAddress;
import android.net.shared.IpConfigurationParcelableUtil;
@@ -124,7 +125,8 @@
@Test
public void testToString() {
final String expected = ""
- + "android.net.DhcpResultsParcelable{baseConfiguration: IP address 192.168.42.19/25"
+ + DhcpResultsParcelable.class.getName()
+ + "{baseConfiguration: IP address 192.168.42.19/25"
+ " Gateway 192.168.42.42 DNS servers: [ 8.8.8.8 192.168.43.43 ]"
+ " Domains example.com, leaseDuration: 3600, mtu: 1450,"
+ " serverAddress: 192.168.44.44, vendorInfo: TEST_VENDOR_INFO,"
diff --git a/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt b/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt
index d8864e6..0753b29 100644
--- a/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt
+++ b/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt
@@ -73,8 +73,10 @@
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
+ // Use DESCRIPTOR and not class name, as the descriptor is the original class name before
+ // jarjar, and is always what is used to query the interface.
doReturn(mConnector).`when`(mConnectorBinder).queryLocalInterface(
- INetworkStackConnector::class.qualifiedName!!)
+ INetworkStackConnector.DESCRIPTOR)
}
@After
diff --git a/tests/unit/src/android/net/shared/ProvisioningConfigurationTest.java b/tests/unit/src/android/net/shared/ProvisioningConfigurationTest.java
index 716abaa..2734fd2 100644
--- a/tests/unit/src/android/net/shared/ProvisioningConfigurationTest.java
+++ b/tests/unit/src/android/net/shared/ProvisioningConfigurationTest.java
@@ -34,10 +34,14 @@
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
+import android.net.InformationElementParcelable;
+import android.net.InitialConfigurationParcelable;
+import android.net.Layer2InformationParcelable;
import android.net.LinkAddress;
import android.net.MacAddress;
import android.net.Network;
import android.net.ProvisioningConfigurationParcelable;
+import android.net.ScanResultInfoParcelable;
import android.net.StaticIpConfiguration;
import android.net.apf.ApfCapabilities;
import android.net.networkstack.aidl.dhcp.DhcpOption;
@@ -288,21 +292,28 @@
}
private static final String TEMPLATE = ""
- + "android.net.ProvisioningConfigurationParcelable{enableIPv4: true, enableIPv6: true,"
+ + ProvisioningConfigurationParcelable.class.getName()
+ + "{enableIPv4: true, enableIPv6: true,"
+ " usingMultinetworkPolicyTracker: true,"
+ " usingIpReachabilityMonitor: true, requestedPreDhcpActionMs: 42,"
- + " initialConfig: android.net.InitialConfigurationParcelable{ipAddresses:"
- + " [192.168.42.42/24], directlyConnectedRoutes: [], dnsServers: [], gateway: null},"
+ + " initialConfig: "
+ + InitialConfigurationParcelable.class.getName()
+ + "{ipAddresses: [192.168.42.42/24],"
+ + " directlyConnectedRoutes: [], dnsServers: [], gateway: null},"
+ " staticIpConfig: IP address 2001:db8::42/90 Gateway DNS servers: [ ] Domains ,"
+ " apfCapabilities: ApfCapabilities{version: 1, maxSize: 2, format: 3},"
+ " provisioningTimeoutMs: 4200, ipv6AddrGenMode: 123, network: 321,"
- + " displayName: test_config, enablePreconnection: false, scanResultInfo:"
- + " android.net.ScanResultInfoParcelable{ssid: ssid, bssid: 01:02:03:04:05:06,"
- + " informationElements: [android.net.InformationElementParcelable{id: 221,"
- + " payload: [0, 23, -14, 6, 1, 1, 3, 1, 0, 0]}]}, layer2Info:"
- + " android.net.Layer2InformationParcelable{l2Key: some l2key,"
- + " cluster: some cluster, bssid: %s},"
- + " options: [android.net.networkstack.aidl.dhcp.DhcpOption{type: 60,"
+ + " displayName: test_config, enablePreconnection: false, scanResultInfo: "
+ + ScanResultInfoParcelable.class.getName()
+ + "{ssid: ssid, bssid: 01:02:03:04:05:06,"
+ + " informationElements: ["
+ + InformationElementParcelable.class.getName()
+ + "{id: 221, payload: [0, 23, -14, 6, 1, 1, 3, 1, 0, 0]}]}, layer2Info: "
+ + Layer2InformationParcelable.class.getName()
+ + "{l2Key: some l2key, cluster: some cluster, bssid: %s},"
+ + " options: ["
+ + DhcpOption.class.getName()
+ + "{type: 60,"
+ " value: [97, 110, 100, 114, 111, 105, 100, 45, 100, 104, 99, 112, 45, 49, 49]}],"
+ " ipv4ProvisioningMode: 2, ipv6ProvisioningMode: 1}";
