Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ec2993 authored by junyulai's avatar junyulai
Browse files

[SP27.2] Rename TestableNetworkStatsProvider 

Currently, TestableNetworkStatsProvider is a subclass of
INetworkStatsProvider. This is not very accurate naming after
API council review feedback since now we have
NetworkStatsProvider as a system api interface.

Thus, this change rename it to TestableNetworkStatsProviderBinder
and create another TestableNetworkStatsProvider to support
subsequent test of NetworkStatsProvider.

Test: atest FrameworksNetTests TetheringTests
Bug: 150643374
Change-Id: I6c359dc718c24c384b827a465980b1c1c24075a0
parent a8782392

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

+3 −3
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package com.android.testutils



import android.net.netstats.provider.INetworkStatsProvider

import android.net.netstats.provider.NetworkStatsProvider

import kotlin.test.assertEquals

import kotlin.test.fail



private const val DEFAULT_TIMEOUT_MS = 200L



open class TestableNetworkStatsProvider : INetworkStatsProvider.Stub() {

open class TestableNetworkStatsProvider : NetworkStatsProvider() {

    sealed class CallbackType {

        data class OnRequestStatsUpdate(val token: Int) : CallbackType()

        data class OnSetLimit(val iface: String?, val quotaBytes: Long) : CallbackType()
@@ -35,7 +35,7 @@ open class TestableNetworkStatsProvider : INetworkStatsProvider.Stub() { 
        history.add(CallbackType.OnRequestStatsUpdate(token))

    }



    override fun onSetLimit(iface: String?, quotaBytes: Long) {

    override fun onSetLimit(iface: String, quotaBytes: Long) {

        history.add(CallbackType.OnSetLimit(iface, quotaBytes))

    }

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

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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 com.android.testutils



import android.net.netstats.provider.INetworkStatsProvider

import kotlin.test.assertEquals

import kotlin.test.fail



private const val DEFAULT_TIMEOUT_MS = 200L



open class TestableNetworkStatsProviderBinder : INetworkStatsProvider.Stub() {

    sealed class CallbackType {

        data class OnRequestStatsUpdate(val token: Int) : CallbackType()

        data class OnSetLimit(val iface: String?, val quotaBytes: Long) : CallbackType()

        data class OnSetAlert(val quotaBytes: Long) : CallbackType()

    }



    private val history = ArrayTrackRecord<CallbackType>().ReadHead()



    override fun onRequestStatsUpdate(token: Int) {

        history.add(CallbackType.OnRequestStatsUpdate(token))

    }



    override fun onSetLimit(iface: String?, quotaBytes: Long) {

        history.add(CallbackType.OnSetLimit(iface, quotaBytes))

    }



    override fun onSetAlert(quotaBytes: Long) {

        history.add(CallbackType.OnSetAlert(quotaBytes))

    }



    fun expectOnRequestStatsUpdate(token: Int) {

        assertEquals(CallbackType.OnRequestStatsUpdate(token), history.poll(DEFAULT_TIMEOUT_MS))

    }



    fun expectOnSetLimit(iface: String?, quotaBytes: Long) {

        assertEquals(CallbackType.OnSetLimit(iface, quotaBytes), history.poll(DEFAULT_TIMEOUT_MS))

    }



    fun expectOnSetAlert(quotaBytes: Long) {

        assertEquals(CallbackType.OnSetAlert(quotaBytes), history.poll(DEFAULT_TIMEOUT_MS))

    }



    @JvmOverloads

    fun assertNoCallback(timeout: Long = DEFAULT_TIMEOUT_MS) {

        val cb = history.poll(timeout)

        cb?.let { fail("Expected no callback but got $cb") }

    }

}