LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove hidden connectivity methods usage in ethernet test

Browse Source 
Bug: 182859030
Test: atest EthernetTrackerTest
Test: 1. remove framework-connectivity.impl from framework bp
      2. cd frameworks/opt/net/ethernet/tests ; mm
Change-Id: Ifaeebfca75dc77eec30dd722ddb3166610795b26
This commit is contained in:
Chiachang Wang
2021-04-14 16:31:37 +08:00
parent 19b7b3dfbd
commit 58e0c49c2e
1 changed files with 21 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
View File

@@ -19,6 +19,7 @@ package com.android.server.ethernet;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.net.InetAddresses;
import android.net.IpConfiguration; import android.net.IpConfiguration;
import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings; import android.net.IpConfiguration.ProxySettings;
@@ -33,6 +34,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList;
@SmallTest @SmallTest
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@@ -46,28 +48,26 @@ public class EthernetTrackerTest {
assertStaticConfiguration(new StaticIpConfiguration(), ""); assertStaticConfiguration(new StaticIpConfiguration(), "");
// Setting only the IP address properly cascades and assumes defaults // Setting only the IP address properly cascades and assumes defaults
assertStaticConfiguration( assertStaticConfiguration(new StaticIpConfiguration.Builder()
new StaticIpConfigBuilder().setIp("192.0.2.10/24").build(), .setIpAddress(new LinkAddress("192.0.2.10/24")).build(), "ip=192.0.2.10/24");
"ip=192.0.2.10/24");
final ArrayList<InetAddress> dnsAddresses = new ArrayList<>();
dnsAddresses.add(InetAddresses.parseNumericAddress("4.4.4.4"));
dnsAddresses.add(InetAddresses.parseNumericAddress("8.8.8.8"));
// Setting other fields properly cascades them // Setting other fields properly cascades them
assertStaticConfiguration( assertStaticConfiguration(new StaticIpConfiguration.Builder()
new StaticIpConfigBuilder() .setIpAddress(new LinkAddress("192.0.2.10/24"))
.setIp("192.0.2.10/24") .setDnsServers(dnsAddresses)
.setDns(new String[] {"4.4.4.4", "8.8.8.8"}) .setGateway(InetAddresses.parseNumericAddress("192.0.2.1"))
.setGateway("192.0.2.1") .setDomains("android").build(),
.setDomains("android")
.build(),
"ip=192.0.2.10/24 dns=4.4.4.4,8.8.8.8 gateway=192.0.2.1 domains=android"); "ip=192.0.2.10/24 dns=4.4.4.4,8.8.8.8 gateway=192.0.2.1 domains=android");
// Verify order doesn't matter // Verify order doesn't matter
assertStaticConfiguration( assertStaticConfiguration(new StaticIpConfiguration.Builder()
new StaticIpConfigBuilder() .setIpAddress(new LinkAddress("192.0.2.10/24"))
.setIp("192.0.2.10/24") .setDnsServers(dnsAddresses)
.setDns(new String[] {"4.4.4.4", "8.8.8.8"}) .setGateway(InetAddresses.parseNumericAddress("192.0.2.1"))
.setGateway("192.0.2.1") .setDomains("android").build(),
.setDomains("android")
.build(),
"domains=android ip=192.0.2.10/24 gateway=192.0.2.1 dns=4.4.4.4,8.8.8.8 "); "domains=android ip=192.0.2.10/24 gateway=192.0.2.1 dns=4.4.4.4,8.8.8.8 ");
} }
@@ -96,43 +96,15 @@ public class EthernetTrackerTest {
private void assertStaticConfiguration(StaticIpConfiguration expectedStaticIpConfig, private void assertStaticConfiguration(StaticIpConfiguration expectedStaticIpConfig,
String configAsString) { String configAsString) {
IpConfiguration expectedIpConfiguration = new IpConfiguration(IpAssignment.STATIC, final IpConfiguration expectedIpConfiguration = new IpConfiguration();
ProxySettings.NONE, expectedStaticIpConfig, null); expectedIpConfiguration.setIpAssignment(IpAssignment.STATIC);
expectedIpConfiguration.setProxySettings(ProxySettings.NONE);
expectedIpConfiguration.setStaticIpConfiguration(expectedStaticIpConfig);
assertEquals(expectedIpConfiguration, assertEquals(expectedIpConfiguration,
EthernetTracker.parseStaticIpConfiguration(configAsString)); EthernetTracker.parseStaticIpConfiguration(configAsString));
} }
private static class StaticIpConfigBuilder {
private final StaticIpConfiguration config = new StaticIpConfiguration();
StaticIpConfigBuilder setIp(String address) {
config.ipAddress = new LinkAddress(address);
return this;
}
StaticIpConfigBuilder setDns(String[] dnsArray) {
for (String dns : dnsArray) {
config.dnsServers.add(InetAddress.parseNumericAddress(dns));
}
return this;
}
StaticIpConfigBuilder setGateway(String gateway) {
config.gateway = InetAddress.parseNumericAddress(gateway);
return this;
}
StaticIpConfigBuilder setDomains(String domains) {
config.domains = domains;
return this;
}
StaticIpConfiguration build() {
return new StaticIpConfiguration(config);
}
}
private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearAll) { private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearAll) {
final NetworkCapabilities.Builder builder = final NetworkCapabilities.Builder builder =
clearAll ? new NetworkCapabilities.Builder().clearAll() clearAll ? new NetworkCapabilities.Builder().clearAll()