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

Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." am: 287c4adbc9 am: d876b4ef76 am: c4cf86b9ad

Browse Source 
Change-Id: Iae8c37ceeae1616b2b0edc43248e72f3de082f20
This commit is contained in:
Automerger Merge Worker
2020-02-12 17:50:39 +00:00
parent 4abcc22959 c4cf86b9ad
commit 9a0752cc57
3 changed files with 141 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java
View File

@@ -146,17 +146,14 @@ public class ConnectivityDiagnosticsManagerTest {
@Test
public void testConnectivityReportEquals() {
assertEquals(createSampleConnectivityReport(), createSampleConnectivityReport());
assertEquals(createDefaultConnectivityReport(), createDefaultConnectivityReport());
final ConnectivityReport defaultReport = createDefaultConnectivityReport();
final ConnectivityReport sampleReport = createSampleConnectivityReport();
assertEquals(sampleReport, createSampleConnectivityReport());
assertEquals(defaultReport, createDefaultConnectivityReport());
final LinkProperties linkProperties = new LinkProperties();
linkProperties.setInterfaceName(INTERFACE_NAME);
final NetworkCapabilities networkCapabilities = new NetworkCapabilities();
networkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_IMS);
final PersistableBundle bundle = new PersistableBundle();
bundle.putString(BUNDLE_KEY, BUNDLE_VALUE);
final LinkProperties linkProperties = sampleReport.getLinkProperties();
final NetworkCapabilities networkCapabilities = sampleReport.getNetworkCapabilities();
final PersistableBundle bundle = sampleReport.getAdditionalInfo();
assertNotEquals(
createDefaultConnectivityReport(),
@@ -206,39 +203,104 @@ public class ConnectivityDiagnosticsManagerTest {
}
private DataStallReport createSampleDataStallReport() {
final LinkProperties linkProperties = new LinkProperties();
linkProperties.setInterfaceName(INTERFACE_NAME);
final PersistableBundle bundle = new PersistableBundle();
bundle.putString(BUNDLE_KEY, BUNDLE_VALUE);
return new DataStallReport(new Network(NET_ID), TIMESTAMP, DETECTION_METHOD, bundle);
final NetworkCapabilities networkCapabilities = new NetworkCapabilities();
networkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_IMS);
return new DataStallReport(
new Network(NET_ID),
TIMESTAMP,
DETECTION_METHOD,
linkProperties,
networkCapabilities,
bundle);
}
private DataStallReport createDefaultDataStallReport() {
return new DataStallReport(new Network(0), 0L, 0, PersistableBundle.EMPTY);
return new DataStallReport(
new Network(0),
0L,
0,
new LinkProperties(),
new NetworkCapabilities(),
PersistableBundle.EMPTY);
}
@Test
public void testDataStallReportEquals() {
assertEquals(createSampleDataStallReport(), createSampleDataStallReport());
assertEquals(createDefaultDataStallReport(), createDefaultDataStallReport());
final DataStallReport defaultReport = createDefaultDataStallReport();
final DataStallReport sampleReport = createSampleDataStallReport();
assertEquals(sampleReport, createSampleDataStallReport());
assertEquals(defaultReport, createDefaultDataStallReport());
final PersistableBundle bundle = new PersistableBundle();
bundle.putString(BUNDLE_KEY, BUNDLE_VALUE);
final LinkProperties linkProperties = sampleReport.getLinkProperties();
final NetworkCapabilities networkCapabilities = sampleReport.getNetworkCapabilities();
final PersistableBundle bundle = sampleReport.getStallDetails();
assertNotEquals(
createDefaultDataStallReport(),
new DataStallReport(new Network(NET_ID), 0L, 0, PersistableBundle.EMPTY));
defaultReport,
new DataStallReport(
new Network(NET_ID),
0L,
0,
new LinkProperties(),
new NetworkCapabilities(),
PersistableBundle.EMPTY));
assertNotEquals(
createDefaultDataStallReport(),
new DataStallReport(new Network(0), TIMESTAMP, 0, PersistableBundle.EMPTY));
defaultReport,
new DataStallReport(
new Network(0),
TIMESTAMP,
0,
new LinkProperties(),
new NetworkCapabilities(),
PersistableBundle.EMPTY));
assertNotEquals(
createDefaultDataStallReport(),
new DataStallReport(new Network(0), 0L, DETECTION_METHOD, PersistableBundle.EMPTY));
defaultReport,
new DataStallReport(
new Network(0),
0L,
DETECTION_METHOD,
new LinkProperties(),
new NetworkCapabilities(),
PersistableBundle.EMPTY));
assertNotEquals(
createDefaultDataStallReport(), new DataStallReport(new Network(0), 0L, 0, bundle));
defaultReport,
new DataStallReport(
new Network(0),
0L,
0,
linkProperties,
new NetworkCapabilities(),
PersistableBundle.EMPTY));
assertNotEquals(
defaultReport,
new DataStallReport(
new Network(0),
0L,
0,
new LinkProperties(),
networkCapabilities,
PersistableBundle.EMPTY));
assertNotEquals(
defaultReport,
new DataStallReport(
new Network(0),
0L,
0,
new LinkProperties(),
new NetworkCapabilities(),
bundle));
}
@Test
public void testDataStallReportParcelUnparcel() {
assertParcelSane(createSampleDataStallReport(), 4);
assertParcelSane(createSampleDataStallReport(), 6);
}
@Test