commit a10323e5aa00290ddaf28037cc3f6dd48197ba93
author Gabriel Biren <gbiren@google.com> Wed Jan 08 08:48:21 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 08 08:48:21 2025 -0800
tree 15b89a1233e25fd39dfb1d737b17a65608674558
parent b96539a77bcee5aaef72fb694ff809ee7b0e66b9
parent 9294fc27252da6f6fa5d14eedca197f1a384c5a3

Merge "Create P2P VTS test networks using addGroup() instead of addNetwork()." into main

wifi/supplicant/aidl/vts/functional/supplicant_p2p_iface_aidl_test.cpp

diff --git a/wifi/supplicant/aidl/vts/functional/supplicant_p2p_iface_aidl_test.cpp b/wifi/supplicant/aidl/vts/functional/supplicant_p2p_iface_aidl_test.cpp
index 778e20a..3522014 100644
--- a/wifi/supplicant/aidl/vts/functional/supplicant_p2p_iface_aidl_test.cpp
+++ b/wifi/supplicant/aidl/vts/functional/supplicant_p2p_iface_aidl_test.cpp
@@ -986,15 +986,16 @@
  * Test the P2P network management functions.
  */
 TEST_P(SupplicantP2pIfaceAidlTest, ManageNetworks) {
-    std::shared_ptr<ISupplicantP2pNetwork> network;
-    EXPECT_TRUE(p2p_iface_->addNetwork(&network).isOk());
-    ASSERT_NE(network, nullptr);
+    // Create a persistent group to bring up a network
+    EXPECT_TRUE(p2p_iface_->addGroup(true /* persistent */, -1).isOk());
+    sleep(2);
 
     std::vector<int32_t> networkList;
     EXPECT_TRUE(p2p_iface_->listNetworks(&networkList).isOk());
     ASSERT_FALSE(networkList.empty());
 
     int networkId = networkList[0];
+    std::shared_ptr<ISupplicantP2pNetwork> network;
     EXPECT_TRUE(p2p_iface_->getNetwork(networkId, &network).isOk());
     ASSERT_NE(network, nullptr);
     EXPECT_TRUE(p2p_iface_->removeNetwork(networkId).isOk());

wifi/supplicant/aidl/vts/functional/supplicant_p2p_network_aidl_test.cpp

diff --git a/wifi/supplicant/aidl/vts/functional/supplicant_p2p_network_aidl_test.cpp b/wifi/supplicant/aidl/vts/functional/supplicant_p2p_network_aidl_test.cpp
index c5a73f1..165a01a 100644
--- a/wifi/supplicant/aidl/vts/functional/supplicant_p2p_network_aidl_test.cpp
+++ b/wifi/supplicant/aidl/vts/functional/supplicant_p2p_network_aidl_test.cpp
@@ -48,11 +48,22 @@
 
         EXPECT_TRUE(supplicant_->getP2pInterface(getP2pIfaceName(), &p2p_iface_).isOk());
         ASSERT_NE(p2p_iface_, nullptr);
-        EXPECT_TRUE(p2p_iface_->addNetwork(&p2p_network_).isOk());
+
+        // Create a persistent group to bring up a network
+        EXPECT_TRUE(p2p_iface_->addGroup(true /* persistent */, -1).isOk());
+        sleep(2);
+
+        std::vector<int32_t> networkList;
+        EXPECT_TRUE(p2p_iface_->listNetworks(&networkList).isOk());
+        ASSERT_FALSE(networkList.empty());
+
+        network_id_ = networkList[0];
+        EXPECT_TRUE(p2p_iface_->getNetwork(network_id_, &p2p_network_).isOk());
         ASSERT_NE(p2p_network_, nullptr);
     }
 
     void TearDown() override {
+        EXPECT_TRUE(p2p_iface_->removeNetwork(network_id_).isOk());
         stopSupplicantService();
         startWifiFramework();
     }
@@ -61,6 +72,7 @@
     std::shared_ptr<ISupplicant> supplicant_;
     std::shared_ptr<ISupplicantP2pIface> p2p_iface_;
     std::shared_ptr<ISupplicantP2pNetwork> p2p_network_;
+    int network_id_;
 };
 
 /*
@@ -130,7 +142,8 @@
 TEST_P(SupplicantP2pNetworkAidlTest, IsGroupOwner) {
     bool isGroupOwner;
     EXPECT_TRUE(p2p_network_->isGroupOwner(&isGroupOwner).isOk());
-    EXPECT_FALSE(isGroupOwner);
+    // Configured network is a group owner
+    EXPECT_TRUE(isGroupOwner);
 }
 
 /*
@@ -139,7 +152,8 @@
 TEST_P(SupplicantP2pNetworkAidlTest, IsPersistent) {
     bool isPersistent;
     EXPECT_TRUE(p2p_network_->isPersistent(&isPersistent).isOk());
-    EXPECT_FALSE(isPersistent);
+    // Configured network is persistent
+    EXPECT_TRUE(isPersistent);
 }
 
 /*