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

Commit c628e768 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Don't mock FileDescriptor. am: afc8d7fc am: 94a8a786 am: 0adf129f am:... 

Don't mock FileDescriptor. am: afc8d7fc am: 94a8a786 am: 0adf129f am: 5cc42a9a am: 6f30d0a7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1427532

Change-Id: I20cd2a1de18562416210cda22a8e055161bd09d7
parents 1ea2616c 6f30d0a7

tests/unit/src/com/android/networkstack/netlink/TcpSocketTrackerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ public class TcpSocketTrackerTest { 
    private static final int TEST_NETID2_FWMARK = 0x1A85;

    private static final int NETID_MASK = 0xffff;

    @Mock private TcpSocketTracker.Dependencies mDependencies;

    @Mock private FileDescriptor mMockFd;

    @Mock private INetd mNetd;

    private final Network mNetwork = new Network(TEST_NETID1);

    private final Network mOtherNetwork = new Network(TEST_NETID2);
@@ -226,7 +225,7 @@ public class TcpSocketTrackerTest { 
                Log.setWtfHandler((tag, what, system) -> Log.e(tag, what.getMessage(), what));

        when(mDependencies.getNetd()).thenReturn(mNetd);

        when(mDependencies.isTcpInfoParsingSupported()).thenReturn(true);

        when(mDependencies.connectToKernel()).thenReturn(mMockFd);

        when(mDependencies.connectToKernel()).thenReturn(new FileDescriptor());

        when(mDependencies.getDeviceConfigPropertyInt(

                eq(NAMESPACE_CONNECTIVITY),

                eq(CONFIG_TCP_PACKETS_FAIL_PERCENTAGE),