69b83606ca
Prepare for implementation of client side TrafficStats rate limit cache. 1. Write Typeless versions of getIfaceStats, getUidStats, getTotalStats in INetworkStatsService.aidl that returns NetworkStats instead of Long. This is needed because in follow-up changes, the NetworkStats instead of indiviual numbers will be stored as a cache entry 2. Move some utils from NetworkStatsService to TrafficStats. This is needed because in the follow-up changes, these utils would be both accessed by TrafficStats and NetworkStatsService. Test: CtsNetTestCases:android.net.cts.TrafficStatsTest Test: CtsNetTestCases:android.net.cts.NetworkStatsBinderTest Test: FrameworksNetIntegrationTests:com.android.server.net.\ integrationtests.NetworkStatsIntegrationTest Test: FrameworksNetTests:android.net.connectivity.com.android.\ server.net.NetworkStatsServiceTest Test: FrameworksNetTests:android.net.connectivity.\ android.net.TrafficStatsTest Test: ConnectivityCoverageTests:android.net.connectivity.\ android.net.TrafficStatsTest Bug: 343260158 Change-Id: Iace251e1495fd3b81e072526e92ca97cbc7246eb
46 lines
No EOL
1.6 KiB
Kotlin
46 lines
No EOL
1.6 KiB
Kotlin
/*
|
|
* Copyright (C) 2024 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.net
|
|
|
|
import android.net.TrafficStats.getValueForTypeFromFirstEntry
|
|
import android.net.TrafficStats.TYPE_RX_BYTES
|
|
import android.net.TrafficStats.UNSUPPORTED
|
|
import android.os.Build
|
|
import com.android.testutils.DevSdkIgnoreRule
|
|
import com.android.testutils.DevSdkIgnoreRunner
|
|
import org.junit.Test
|
|
import org.junit.runner.RunWith
|
|
import kotlin.test.assertEquals
|
|
|
|
private const val TEST_IFACE1 = "test_iface1"
|
|
|
|
@RunWith(DevSdkIgnoreRunner::class)
|
|
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
|
|
class TrafficStatsTest {
|
|
|
|
@Test
|
|
fun testGetValueForTypeFromFirstEntry() {
|
|
var stats: NetworkStats = NetworkStats(0, 0)
|
|
// empty stats
|
|
assertEquals(getValueForTypeFromFirstEntry(stats, TYPE_RX_BYTES), UNSUPPORTED.toLong())
|
|
// invalid type
|
|
stats.insertEntry(TEST_IFACE1, 1, 2, 3, 4)
|
|
assertEquals(getValueForTypeFromFirstEntry(stats, 1000), UNSUPPORTED.toLong())
|
|
// valid type
|
|
assertEquals(getValueForTypeFromFirstEntry(stats, TYPE_RX_BYTES), 1)
|
|
}
|
|
} |