Merge "[SP26.1] Add assert function for parceling NetworkStats" am: 2b2820db8e (29058acd) · Commits · e / os / android_packages_modules_NetworkStack

tests/lib/src/com/android/testutils/NetworkStatsUtils.kt

+22 −6

Original line number	Diff line number	Diff line
		@@ -29,16 +29,24 @@ fun orderInsensitiveEquals(
		if (compareTime && leftStats.getElapsedRealtime() != rightStats.getElapsedRealtime()) {
		return false
		}
		if (leftStats.size() != rightStats.size()) return false

		// While operations such as add/subtract will preserve empty entries. This will make
		// the result be hard to verify during test. Remove them before comparing since they
		// are not really affect correctness.
		// TODO (b/152827872): Remove empty entries after addition/subtraction.
		val leftTrimmedEmpty = leftStats.removeEmptyEntries()
		val rightTrimmedEmpty = rightStats.removeEmptyEntries()

		if (leftTrimmedEmpty.size() != rightTrimmedEmpty.size()) return false
		val left = NetworkStats.Entry()
		val right = NetworkStats.Entry()
		// Order insensitive compare.
		for (i in 0 until leftStats.size()) {
		leftStats.getValues(i, left)
		val j: Int = rightStats.findIndexHinted(left.iface, left.uid, left.set, left.tag,
		for (i in 0 until leftTrimmedEmpty.size()) {
		leftTrimmedEmpty.getValues(i, left)
		val j: Int = rightTrimmedEmpty.findIndexHinted(left.iface, left.uid, left.set, left.tag,
		left.metered, left.roaming, left.defaultNetwork, i)
		if (j == -1) return false
		rightStats.getValues(j, right)
		rightTrimmedEmpty.getValues(j, right)
		if (left != right) return false
		}
		return true
		@@ -60,3 +68,11 @@ fun assertNetworkStatsEquals(
		assertTrue(orderInsensitiveEquals(expected, actual, compareTime),
		"expected: " + expected + " but was: " + actual)
		}

		/**
		* Assert that after being parceled then unparceled, {@link NetworkStats} is equal to the original
		* object.
		*/
		fun assertParcelingIsLossless(stats: NetworkStats) {
		assertParcelingIsLossless(stats, { a, b -> orderInsensitiveEquals(a, b) })
		}

tests/lib/src/com/android/testutils/ParcelUtils.kt

+17 −7

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.testutils

		import android.os.Parcel
		import android.os.Parcelable
		import kotlin.test.assertEquals
		import kotlin.test.assertTrue
		import kotlin.test.fail

		/**
		@@ -46,13 +46,23 @@ fun <T: Parcelable> parcelingRoundTrip(source: T): T {

		/**
		* Assert that after being parceled then unparceled, `source` is equal to the original
		* object.
		* object. If a customized equals function is provided, uses the provided one.
		*/
		fun <T: Parcelable> assertParcelingIsLossless(source: T) {
		assertEquals(source, parcelingRoundTrip(source))
		@JvmOverloads
		fun <T : Parcelable> assertParcelingIsLossless(
		source: T,
		equals: (T, T) -> Boolean = { a, b -> a == b }
		) {
		val actual = parcelingRoundTrip(source)
		assertTrue(equals(source, actual), "Expected $source, but was $actual")
		}

		fun <T: Parcelable> assertParcelSane(obj: T, fieldCount: Int) {
		@JvmOverloads
		fun <T : Parcelable> assertParcelSane(
		obj: T,
		fieldCount: Int,
		equals: (T, T) -> Boolean = { a, b -> a == b }
		) {
		assertFieldCountEquals(fieldCount, obj::class.java)
		assertParcelingIsLossless(obj)
		assertParcelingIsLossless(obj, equals)
		}