Merge changes from topic "stats-migration"
* changes: Skip PersistentIntTest on S- device Don't clobber existing history entries. Ensure NetworkStats migrated snapshot is identical [MS82.1] Support network stats data migration process Add a PersistentInt class.
This commit is contained in:
commit
bcdb3c12ee
1 changed files with 948 additions and 82 deletions
|
|
@ -27,6 +27,7 @@ import org.junit.Test
|
|||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertFailsWith
|
||||
|
||||
@ConnectivityModuleTest
|
||||
@RunWith(JUnit4::class)
|
||||
|
|
@ -51,12 +52,22 @@ class NetworkStatsHistoryTest {
|
|||
.build()
|
||||
statsSingle.assertEntriesEqual(entry1)
|
||||
assertEquals(DateUtils.HOUR_IN_MILLIS, statsSingle.bucketDuration)
|
||||
|
||||
// Verify the builder throws if the timestamp of added entry is not greater than
|
||||
// that of any previously-added entry.
|
||||
assertFailsWith(IllegalArgumentException::class) {
|
||||
NetworkStatsHistory
|
||||
.Builder(DateUtils.SECOND_IN_MILLIS, /* initialCapacity */ 0)
|
||||
.addEntry(entry1).addEntry(entry2).addEntry(entry3)
|
||||
.build()
|
||||
}
|
||||
|
||||
val statsMultiple = NetworkStatsHistory
|
||||
.Builder(DateUtils.SECOND_IN_MILLIS, /* initialCapacity */ 0)
|
||||
.addEntry(entry1).addEntry(entry2).addEntry(entry3)
|
||||
.addEntry(entry3).addEntry(entry1).addEntry(entry2)
|
||||
.build()
|
||||
assertEquals(DateUtils.SECOND_IN_MILLIS, statsMultiple.bucketDuration)
|
||||
statsMultiple.assertEntriesEqual(entry1, entry2, entry3)
|
||||
statsMultiple.assertEntriesEqual(entry3, entry1, entry2)
|
||||
}
|
||||
|
||||
fun NetworkStatsHistory.assertEntriesEqual(vararg entries: NetworkStatsHistory.Entry) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue