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

Merge "Remove ForceAllNetworkTypes from test"

Browse Source
This commit is contained in:
Aaron Huang
2021-09-17 12:08:59 +00:00
committed by Gerrit Code Review
parent 3cbd991ab4 7b4a4cbdd4
commit f7762c823a
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java
View File

@@ -98,14 +98,11 @@ public class NetworkStatsCollectionTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
sOriginalClock = RecurrenceRule.sClock; sOriginalClock = RecurrenceRule.sClock;
// ignore any device overlay while testing
NetworkTemplate.forceAllNetworkTypes();
} }
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
RecurrenceRule.sClock = sOriginalClock; RecurrenceRule.sClock = sOriginalClock;
NetworkTemplate.resetForceAllNetworkTypes();
} }
private void setClock(Instant instant) { private void setClock(Instant instant) {
@@ -123,7 +120,7 @@ public class NetworkStatsCollectionTest {
// verify that history read correctly // verify that history read correctly
assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI), assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
636016770L, 709306L, 88038768L, 518836L, NetworkStatsAccess.Level.DEVICE); 636014522L, 709291L, 88037144L, 518820L, NetworkStatsAccess.Level.DEVICE);
// now export into a unified format // now export into a unified format
final ByteArrayOutputStream bos = new ByteArrayOutputStream(); final ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -137,7 +134,7 @@ public class NetworkStatsCollectionTest {
// and read back into structure, verifying that totals are same // and read back into structure, verifying that totals are same
collection.read(new ByteArrayInputStream(bos.toByteArray())); collection.read(new ByteArrayInputStream(bos.toByteArray()));
assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI), assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
636016770L, 709306L, 88038768L, 518836L, NetworkStatsAccess.Level.DEVICE); 636014522L, 709291L, 88037144L, 518820L, NetworkStatsAccess.Level.DEVICE);
} }
@Test @Test
@@ -151,7 +148,7 @@ public class NetworkStatsCollectionTest {
// verify that history read correctly // verify that history read correctly
assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI), assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
637076152L, 711413L, 88343717L, 521022L, NetworkStatsAccess.Level.DEVICE); 637073904L, 711398L, 88342093L, 521006L, NetworkStatsAccess.Level.DEVICE);
// now export into a unified format // now export into a unified format
final ByteArrayOutputStream bos = new ByteArrayOutputStream(); final ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -165,7 +162,7 @@ public class NetworkStatsCollectionTest {
// and read back into structure, verifying that totals are same // and read back into structure, verifying that totals are same
collection.read(new ByteArrayInputStream(bos.toByteArray())); collection.read(new ByteArrayInputStream(bos.toByteArray()));
assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI), assertSummaryTotal(collection, buildTemplateMobileAll(TEST_IMSI),
637076152L, 711413L, 88343717L, 521022L, NetworkStatsAccess.Level.DEVICE); 637073904L, 711398L, 88342093L, 521006L, NetworkStatsAccess.Level.DEVICE);
} }
@Test @Test