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

Merge "Rename Kotlin util files to not include the Kt suffix"

Browse Source
This commit is contained in:
Chalard Jean
2020-08-13 03:52:47 +00:00
committed by Gerrit Code Review
parent e559544470 39175f2670
commit 9f2f0ce903
21 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/common/java/android/net/DhcpInfoTest.java
View File

@@ -17,8 +17,8 @@
package android.net; package android.net;
import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTL; import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTL;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip; import static com.android.testutils.ParcelUtils.parcelingRoundTrip;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

8
tests/net/common/java/android/net/IpPrefixTest.java
View File

@@ -16,10 +16,10 @@
package android.net; package android.net;
import static com.android.testutils.MiscAssertsKt.assertEqualBothWays; import static com.android.testutils.MiscAsserts.assertEqualBothWays;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.MiscAssertsKt.assertNotEqualEitherWay; import static com.android.testutils.MiscAsserts.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

8
tests/net/common/java/android/net/LinkAddressTest.java
View File

@@ -27,10 +27,10 @@ import static android.system.OsConstants.RT_SCOPE_LINK;
import static android.system.OsConstants.RT_SCOPE_SITE; import static android.system.OsConstants.RT_SCOPE_SITE;
import static android.system.OsConstants.RT_SCOPE_UNIVERSE; import static android.system.OsConstants.RT_SCOPE_UNIVERSE;
import static com.android.testutils.MiscAssertsKt.assertEqualBothWays; import static com.android.testutils.MiscAsserts.assertEqualBothWays;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.MiscAssertsKt.assertNotEqualEitherWay; import static com.android.testutils.MiscAsserts.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

6
tests/net/common/java/android/net/LinkPropertiesTest.java
View File

@@ -20,9 +20,9 @@ import static android.net.RouteInfo.RTN_THROW;
import static android.net.RouteInfo.RTN_UNICAST; import static android.net.RouteInfo.RTN_UNICAST;
import static android.net.RouteInfo.RTN_UNREACHABLE; import static android.net.RouteInfo.RTN_UNREACHABLE;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip; import static com.android.testutils.ParcelUtils.parcelingRoundTrip;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

4
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -42,8 +42,8 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE; import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
import static android.net.NetworkCapabilities.UNRESTRICTED_CAPABILITIES; import static android.net.NetworkCapabilities.UNRESTRICTED_CAPABILITIES;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

8
tests/net/common/java/android/net/RouteInfoTest.java
View File

@@ -18,10 +18,10 @@ package android.net;
import static android.net.RouteInfo.RTN_UNREACHABLE; import static android.net.RouteInfo.RTN_UNREACHABLE;
import static com.android.testutils.MiscAssertsKt.assertEqualBothWays; import static com.android.testutils.MiscAsserts.assertEqualBothWays;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.MiscAssertsKt.assertNotEqualEitherWay; import static com.android.testutils.MiscAsserts.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

2
tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java
View File

@@ -16,7 +16,7 @@
package android.net.apf; package android.net.apf;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

2
tests/net/integration/util/com/android/server/ConnectivityServiceTestUtils.kt
View File

@@ -14,6 +14,8 @@
* limitations under the License * limitations under the License
*/ */
@file:JvmName("ConnectivityServiceTestUtils")
package com.android.server package com.android.server
import android.net.ConnectivityManager.TYPE_BLUETOOTH import android.net.ConnectivityManager.TYPE_BLUETOOTH

6
tests/net/integration/util/com/android/server/NetworkAgentWrapper.java
View File

@@ -24,7 +24,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE; import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
import static com.android.server.ConnectivityServiceTestUtilsKt.transportToLegacyType; import static com.android.server.ConnectivityServiceTestUtils.transportToLegacyType;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
@@ -49,7 +49,7 @@ import android.os.Message;
import android.util.Log; import android.util.Log;
import com.android.server.connectivity.ConnectivityConstants; import com.android.server.connectivity.ConnectivityConstants;
import com.android.testutils.HandlerUtilsKt; import com.android.testutils.HandlerUtils;
import com.android.testutils.TestableNetworkCallback; import com.android.testutils.TestableNetworkCallback;
import java.util.Set; import java.util.Set;
@@ -265,6 +265,6 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork {
} }
public void waitForIdle(long timeoutMs) { public void waitForIdle(long timeoutMs) {
HandlerUtilsKt.waitForIdle(mHandlerThread, timeoutMs); HandlerUtils.waitForIdle(mHandlerThread, timeoutMs);
} }
} }

