From 32492d576a8aa389b11d9e776ab68aac8bc996c4 Mon Sep 17 00:00:00 2001 From: Khoa Hong Date: Mon, 27 Jun 2022 16:03:29 +0800 Subject: [PATCH] USB: Add NCM functions to related tests Bug: 194376600 Test: atest UsbManagerTests Test: atest UsbTests:com.android.server.usb.UsbHandlerTest#setFunctionsNcm Change-Id: I48269a8badb525b9d5ca3a3e3b55203fc7229b0a --- .../src/com/android/server/usblib/UsbManagerTestLib.java | 2 ++ .../src/com/android/server/usb/UsbHandlerTest.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java b/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java index 782439f80fc8c..d133f6fbdd874 100644 --- a/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java +++ b/tests/UsbManagerTests/lib/src/com/android/server/usblib/UsbManagerTestLib.java @@ -117,6 +117,7 @@ public class UsbManagerTestLib { testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_PTP); testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_MIDI); testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_RNDIS); + testGetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_NCM); } public void testSetCurrentFunctions_shouldMatched() { @@ -125,5 +126,6 @@ public class UsbManagerTestLib { testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_PTP); testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_MIDI); testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_RNDIS); + testSetCurrentFunctionsMock_Matched(UsbManager.FUNCTION_NCM); } } diff --git a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java index 861d221238ff4..86bcb7290d95f 100644 --- a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java +++ b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java @@ -180,6 +180,14 @@ public class UsbHandlerTest { assertNotEquals(mUsbHandler.getEnabledFunctions() & UsbManager.FUNCTION_RNDIS, 0); } + @SmallTest + @Test + public void setFunctionsNcm() { + mUsbHandler.handleMessage(mUsbHandler.obtainMessage(MSG_SET_CURRENT_FUNCTIONS, + UsbManager.FUNCTION_NCM)); + assertNotEquals(mUsbHandler.getEnabledFunctions() & UsbManager.FUNCTION_NCM, 0); + } + @SmallTest @Test public void setFunctionsNcmAndRndis() {