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

Commit bad33538 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix PolicyListener testing surface." am: c5bc3bcd am:... 

Merge "Merge "Fix PolicyListener testing surface." am: c5bc3bcd am: 3b1c79bd am: fb11991c" into sc-dev
parents a290be05 1d6229ef

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));