2
tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java
View File

@@ -21,7 +21,7 @@ import static android.net.ConnectivityDiagnosticsManager.ConnectivityDiagnostics
import static android.net.ConnectivityDiagnosticsManager.ConnectivityReport; import static android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
import static android.net.ConnectivityDiagnosticsManager.DataStallReport; import static android.net.ConnectivityDiagnosticsManager.DataStallReport;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

4
tests/net/java/android/net/IpSecConfigTest.java
View File

@@ -16,8 +16,8 @@
package android.net; package android.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNotSame;

2
tests/net/java/android/net/TcpKeepalivePacketDataTest.java
View File

@@ -16,7 +16,7 @@
package android.net; package android.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

2
tests/net/java/android/net/TelephonyNetworkSpecifierTest.java
View File

@@ -16,7 +16,7 @@
package android.net; package android.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

6
tests/net/java/android/net/nsd/NsdManagerTest.java
View File

@@ -38,7 +38,7 @@ import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.AsyncChannel; import com.android.internal.util.AsyncChannel;
import com.android.testutils.HandlerUtilsKt; import com.android.testutils.HandlerUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -73,7 +73,7 @@ public class NsdManagerTest {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
HandlerUtilsKt.waitForIdle(mServiceHandler, mTimeoutMs); HandlerUtils.waitForIdle(mServiceHandler, mTimeoutMs);
mServiceHandler.chan.disconnect(); mServiceHandler.chan.disconnect();
mServiceHandler.stop(); mServiceHandler.stop();
if (mManager != null) { if (mManager != null) {
@@ -333,7 +333,7 @@ public class NsdManagerTest {
} }
int verifyRequest(int expectedMessageType) { int verifyRequest(int expectedMessageType) {
HandlerUtilsKt.waitForIdle(mServiceHandler, mTimeoutMs); HandlerUtils.waitForIdle(mServiceHandler, mTimeoutMs);
verify(mServiceHandler, timeout(mTimeoutMs)).handleMessage(any()); verify(mServiceHandler, timeout(mTimeoutMs)).handleMessage(any());
reset(mServiceHandler); reset(mServiceHandler);
Message received = mServiceHandler.getLastMessage(); Message received = mServiceHandler.getLastMessage();

2
tests/net/java/com/android/internal/net/VpnProfileTest.java
View File

@@ -16,7 +16,7 @@
package com.android.internal.net; package com.android.internal.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

48
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -78,16 +78,16 @@ import static android.net.RouteInfo.RTN_UNREACHABLE;
import static android.os.Process.INVALID_UID; import static android.os.Process.INVALID_UID;
import static android.system.OsConstants.IPPROTO_TCP; import static android.system.OsConstants.IPPROTO_TCP;
import static com.android.server.ConnectivityServiceTestUtilsKt.transportToLegacyType; import static com.android.server.ConnectivityServiceTestUtils.transportToLegacyType;
import static com.android.testutils.ConcurrentUtilsKt.await; import static com.android.testutils.ConcurrentUtils.await;
import static com.android.testutils.ConcurrentUtilsKt.durationOf; import static com.android.testutils.ConcurrentUtils.durationOf;
import static com.android.testutils.ExceptionUtils.ignoreExceptions; import static com.android.testutils.ExceptionUtils.ignoreExceptions;
import static com.android.testutils.HandlerUtilsKt.waitForIdleSerialExecutor; import static com.android.testutils.HandlerUtils.waitForIdleSerialExecutor;
import static com.android.testutils.MiscAssertsKt.assertContainsExactly; import static com.android.testutils.MiscAsserts.assertContainsExactly;
import static com.android.testutils.MiscAssertsKt.assertEmpty; import static com.android.testutils.MiscAsserts.assertEmpty;
import static com.android.testutils.MiscAssertsKt.assertLength; import static com.android.testutils.MiscAsserts.assertLength;
import static com.android.testutils.MiscAssertsKt.assertRunsInAtMost; import static com.android.testutils.MiscAsserts.assertRunsInAtMost;
import static com.android.testutils.MiscAssertsKt.assertThrows; import static com.android.testutils.MiscAsserts.assertThrows;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@@ -242,7 +242,7 @@ import com.android.server.connectivity.Vpn;
import com.android.server.net.NetworkPinner; import com.android.server.net.NetworkPinner;
import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.net.NetworkPolicyManagerInternal;
import com.android.testutils.ExceptionUtils; import com.android.testutils.ExceptionUtils;
import com.android.testutils.HandlerUtilsKt; import com.android.testutils.HandlerUtils;
import com.android.testutils.RecorderCallback.CallbackEntry; import com.android.testutils.RecorderCallback.CallbackEntry;
import com.android.testutils.TestableNetworkCallback; import com.android.testutils.TestableNetworkCallback;
@@ -518,12 +518,12 @@ public class ConnectivityServiceTest {
} }
private void waitForIdle() { private void waitForIdle() {
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
waitForIdle(mCellNetworkAgent, TIMEOUT_MS); waitForIdle(mCellNetworkAgent, TIMEOUT_MS);
waitForIdle(mWiFiNetworkAgent, TIMEOUT_MS); waitForIdle(mWiFiNetworkAgent, TIMEOUT_MS);
waitForIdle(mEthernetNetworkAgent, TIMEOUT_MS); waitForIdle(mEthernetNetworkAgent, TIMEOUT_MS);
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
HandlerUtilsKt.waitForIdle(ConnectivityThread.get(), TIMEOUT_MS); HandlerUtils.waitForIdle(ConnectivityThread.get(), TIMEOUT_MS);
} }
private void waitForIdle(TestNetworkAgentWrapper agent, long timeoutMs) { private void waitForIdle(TestNetworkAgentWrapper agent, long timeoutMs) {
@@ -614,8 +614,8 @@ public class ConnectivityServiceTest {
// Waits for the NetworkAgent to be registered, which includes the creation of the // Waits for the NetworkAgent to be registered, which includes the creation of the
// NetworkMonitor. // NetworkMonitor.
waitForIdle(TIMEOUT_MS); waitForIdle(TIMEOUT_MS);
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
HandlerUtilsKt.waitForIdle(ConnectivityThread.get(), TIMEOUT_MS); HandlerUtils.waitForIdle(ConnectivityThread.get(), TIMEOUT_MS);
} }
@Override @Override
@@ -7099,7 +7099,7 @@ public class ConnectivityServiceTest {
mConnectivityDiagnosticsCallback, wifiRequest, mContext.getPackageName()); mConnectivityDiagnosticsCallback, wifiRequest, mContext.getPackageName());
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
verify(mIBinder).linkToDeath(any(ConnectivityDiagnosticsCallbackInfo.class), anyInt()); verify(mIBinder).linkToDeath(any(ConnectivityDiagnosticsCallbackInfo.class), anyInt());
verify(mConnectivityDiagnosticsCallback).asBinder(); verify(mConnectivityDiagnosticsCallback).asBinder();
@@ -7122,7 +7122,7 @@ public class ConnectivityServiceTest {
mConnectivityDiagnosticsCallback, wifiRequest, mContext.getPackageName()); mConnectivityDiagnosticsCallback, wifiRequest, mContext.getPackageName());
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
verify(mIBinder).linkToDeath(any(ConnectivityDiagnosticsCallbackInfo.class), anyInt()); verify(mIBinder).linkToDeath(any(ConnectivityDiagnosticsCallbackInfo.class), anyInt());
verify(mConnectivityDiagnosticsCallback).asBinder(); verify(mConnectivityDiagnosticsCallback).asBinder();
@@ -7133,7 +7133,7 @@ public class ConnectivityServiceTest {
mConnectivityDiagnosticsCallback, wifiRequest, mContext.getPackageName()); mConnectivityDiagnosticsCallback, wifiRequest, mContext.getPackageName());
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
assertTrue(mService.mConnectivityDiagnosticsCallbacks.containsKey(mIBinder)); assertTrue(mService.mConnectivityDiagnosticsCallbacks.containsKey(mIBinder));
} }
@@ -7285,7 +7285,7 @@ public class ConnectivityServiceTest {
mConnectivityDiagnosticsCallback, request, mContext.getPackageName()); mConnectivityDiagnosticsCallback, request, mContext.getPackageName());
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
verify(mConnectivityDiagnosticsCallback) verify(mConnectivityDiagnosticsCallback)
.onConnectivityReportAvailable(argThat(report -> { .onConnectivityReportAvailable(argThat(report -> {
@@ -7305,7 +7305,7 @@ public class ConnectivityServiceTest {
mConnectivityDiagnosticsCallback, request, mContext.getPackageName()); mConnectivityDiagnosticsCallback, request, mContext.getPackageName());
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Connect the cell agent verify that it notifies TestNetworkCallback that it is available // Connect the cell agent verify that it notifies TestNetworkCallback that it is available
final TestNetworkCallback callback = new TestNetworkCallback(); final TestNetworkCallback callback = new TestNetworkCallback();
@@ -7322,7 +7322,7 @@ public class ConnectivityServiceTest {
setUpConnectivityDiagnosticsCallback(); setUpConnectivityDiagnosticsCallback();
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onConnectivityReport fired // Verify onConnectivityReport fired
verify(mConnectivityDiagnosticsCallback).onConnectivityReportAvailable( verify(mConnectivityDiagnosticsCallback).onConnectivityReportAvailable(
@@ -7343,7 +7343,7 @@ public class ConnectivityServiceTest {
mCellNetworkAgent.notifyDataStallSuspected(); mCellNetworkAgent.notifyDataStallSuspected();
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onDataStallSuspected fired // Verify onDataStallSuspected fired
verify(mConnectivityDiagnosticsCallback).onDataStallSuspected( verify(mConnectivityDiagnosticsCallback).onDataStallSuspected(
@@ -7364,7 +7364,7 @@ public class ConnectivityServiceTest {
mService.reportNetworkConnectivity(n, hasConnectivity); mService.reportNetworkConnectivity(n, hasConnectivity);
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onNetworkConnectivityReported fired // Verify onNetworkConnectivityReported fired
verify(mConnectivityDiagnosticsCallback) verify(mConnectivityDiagnosticsCallback)
@@ -7374,7 +7374,7 @@ public class ConnectivityServiceTest {
mService.reportNetworkConnectivity(n, noConnectivity); mService.reportNetworkConnectivity(n, noConnectivity);
// Block until all other events are done processing. // Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Wait for onNetworkConnectivityReported to fire // Wait for onNetworkConnectivityReported to fire
verify(mConnectivityDiagnosticsCallback) verify(mConnectivityDiagnosticsCallback)

6
tests/net/java/com/android/server/connectivity/DnsManagerTest.java
View File

@@ -26,9 +26,9 @@ import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE;
import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;
import static com.android.testutils.MiscAssertsKt.assertContainsExactly; import static com.android.testutils.MiscAsserts.assertContainsExactly;
import static com.android.testutils.MiscAssertsKt.assertContainsStringsExactly; import static com.android.testutils.MiscAsserts.assertContainsStringsExactly;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

2
tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java
View File

@@ -19,7 +19,7 @@ package com.android.server.connectivity;
import static android.net.metrics.INetdEventListener.EVENT_GETADDRINFO; import static android.net.metrics.INetdEventListener.EVENT_GETADDRINFO;
import static android.net.metrics.INetdEventListener.EVENT_GETHOSTBYNAME; import static android.net.metrics.INetdEventListener.EVENT_GETHOSTBYNAME;
import static com.android.testutils.MiscAssertsKt.assertStringContains; import static com.android.testutils.MiscAsserts.assertStringContains;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;

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

@@ -28,7 +28,7 @@ import static android.os.Process.myUid;
import static android.text.format.DateUtils.HOUR_IN_MILLIS; import static android.text.format.DateUtils.HOUR_IN_MILLIS;
import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
import static com.android.testutils.MiscAssertsKt.assertThrows; import static com.android.testutils.MiscAsserts.assertThrows;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

6
tests/net/java/com/android/server/net/NetworkStatsObserversTest.java
View File

@@ -53,7 +53,7 @@ import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.server.net.NetworkStatsServiceTest.LatchedHandler; import com.android.server.net.NetworkStatsServiceTest.LatchedHandler;
import com.android.testutils.HandlerUtilsKt; import com.android.testutils.HandlerUtils;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -440,7 +440,7 @@ public class NetworkStatsObserversTest {
} }
private void waitForObserverToIdle() { private void waitForObserverToIdle() {
HandlerUtilsKt.waitForIdle(mObserverHandlerThread, WAIT_TIMEOUT_MS); HandlerUtils.waitForIdle(mObserverHandlerThread, WAIT_TIMEOUT_MS);
HandlerUtilsKt.waitForIdle(mHandler, WAIT_TIMEOUT_MS); HandlerUtils.waitForIdle(mHandler, WAIT_TIMEOUT_MS);
} }
} }

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

@@ -109,7 +109,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.internal.util.test.BroadcastInterceptingContext; import com.android.internal.util.test.BroadcastInterceptingContext;
import com.android.server.net.NetworkStatsService.NetworkStatsSettings; import com.android.server.net.NetworkStatsService.NetworkStatsSettings;
import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config; import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config;
import com.android.testutils.HandlerUtilsKt; import com.android.testutils.HandlerUtils;
import com.android.testutils.TestableNetworkStatsProviderBinder; import com.android.testutils.TestableNetworkStatsProviderBinder;
import libcore.io.IoUtils; import libcore.io.IoUtils;
@@ -700,7 +700,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
when(mNetworkStatsSubscriptionsMonitor.getRatTypeForSubscriberId(anyString())) when(mNetworkStatsSubscriptionsMonitor.getRatTypeForSubscriberId(anyString()))
.thenReturn(ratType); .thenReturn(ratType);
mService.handleOnCollapsedRatTypeChanged(); mService.handleOnCollapsedRatTypeChanged();
HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT); HandlerUtils.waitForIdle(mHandlerThread, WAIT_TIMEOUT);
} }
@Test @Test
@@ -1065,7 +1065,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
long minThresholdInBytes = 2 * 1024 * 1024; // 2 MB long minThresholdInBytes = 2 * 1024 * 1024; // 2 MB
assertEquals(minThresholdInBytes, request.thresholdInBytes); assertEquals(minThresholdInBytes, request.thresholdInBytes);
HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT); HandlerUtils.waitForIdle(mHandlerThread, WAIT_TIMEOUT);
// Make sure that the caller binder gets connected // Make sure that the caller binder gets connected
verify(mBinder).linkToDeath(any(IBinder.DeathRecipient.class), anyInt()); verify(mBinder).linkToDeath(any(IBinder.DeathRecipient.class), anyInt());
@@ -1203,7 +1203,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
// Simulates alert quota of the provider has been reached. // Simulates alert quota of the provider has been reached.
cb.notifyAlertReached(); cb.notifyAlertReached();
HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT); HandlerUtils.waitForIdle(mHandlerThread, WAIT_TIMEOUT);
// Verifies that polling is triggered by alert reached. // Verifies that polling is triggered by alert reached.
provider.expectOnRequestStatsUpdate(0 /* unused */); provider.expectOnRequestStatsUpdate(0 /* unused */);
@@ -1264,7 +1264,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
// Call handleOnCollapsedRatTypeChanged manually to simulate the callback fired // Call handleOnCollapsedRatTypeChanged manually to simulate the callback fired
// when stopping monitor, this is needed by NetworkStatsService to trigger updateIfaces. // when stopping monitor, this is needed by NetworkStatsService to trigger updateIfaces.
mService.handleOnCollapsedRatTypeChanged(); mService.handleOnCollapsedRatTypeChanged();
HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT); HandlerUtils.waitForIdle(mHandlerThread, WAIT_TIMEOUT);
// Create some traffic. // Create some traffic.
incrementCurrentTime(MINUTE_IN_MILLIS); incrementCurrentTime(MINUTE_IN_MILLIS);
// Append more traffic on existing snapshot. // Append more traffic on existing snapshot.
@@ -1286,7 +1286,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
setCombineSubtypeEnabled(false); setCombineSubtypeEnabled(false);
mService.handleOnCollapsedRatTypeChanged(); mService.handleOnCollapsedRatTypeChanged();
HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT); HandlerUtils.waitForIdle(mHandlerThread, WAIT_TIMEOUT);
// Create some traffic. // Create some traffic.
incrementCurrentTime(MINUTE_IN_MILLIS); incrementCurrentTime(MINUTE_IN_MILLIS);
// Append more traffic on existing snapshot. // Append more traffic on existing snapshot.
@@ -1520,7 +1520,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
} }
private void waitForIdle() { private void waitForIdle() {
HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT); HandlerUtils.waitForIdle(mHandlerThread, WAIT_TIMEOUT);
} }
static class LatchedHandler extends Handler { static class LatchedHandler extends Handler {