commit 4a065cc2f169d291d64c95070f172ac773aa362d
author Nate Jiang <qiangjiang@google.com> Tue Jan 12 15:13:36 2021 -0800
committer Nate Jiang <qiangjiang@google.com> Tue Jan 12 15:13:36 2021 -0800
tree cc738422c09bc0fd19eed8c3b43a663b6b692904
parent c7087bba4c59659852d98ef7efb00a55951d6de4

[CTS] Change Aware resource API name

Bug: 173119398
Test: atest SingleDeviceTest
Change-Id: I35f6fffb7ebf51123f9dd270b00936ede54e71f8

tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java

diff --git a/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java b/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java
index 8555f76..60191a5 100644
--- a/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java
@@ -468,9 +468,9 @@
         }
         AwareResources resources = mWifiAwareManager.getAvailableAwareResources();
         assertNotNull("Available aware resources are null", resources);
-        assertTrue(resources.getNumOfAvailablePublishSessions() > 0);
-        assertTrue(resources.getNumOfAvailableSubscribeSessions() > 0);
-        assertTrue(resources.getNumOfAvailableDataPaths() > 0);
+        assertTrue(resources.getAvailableDataPathsCount() > 0);
+        assertTrue(resources.getAvailablePublishSessionsCount() > 0);
+        assertTrue(resources.getAvailableSubscribeSessionsCount() > 0);
     }
 
     /**
@@ -575,7 +575,7 @@
         int numOfAllPublishSessions = 0;
         if (BuildCompat.isAtLeastS()) {
             numOfAllPublishSessions = mWifiAwareManager
-                    .getAvailableAwareResources().getNumOfAvailablePublishSessions();
+                    .getAvailableAwareResources().getAvailablePublishSessionsCount();
         }
 
         // 1. publish
@@ -590,7 +590,7 @@
                 DiscoverySessionCallbackTest.ON_SESSION_DISCOVERED_LOST));
         if (BuildCompat.isAtLeastS()) {
             assertEquals(numOfAllPublishSessions - 1, mWifiAwareManager
-                    .getAvailableAwareResources().getNumOfAvailablePublishSessions());
+                    .getAvailableAwareResources().getAvailablePublishSessionsCount());
         }
         // 2. update-publish
         publishConfig = new PublishConfig.Builder().setServiceName(
@@ -610,7 +610,7 @@
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
         if (BuildCompat.isAtLeastS()) {
             assertEquals(numOfAllPublishSessions, mWifiAwareManager
-                    .getAvailableAwareResources().getNumOfAvailablePublishSessions());
+                    .getAvailableAwareResources().getAvailablePublishSessionsCount());
         }
         session.close();
     }
@@ -674,7 +674,7 @@
         int numOfAllSubscribeSessions = 0;
         if (BuildCompat.isAtLeastS()) {
             numOfAllSubscribeSessions = mWifiAwareManager
-                    .getAvailableAwareResources().getNumOfAvailableSubscribeSessions();
+                    .getAvailableAwareResources().getAvailableSubscribeSessionsCount();
         }
         // 1. subscribe
         session.subscribe(subscribeConfig, discoveryCb, mHandler);
@@ -688,7 +688,7 @@
                 DiscoverySessionCallbackTest.ON_SESSION_DISCOVERED_LOST));
         if (BuildCompat.isAtLeastS()) {
             assertEquals(numOfAllSubscribeSessions - 1, mWifiAwareManager
-                    .getAvailableAwareResources().getNumOfAvailableSubscribeSessions());
+                    .getAvailableAwareResources().getAvailableSubscribeSessionsCount());
         }
 
         // 2. update-subscribe
@@ -717,7 +717,7 @@
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
         if (BuildCompat.isAtLeastS()) {
             assertEquals(numOfAllSubscribeSessions, mWifiAwareManager
-                    .getAvailableAwareResources().getNumOfAvailableSubscribeSessions());
+                    .getAvailableAwareResources().getAvailableSubscribeSessionsCount());
         }
         session.close();
     }