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" am: b1a3247ab4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509
This commit is contained in:
Chalard Jean
2020-08-13 04:09:27 +00:00
committed by Automerger Merge Worker
parent 9caa751767 96924bf201
commit c5d748e694
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

@@ -50,7 +50,7 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.MediumTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.HandlerUtilsKt;
import com.android.testutils.HandlerUtils;
import com.android.testutils.TapPacketReader;
import org.junit.After;
@@ -366,7 +366,7 @@ public class EthernetTetheringTest {
private TapPacketReader makePacketReader(FileDescriptor fd, int mtu) {
final TapPacketReader reader = new TapPacketReader(mHandler, fd, mtu);
mHandler.post(() -> reader.start());
HandlerUtilsKt.waitForIdle(mHandler, TIMEOUT_MS);
HandlerUtils.waitForIdle(mHandler, TIMEOUT_MS);
return reader;
}

4
Tethering/tests/unit/src/android/net/util/TetheringUtilsTest.java
View File

@@ -27,7 +27,7 @@ import android.net.TetheringRequestParcel;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.MiscAssertsKt;
import com.android.testutils.MiscAsserts;
import org.junit.Before;
import org.junit.Test;
@@ -82,6 +82,6 @@ public class TetheringUtilsTest {
request.showProvisioningUi = false;
assertFalse(TetheringUtils.isTetheringRequestEquals(mTetheringRequest, request));
MiscAssertsKt.assertFieldCountEquals(5, TetheringRequestParcel.class);
MiscAsserts.assertFieldCountEquals(5, TetheringRequestParcel.class);
}
}

4
Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java
View File

@@ -30,8 +30,8 @@ import static com.android.networkstack.tethering.OffloadController.StatsType.STA
import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_UID;
import static com.android.networkstack.tethering.OffloadHardwareInterface.ForwardedStats;
import static com.android.networkstack.tethering.TetheringConfiguration.DEFAULT_TETHER_OFFLOAD_POLL_INTERVAL_MS;
import static com.android.testutils.MiscAssertsKt.assertContainsAll;
import static com.android.testutils.MiscAssertsKt.assertThrows;
import static com.android.testutils.MiscAsserts.assertContainsAll;
import static com.android.testutils.MiscAsserts.assertThrows;
import static com.android.testutils.NetworkStatsUtilsKt.assertNetworkStatsEquals;
import static junit.framework.Assert.assertNotNull;

4
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View File

@@ -143,7 +143,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.internal.util.StateMachine;
import com.android.internal.util.test.BroadcastInterceptingContext;
import com.android.internal.util.test.FakeSettingsProvider;
import com.android.testutils.MiscAssertsKt;
import com.android.testutils.MiscAsserts;
import org.junit.After;
import org.junit.AfterClass;
@@ -1360,7 +1360,7 @@ public class TetheringTest {
assertEquals(0, parcel.localOnlyList.length);
assertEquals(0, parcel.erroredIfaceList.length);
assertEquals(0, parcel.lastErrorList.length);
MiscAssertsKt.assertFieldCountEquals(5, TetherStatesParcel.class);
MiscAsserts.assertFieldCountEquals(5, TetherStatesParcel.class);
}
@Test