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

Commit fecc2a33 authored by Cody Kesting's avatar Cody Kesting
Browse files

Fix PolicyListener testing surface. 

This CL updates VcnManager to provide a test-only method for getting
currently registered VcnUnderlyingNetworkPolicyListeners. This is
preferrable over the current method, which accesses VcnManager's private
Map directly.

Bug: 8675309
Test: atest FrameworksVcnTests
Change-Id: I7afd60ff55868ae44bfa74910ae02daf8a81b107
parent 02fe346e

core/java/android/net/vcn/VcnManager.java

+15 −2
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ import android.os.RemoteException; 
import android.os.ServiceSpecificException;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting.Visibility;



import java.io.IOException;

import java.util.Collections;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.Executor;
@@ -67,8 +69,7 @@ import java.util.concurrent.Executor; 
public class VcnManager {

    @NonNull private static final String TAG = VcnManager.class.getSimpleName();



    @VisibleForTesting

    public static final Map<

    private static final Map<

                    VcnUnderlyingNetworkPolicyListener, VcnUnderlyingNetworkPolicyListenerBinder>

            REGISTERED_POLICY_LISTENERS = new ConcurrentHashMap<>();
@@ -88,6 +89,18 @@ public class VcnManager { 
        mService = requireNonNull(service, "missing service");

    }



    /**

     * Get all currently registered VcnUnderlyingNetworkPolicyListeners for testing purposes.

     *

     * @hide

     */

    @VisibleForTesting(visibility = Visibility.PRIVATE)

    @NonNull

    public static Map<VcnUnderlyingNetworkPolicyListener, VcnUnderlyingNetworkPolicyListenerBinder>

            getAllPolicyListeners() {

        return Collections.unmodifiableMap(REGISTERED_POLICY_LISTENERS);

    }



    // TODO: Make setVcnConfig(), clearVcnConfig() Public API

    /**

     * Sets the VCN configuration for a given subscription group.

tests/vcn/java/android/net/vcn/VcnManagerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class VcnManagerTest { 
                ArgumentCaptor.forClass(IVcnUnderlyingNetworkPolicyListener.class);

        verify(mMockVcnManagementService).addVcnUnderlyingNetworkPolicyListener(captor.capture());



        assertTrue(VcnManager.REGISTERED_POLICY_LISTENERS.containsKey(mMockPolicyListener));

        assertTrue(VcnManager.getAllPolicyListeners().containsKey(mMockPolicyListener));



        IVcnUnderlyingNetworkPolicyListener listenerWrapper = captor.getValue();

        listenerWrapper.onPolicyChanged();
@@ -78,7 +78,7 @@ public class VcnManagerTest { 


        mVcnManager.removeVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);



        assertFalse(VcnManager.REGISTERED_POLICY_LISTENERS.containsKey(mMockPolicyListener));

        assertFalse(VcnManager.getAllPolicyListeners().containsKey(mMockPolicyListener));

        verify(mMockVcnManagementService)

                .addVcnUnderlyingNetworkPolicyListener(

                        any(IVcnUnderlyingNetworkPolicyListener.class));
@@ -88,7 +88,7 @@ public class VcnManagerTest { 
    public void testRemoveVcnUnderlyingNetworkPolicyListenerUnknownListener() throws Exception {

        mVcnManager.removeVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);



        assertFalse(VcnManager.REGISTERED_POLICY_LISTENERS.containsKey(mMockPolicyListener));

        assertFalse(VcnManager.getAllPolicyListeners().containsKey(mMockPolicyListener));

        verify(mMockVcnManagementService, never())

                .addVcnUnderlyingNetworkPolicyListener(

                        any(IVcnUnderlyingNetworkPolicyListener.class));