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

[SP26.2] add a method in NetworkStats that removes empty entries

Browse Source 
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692
Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
This commit is contained in:
junyulai
2020-03-31 14:56:01 +08:00
parent 854b55854b
commit 1052557f33
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/net/java/android/net/NetworkStatsTest.java
View File

@@ -502,6 +502,53 @@ public class NetworkStatsTest {
DEFAULT_NETWORK_NO, 64L, 2L, 0L, 0L, 0L); DEFAULT_NETWORK_NO, 64L, 2L, 0L, 0L, 0L);
} }
@Test
public void testRemoveEmptyEntries() throws Exception {
// Test empty stats.
final NetworkStats statsEmpty = new NetworkStats(TEST_START, 3);
assertEquals(0, statsEmpty.removeEmptyEntries().size());
// Test stats with non-zero entry.
final NetworkStats statsNonZero = new NetworkStats(TEST_START, 1)
.insertEntry(TEST_IFACE, 99, SET_DEFAULT, TAG_NONE, METERED_NO,
ROAMING_NO, DEFAULT_NETWORK_NO, 1L, 128L, 0L, 2L, 20L);
assertEquals(1, statsNonZero.size());
final NetworkStats expectedNonZero = statsNonZero.removeEmptyEntries();
assertEquals(1, expectedNonZero.size());
assertValues(expectedNonZero, 0, TEST_IFACE, 99, SET_DEFAULT, TAG_NONE, METERED_NO,
ROAMING_NO, DEFAULT_NETWORK_NO, 1L, 128L, 0L, 2L, 20L);
// Test stats with empty entry.
final NetworkStats statsZero = new NetworkStats(TEST_START, 1)
.insertEntry(TEST_IFACE, 99, SET_DEFAULT, TAG_NONE, METERED_NO,
ROAMING_NO, DEFAULT_NETWORK_NO, 0L, 0L, 0L, 0L, 0L);
assertEquals(1, statsZero.size());
final NetworkStats expectedZero = statsZero.removeEmptyEntries();
assertEquals(1, statsZero.size()); // Assert immutable.
assertEquals(0, expectedZero.size());
// Test stats with multiple entries.
final NetworkStats statsMultiple = new NetworkStats(TEST_START, 0)
.insertEntry(TEST_IFACE, 100, SET_DEFAULT, TAG_NONE, 2L, 64L, 0L, 2L, 20L)
.insertEntry(TEST_IFACE2, 100, SET_DEFAULT, TAG_NONE, 4L, 32L, 0L, 0L, 0L)
.insertEntry(TEST_IFACE, 101, SET_DEFAULT, 0xF00D, 0L, 0L, 0L, 0L, 0L)
.insertEntry(TEST_IFACE, 101, SET_DEFAULT, 0xF00D, 0L, 0L, 0L, 0L, 0L)
.insertEntry(TEST_IFACE2, 100, SET_DEFAULT, 0xF00D, 8L, 0L, 0L, 0L, 0L)
.insertEntry(TEST_IFACE2, 100, SET_FOREGROUND, TAG_NONE, 0L, 8L, 0L, 0L, 0L)
.insertEntry(TEST_IFACE, 101, SET_DEFAULT, TAG_NONE, 0L, 0L, 4L, 0L, 0L)
.insertEntry(TEST_IFACE, 101, SET_DEFAULT, 0xF00D, 0L, 0L, 0L, 2L, 0L)
.insertEntry(TEST_IFACE, 101, SET_DEFAULT, 0xF00D, 0L, 0L, 0L, 0L, 1L);
assertEquals(9, statsMultiple.size());
final NetworkStats expectedMultiple = statsMultiple.removeEmptyEntries();
assertEquals(9, statsMultiple.size()); // Assert immutable.
assertEquals(7, expectedMultiple.size());
assertValues(expectedMultiple.getTotalIncludingTags(null), 14L, 104L, 4L, 4L, 21L);
// Test stats with multiple empty entries.
assertEquals(statsMultiple.size(), statsMultiple.subtract(statsMultiple).size());
assertEquals(0, statsMultiple.subtract(statsMultiple).removeEmptyEntries().size());
}
@Test @Test
public void testClone() throws Exception { public void testClone() throws Exception {
final NetworkStats original = new NetworkStats(TEST_START, 5) final NetworkStats original = new NetworkStats(TEST_START, 5)