commit 3bac61ac86bc8c8a491ebe6f85bfbf754d5bd61b
author Paul Stewart <pstew@google.com> Sat Jan 28 01:54:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 28 01:54:47 2017 +0000
tree 57cffd69fe548f141ae98a2cb31cbe24698a89eb
parent 25eff7731a498e08ca7d95e9c764cab3bc68aca9
parent cb79016b1627143ad2a306bdd5c3403571dfa2d6

Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad
am: cb79016b16

Change-Id: Ib96c9b9034d5fd6fb0477ca274e4cbce86677d0e

wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java

diff --git a/wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java b/wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java
index 5a67a7e..fa546a5 100644
--- a/wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java
+++ b/wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java
@@ -87,6 +87,16 @@
     }
 
     @Test
+    public void testSetClientKeyEntryWithNull() {
+        mEnterpriseConfig.setClientKeyEntry(null, null);
+        assertEquals(null, mEnterpriseConfig.getClientCertificateChain());
+        assertEquals(null, mEnterpriseConfig.getClientCertificate());
+        mEnterpriseConfig.setClientKeyEntryWithCertificateChain(null, null);
+        assertEquals(null, mEnterpriseConfig.getClientCertificateChain());
+        assertEquals(null, mEnterpriseConfig.getClientCertificate());
+    }
+
+    @Test
     public void testSetClientCertificateChain() {
         PrivateKey clientKey = FakeKeys.RSA_KEY1;
         X509Certificate cert0 = FakeKeys.CLIENT_CERT;