[Non-ACR][Bluetooth][Correct the supported feature for GATT APIs]

Change-Id: I5fbcaca0e65dc84ab4d2ea1ec3d47f04bab26805
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattAttribute.cs b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattAttribute.cs
index 4b73344..ea281c1 100755 (executable)
--- a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattAttribute.cs
+++ b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattAttribute.cs
@@ -34,8 +34,8 @@ namespace Tizen.Network.Bluetooth.Tests
         static int _valueOffset = 5;
 
         static IDictionary<BluetoothGattAttribute, AttributeTestData> _attributeObjs = null;
-        static bool _isBluetoothSupported = false;
-        static bool _isBluetoothLeSupported = false;
+        static bool _isBluetoothGattServerSupported = false;
+        static bool _isBluetoothGattClientSupported = false;
 
         static BluetoothGattAttributeTests()
         {
@@ -52,7 +52,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -64,8 +64,8 @@ namespace Tizen.Network.Bluetooth.Tests
         [TestFixtureSetUp]
         public static void Init()
         {
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth", out _isBluetoothSupported);
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le", out _isBluetoothLeSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.server", out _isBluetoothGattServerSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.client", out _isBluetoothGattClientSupported);
         }
 
         [TestFixtureTearDown]
@@ -99,7 +99,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -140,7 +140,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -171,7 +171,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -189,7 +189,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -220,7 +220,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -239,7 +239,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -272,7 +272,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -302,7 +302,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -312,7 +312,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -342,7 +342,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -352,7 +352,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -382,7 +382,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -392,7 +392,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -422,7 +422,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -432,7 +432,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -462,7 +462,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -472,7 +472,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -503,7 +503,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -513,7 +513,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -543,7 +543,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");;
                     return;
                 }
 
@@ -553,7 +553,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -583,7 +583,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -593,7 +593,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -623,7 +623,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -633,7 +633,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -663,7 +663,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -673,7 +673,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -703,7 +703,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -713,7 +713,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -744,7 +744,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -754,7 +754,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -784,7 +784,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -794,7 +794,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -824,7 +824,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -834,7 +834,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -864,7 +864,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -874,7 +874,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -904,7 +904,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -914,7 +914,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -944,7 +944,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -960,7 +960,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -990,7 +990,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -1014,7 +1014,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -1044,7 +1044,7 @@ namespace Tizen.Network.Bluetooth.Tests
                               other case is abnormal, so assert fail */
                 if (_attributeObjs == null)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                     return;
                 }
 
@@ -1066,7 +1066,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {

diff --git a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattCharacteristic.cs b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattCharacteristic.cs
index 490ae64..71345ec 100755 (executable)
--- a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattCharacteristic.cs
+++ b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattCharacteristic.cs
@@ -33,14 +33,14 @@ namespace Tizen.Network.Bluetooth.Tests
         static byte[] _descriptor1Value = Encoding.UTF8.GetBytes("_descriptor1Value");
         static byte[] _descriptor2Value = Encoding.UTF8.GetBytes("_descriptor2Value");
         static BluetoothGattPermission _descriptorPermission = BluetoothGattPermission.Read | BluetoothGattPermission.Write;
-        static bool _isBluetoothSupported = false;
-        static bool _isBluetoothLeSupported = false;
+        static bool _isBluetoothGattServerSupported = false;
+        static bool _isBluetoothGattClientSupported = false;
 
         [SetUp]
         public static void Init()
         {
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth", out _isBluetoothSupported);
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le", out _isBluetoothLeSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.server", out _isBluetoothGattServerSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.client", out _isBluetoothGattClientSupported);
         }
 
         [TearDown]
@@ -78,7 +78,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -116,7 +116,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -154,7 +154,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -192,7 +192,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -230,7 +230,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -268,7 +268,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -306,7 +306,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -344,7 +344,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -382,7 +382,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -420,7 +420,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -461,7 +461,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -511,7 +511,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -563,7 +563,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -607,7 +607,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -676,7 +676,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -712,7 +712,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -748,7 +748,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {

diff --git a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattDescriptor.cs b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattDescriptor.cs
index 317af4b..0f190d5 100755 (executable)
--- a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattDescriptor.cs
+++ b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattDescriptor.cs
@@ -29,14 +29,14 @@ namespace Tizen.Network.Bluetooth.Tests
         static BluetoothGattPermission _characteristicPermission = BluetoothGattPermission.Read;
         static BluetoothGattProperty _characteristicProperties = BluetoothGattProperty.Read | BluetoothGattProperty.Notify;
 
-        static bool _isBluetoothSupported = false;
-        static bool _isBluetoothLeSupported = false;
+        static bool _isBluetoothGattServerSupported = false;
+        static bool _isBluetoothGattClientSupported = false;
 
         [SetUp]
         public static void Init()
         {
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth", out _isBluetoothSupported);
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le", out _isBluetoothLeSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.server", out _isBluetoothGattServerSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.client", out _isBluetoothGattClientSupported);
         }
 
         [TearDown]
@@ -72,7 +72,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -105,7 +105,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -138,7 +138,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -181,7 +181,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {

diff --git a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattService.cs b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattService.cs
index de5a1e4..ebcf8c0 100755 (executable)
--- a/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattService.cs
+++ b/tct-suite-vs/Tizen.Bluetooth.Tests/testcase/TSBluetoothGattService.cs
@@ -31,14 +31,14 @@ namespace Tizen.Network.Bluetooth.Tests
         static BluetoothGattPermission _characteristicPermissions = BluetoothGattPermission.Read | BluetoothGattPermission.Write;
         static BluetoothGattProperty _characteristicProperties = BluetoothGattProperty.Read | BluetoothGattProperty.Notify;
 
-        static bool _isBluetoothSupported = false;
-        static bool _isBluetoothLeSupported = false;
+        static bool _isBluetoothGattServerSupported = false;
+        static bool _isBluetoothGattClientSupported = false;
 
         [SetUp]
         public static void Init()
         {
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth", out _isBluetoothSupported);
-            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le", out _isBluetoothLeSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.server", out _isBluetoothGattServerSupported);
+            Information.TryGetValue("http://tizen.org/feature/network.bluetooth.le.gatt.client", out _isBluetoothGattClientSupported);
         }
 
         [TearDown]
@@ -71,7 +71,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -105,7 +105,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -146,7 +146,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -187,7 +187,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -237,7 +237,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -289,7 +289,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -339,7 +339,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -391,7 +391,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -435,7 +435,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {
@@ -482,7 +482,7 @@ namespace Tizen.Network.Bluetooth.Tests
             {
                 if (ex is NotSupportedException)
                 {
-                    Assert.IsTrue(_isBluetoothLeSupported == false, "Invalid NotSupportedException");
+                    Assert.IsTrue(_isBluetoothGattServerSupported == false && _isBluetoothGattClientSupported == false, "Invalid NotSupportedException");
                 }
                 else
                 {