Merge "Test : New Test Cases for ShouldEnableP2p" into main

1 files changed, 16 insertions, 3 deletions

diff --git a/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java b/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java
index 0237b908..9a58c4c4 100644
--- a/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java
+++ b/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java
@@ -53,7 +53,7 @@ public class NfcDiscoveryParametersTest {
             return;
         }
         mNfcSupported = true;
-        mNfcDiscoveryParameters = computeDiscoveryParameters();
+        mNfcDiscoveryParameters = computeDiscoveryParameters(false);
     }
 
     @After
@@ -62,12 +62,16 @@ public class NfcDiscoveryParametersTest {
     }
 
 
-    private NfcDiscoveryParameters computeDiscoveryParameters() {
+    private NfcDiscoveryParameters computeDiscoveryParameters(boolean isP2pEnable) {
         // Recompute discovery parameters based on screen state
         NfcDiscoveryParameters.Builder paramsBuilder = NfcDiscoveryParameters.newBuilder();
         paramsBuilder.setTechMask(1);
-        paramsBuilder.setEnableReaderMode(true);
         paramsBuilder.setEnableHostRouting(true);
+        if (isP2pEnable) {
+            paramsBuilder.setEnableP2p(true);
+        } else {
+            paramsBuilder.setEnableReaderMode(true);
+        }
         return paramsBuilder.build();
     }
 
@@ -79,4 +83,13 @@ public class NfcDiscoveryParametersTest {
         Assert.assertEquals(1, techMask);
     }
 
+    @Test
+    public void testShouldEnableP2p() {
+        if (!mNfcSupported) return;
+
+        mNfcDiscoveryParameters = computeDiscoveryParameters(true);
+        boolean shouldP2pEnable = mNfcDiscoveryParameters.shouldEnableP2p();
+        Assert.assertTrue(shouldP2pEnable);
+    }
+
 }