From ae7a0709b3370e6033c37a048752a854d40ebea0 Mon Sep 17 00:00:00 2001 From: paulhu Date: Thu, 26 Mar 2020 23:44:34 +0800 Subject: [PATCH] Add TetheringRequest CTS tests Test APIs below: TetheringRequest.getClientStaticIpv4Address() TetheringRequest.getLocalIpv4Address() TetheringRequest.getShouldShowEntitlementUi() TetheringRequest.getTetheringType() TetheringRequest.isExemptFromEntitlementCheck() TetheringRequest.Builder(int) TetheringRequest.Builder.build() TetheringRequest.Builder.setExemptFromEntitlementCheck(boolean) TetheringRequest.Builder.setShouldShowEntitlementUi(boolean) TetheringRequest.Builder.setStaticIpv4Addresses( \ android.net.LinkAddress, android.net.LinkAddress) Bug: 150632842 Test: atest CtsTetheringTest Change-Id: Ice5aefa1bacc1a635a7a79ce91d5d30ec5dcf335 --- .../tethering/cts/TetheringManagerTest.java | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java index 4d72eae3e4..86fe54ce54 100644 --- a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java +++ b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java @@ -15,17 +15,22 @@ */ package android.tethering.test; +import static android.net.TetheringManager.TETHERING_USB; import static android.net.TetheringManager.TETHERING_WIFI; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.net.LinkAddress; import android.net.TetheringManager; import android.net.TetheringManager.TetheringRequest; -import android.os.ConditionVariable; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; @@ -37,8 +42,6 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; -import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -225,4 +228,27 @@ public class TetheringManagerTest { mTM.stopTethering(TETHERING_WIFI); mTetherChangeReceiver.expectNoActiveTethering(DEFAULT_TIMEOUT_MS); } + + @Test + public void testTetheringRequest() { + final TetheringRequest tr = new TetheringRequest.Builder(TETHERING_WIFI).build(); + assertEquals(TETHERING_WIFI, tr.getTetheringType()); + assertNull(tr.getLocalIpv4Address()); + assertNull(tr.getClientStaticIpv4Address()); + assertFalse(tr.isExemptFromEntitlementCheck()); + assertTrue(tr.getShouldShowEntitlementUi()); + + final LinkAddress localAddr = new LinkAddress("192.168.24.5/24"); + final LinkAddress clientAddr = new LinkAddress("192.168.24.100/24"); + final TetheringRequest tr2 = new TetheringRequest.Builder(TETHERING_USB) + .setStaticIpv4Addresses(localAddr, clientAddr) + .setExemptFromEntitlementCheck(true) + .setShouldShowEntitlementUi(false).build(); + + assertEquals(localAddr, tr2.getLocalIpv4Address()); + assertEquals(clientAddr, tr2.getClientStaticIpv4Address()); + assertEquals(TETHERING_USB, tr2.getTetheringType()); + assertTrue(tr2.isExemptFromEntitlementCheck()); + assertFalse(tr2.getShouldShowEntitlementUi()); + } }