commit 6677a2ab5531edeeb7d1f21706eb99b3770cfa19
author Etan Cohen <etancohen@google.com> Mon May 22 14:38:04 2017 -0700
committer Etan Cohen <etancohen@google.com> Wed May 24 16:38:53 2017 -0700
tree 460ac1347f0b78abd2c9c5f59258893bccd11fa2
parent 60a9b521ba8d18440c1e44606df60f363e626723

[AWARE] Negative test: mismatched service type

Tests to validate that setting up a discovery publish/subscribe
with mismatched service types does not result in service discovery.

Bug: 31940045
Test: all passive new test passes
Test: all active new test fails (bug filed)
Change-Id: Ic33047da1020ddb90c4ea38fb79d1e5686982323

acts/tests/google/wifi/aware/functional/DiscoveryTest.py

diff --git a/acts/tests/google/wifi/aware/functional/DiscoveryTest.py b/acts/tests/google/wifi/aware/functional/DiscoveryTest.py
index 442d950..4ebbf23 100644
--- a/acts/tests/google/wifi/aware/functional/DiscoveryTest.py
+++ b/acts/tests/google/wifi/aware/functional/DiscoveryTest.py
@@ -465,8 +465,8 @@
     Args:
       p_type: Publish discovery type
       s_type: Subscribe discovery type
-      p_service_name: Publish service name
-      s_service_name: Subscribe service name
+      p_service_name: Publish service name (or None to leave unchanged)
+      s_service_name: Subscribe service name (or None to leave unchanged)
     """
     p_dut = self.android_devices[0]
     p_dut.pretty_name = "Publisher"
@@ -481,7 +481,8 @@
         ttl=0,
         term_ind_on=False,
         null_match=False)
-    p_config[aconsts.DISCOVERY_KEY_SERVICE_NAME] = p_service_name
+    if p_service_name is not None:
+      p_config[aconsts.DISCOVERY_KEY_SERVICE_NAME] = p_service_name
     s_config = self.create_publish_config(
         s_dut.aware_capabilities,
         s_type,
@@ -489,7 +490,8 @@
         ttl=0,
         term_ind_on=False,
         null_match=False)
-    s_config[aconsts.DISCOVERY_KEY_SERVICE_NAME] = s_service_name
+    if s_service_name is not None:
+      s_config[aconsts.DISCOVERY_KEY_SERVICE_NAME] = s_service_name
 
     self.negative_discovery_test_utility(p_dut, s_dut, p_config, s_config)
 
@@ -708,4 +710,36 @@
         p_type=aconsts.PUBLISH_TYPE_SOLICITED,
         s_type=aconsts.SUBSCRIBE_TYPE_ACTIVE,
         p_service_name="GoogleTestServiceXXX",
-        s_service_name="GoogleTestServiceYYY")
\ No newline at end of file
+        s_service_name="GoogleTestServiceYYY")
+
+  #######################################
+  # Mismatched discovery session type tests key:
+  #
+  # names is: test_mismatch_service_type_<pub_type>_<sub_type>
+  # where:
+  #
+  # pub_type: Type of publish discovery session: unsolicited or solicited.
+  # sub_type: Type of subscribe discovery session: passive or active.
+  #######################################
+
+  def test_mismatch_service_type_unsolicited_active(self):
+    """Functional test case / Discovery test cases / Mismatch service name
+    - Unsolicited publish
+    - Active subscribe
+    """
+    self.negative_discovery_mismatch_name_test_utility(
+        p_type=aconsts.PUBLISH_TYPE_UNSOLICITED,
+        s_type=aconsts.SUBSCRIBE_TYPE_ACTIVE,
+        p_service_name=None,
+        s_service_name=None)
+
+  def test_mismatch_service_type_solicited_passive(self):
+    """Functional test case / Discovery test cases / Mismatch service name
+    - Unsolicited publish
+    - Active subscribe
+    """
+    self.negative_discovery_mismatch_name_test_utility(
+        p_type=aconsts.PUBLISH_TYPE_SOLICITED,
+        s_type=aconsts.SUBSCRIBE_TYPE_PASSIVE,
+        p_service_name=None,
+        s_service_name=None)