From 37880f857a3a632ef755e7e5a04f1bc5a36dc169 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Mon, 3 Jan 2022 12:37:33 +0000 Subject: [PATCH] [MS33.2] Remove NetdService dependency This change pass INetd to NetworkStatsFactory to replace NetdService#getNetdInstance. Test: atest FrameworksNetTests Bug: 204830222 Change-Id: I0756188adb394fa5343c8d2ae354567df63acf21 --- .../com/android/server/net/NetworkStatsFactoryTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java index 8d7aa4e589..8340a13814 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java @@ -34,6 +34,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import android.content.res.Resources; +import android.net.INetd; import android.net.NetworkStats; import android.net.TrafficStats; import android.net.UnderlyingNetworkInfo; @@ -54,6 +55,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import java.io.File; import java.io.FileOutputStream; @@ -70,16 +73,19 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { private File mTestProc; private NetworkStatsFactory mFactory; + @Mock + private INetd mNetd; @Before public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); mTestProc = TestIoUtils.createTemporaryDirectory("proc"); // The libandroid_servers which have the native method is not available to // applications. So in order to have a test support native library, the native code // related to networkStatsFactory is compiled to a minimal native library and loaded here. System.loadLibrary("networkstatsfactorytestjni"); - mFactory = new NetworkStatsFactory(mTestProc, false); + mFactory = new NetworkStatsFactory(mTestProc, false, mNetd); mFactory.updateUnderlyingNetworkInfos(new UnderlyingNetworkInfo[0]); }