LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Address comments from aosp/1298476"

Browse Source
This commit is contained in:
Aaron Huang
2020-06-18 10:18:57 +00:00
committed by Gerrit Code Review
parent 3fdad73a32 69bfb5afea
commit 48fbda02b0
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -245,7 +245,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
@Override @Override
public NetworkStatsSubscriptionsMonitor makeSubscriptionsMonitor( public NetworkStatsSubscriptionsMonitor makeSubscriptionsMonitor(
@NonNull Context context, @NonNull Executor executor, @NonNull Context context, @NonNull Looper looper, @NonNull Executor executor,
@NonNull NetworkStatsService service) { @NonNull NetworkStatsService service) {
return mNetworkStatsSubscriptionsMonitor; return mNetworkStatsSubscriptionsMonitor;

24
tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java
View File

@@ -17,6 +17,7 @@
package com.android.server.net; package com.android.server.net;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.any; import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.eq; import static org.mockito.Mockito.eq;
@@ -29,14 +30,13 @@ import static org.mockito.Mockito.when;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.os.Looper; import android.os.test.TestLooper;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import com.android.internal.util.CollectionUtils; import com.android.internal.util.CollectionUtils;
import com.android.server.net.NetworkStatsSubscriptionsMonitor.Delegate;
import com.android.server.net.NetworkStatsSubscriptionsMonitor.RatTypeListener; import com.android.server.net.NetworkStatsSubscriptionsMonitor.RatTypeListener;
import org.junit.Before; import org.junit.Before;
@@ -64,20 +64,17 @@ public final class NetworkStatsSubscriptionsMonitorTest {
@Mock private PhoneStateListener mPhoneStateListener; @Mock private PhoneStateListener mPhoneStateListener;
@Mock private SubscriptionManager mSubscriptionManager; @Mock private SubscriptionManager mSubscriptionManager;
@Mock private TelephonyManager mTelephonyManager; @Mock private TelephonyManager mTelephonyManager;
@Mock private Delegate mDelegate; @Mock private NetworkStatsSubscriptionsMonitor.Delegate mDelegate;
private final List<Integer> mTestSubList = new ArrayList<>(); private final List<Integer> mTestSubList = new ArrayList<>();
private final Executor mExecutor = Executors.newSingleThreadExecutor(); private final Executor mExecutor = Executors.newSingleThreadExecutor();
private NetworkStatsSubscriptionsMonitor mMonitor; private NetworkStatsSubscriptionsMonitor mMonitor;
private TestLooper mTestLooper = new TestLooper();
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
if (Looper.myLooper() == null) {
Looper.prepare();
}
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager); when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
when(mContext.getSystemService(eq(Context.TELEPHONY_SUBSCRIPTION_SERVICE))) when(mContext.getSystemService(eq(Context.TELEPHONY_SUBSCRIPTION_SERVICE)))
@@ -85,7 +82,8 @@ public final class NetworkStatsSubscriptionsMonitorTest {
when(mContext.getSystemService(eq(Context.TELEPHONY_SERVICE))) when(mContext.getSystemService(eq(Context.TELEPHONY_SERVICE)))
.thenReturn(mTelephonyManager); .thenReturn(mTelephonyManager);
mMonitor = new NetworkStatsSubscriptionsMonitor(mContext, mExecutor, mDelegate); mMonitor = new NetworkStatsSubscriptionsMonitor(mContext, mTestLooper.getLooper(),
mExecutor, mDelegate);
} }
@Test @Test
@@ -117,16 +115,18 @@ public final class NetworkStatsSubscriptionsMonitorTest {
when(serviceState.getDataNetworkType()).thenReturn(type); when(serviceState.getDataNetworkType()).thenReturn(type);
final RatTypeListener match = CollectionUtils final RatTypeListener match = CollectionUtils
.find(listeners, it -> it.getSubId() == subId); .find(listeners, it -> it.getSubId() == subId);
if (match != null) { if (match == null) {
match.onServiceStateChanged(serviceState); fail("Could not find listener with subId: " + subId);
} }
match.onServiceStateChanged(serviceState);
} }
private void addTestSub(int subId, String subscriberId) { private void addTestSub(int subId, String subscriberId) {
// add SubId to TestSubList. // add SubId to TestSubList.
if (!mTestSubList.contains(subId)) { if (mTestSubList.contains(subId)) fail("The subscriber list already contains this ID");
mTestSubList.add(subId); mTestSubList.add(subId);
}
final int[] subList = convertArrayListToIntArray(mTestSubList); final int[] subList = convertArrayListToIntArray(mTestSubList);
when(mSubscriptionManager.getActiveAndHiddenSubscriptionIdList()).thenReturn(subList); when(mSubscriptionManager.getActiveAndHiddenSubscriptionIdList()).thenReturn(subList);
when(mTelephonyManager.getSubscriberId(subId)).thenReturn(subscriberId); when(mTelephonyManager.getSubscriberId(subId)).thenReturn(subscriberId);