From b38f0df3f97dee1aaf0c4aeb8103c63f757ed420 Mon Sep 17 00:00:00 2001
From: jgkim <jgkim2@humaxdigital.com>
Date: Fri, 6 Dec 2019 15:46:41 +0900
Subject: [PATCH] CtsNetTestCases: Fix issues in
 android.net.wifi.cts.WifiEnterpriseConfigTest

1.android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
2.android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
3.android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters

Bug:143000258
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters
Change-Id: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
Merged-In: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
---
 .../src/android/net/wifi/cts/WifiEnterpriseConfigTest.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
index d3235da369..9fb7ac4b01 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
@@ -34,7 +34,6 @@ import java.security.spec.PKCS8EncodedKeySpec;
 
 public class WifiEnterpriseConfigTest extends AndroidTestCase {
     private  WifiManager mWifiManager;
-
     private static final String SSID = "\"TestSSID\"";
     private static final String IDENTITY = "identity";
     private static final String PASSWORD = "password";
@@ -684,6 +683,9 @@ public class WifiEnterpriseConfigTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        if(!hasWifi()) {
+            return;
+        }
         mWifiManager = (WifiManager) mContext
                 .getSystemService(Context.WIFI_SERVICE);
         assertNotNull(mWifiManager);
@@ -802,6 +804,9 @@ public class WifiEnterpriseConfigTest extends AndroidTestCase {
     }
 
     public void testEnterpriseConfigDoesNotPrintPassword() {
+        if(!hasWifi()) {
+            return;
+        }
         WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();
         final String identity = "IdentityIsOkayToBeDisplayedHere";
         final String password = "PasswordIsNotOkayToBeDisplayedHere";