From a35ad640dbcffb9b04ea6cc8a6a43ea59cf1439d Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmycmchen@google.com>
Date: Tue, 10 Mar 2020 17:58:07 +0800
Subject: [PATCH] Wifi: add CTS tests for WifiP2pGroup

Bug: 150979638
Test: atest android.net.wifi.cts.ConcurrencyTest
Change-Id: I5e9c994129e9eebf7c079c5a064991463afb417d
---
 .../android/net/wifi/cts/ConcurrencyTest.java | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java b/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
index f7ea750d18..d91bce8319 100644
--- a/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
@@ -31,6 +31,7 @@ import android.net.NetworkInfo;
 import android.net.NetworkRequest;
 import android.net.wifi.WifiManager;
 import android.net.wifi.p2p.WifiP2pDevice;
+import android.net.wifi.p2p.WifiP2pGroup;
 import android.net.wifi.p2p.WifiP2pGroupList;
 import android.net.wifi.p2p.WifiP2pInfo;
 import android.net.wifi.p2p.WifiP2pManager;
@@ -79,6 +80,7 @@ public class ConcurrencyTest extends AndroidTestCase {
         public WifiP2pInfo p2pInfo;
         public String deviceName;
         public WifiP2pGroupList persistentGroups;
+        public WifiP2pGroup group = new WifiP2pGroup();
     }
 
     private WifiManager mWifiManager;
@@ -267,6 +269,7 @@ public class ConcurrencyTest extends AndroidTestCase {
             responseObj.p2pInfo = null;
             responseObj.deviceName = null;
             responseObj.persistentGroups = null;
+            responseObj.group = null;
         }
     }
 
@@ -480,7 +483,27 @@ public class ConcurrencyTest extends AndroidTestCase {
         assertTrue(mMyResponse.p2pInfo.groupFormed);
         assertTrue(mMyResponse.p2pInfo.isGroupOwner);
 
-        mWifiP2pManager.removeGroup(mWifiP2pChannel, null);
+        resetResponse(mMyResponse);
+        mWifiP2pManager.requestGroupInfo(mWifiP2pChannel,
+                new WifiP2pManager.GroupInfoListener() {
+                    @Override
+                    public void onGroupInfoAvailable(WifiP2pGroup group) {
+                        synchronized (mMyResponse) {
+                            mMyResponse.group = new WifiP2pGroup(group);
+                            mMyResponse.valid = true;
+                            mMyResponse.notify();
+                        }
+                    }
+                });
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertNotNull(mMyResponse.group);
+        assertNotEquals(0, mMyResponse.group.getFrequency());
+        assertTrue(mMyResponse.group.getNetworkId() >= 0);
+
+        resetResponse(mMyResponse);
+        mWifiP2pManager.removeGroup(mWifiP2pChannel, mActionListener);
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertTrue(mMyResponse.success);
     }
 
     private String getDeviceName() {