From be864d350079a5c66dab316b46de4295ad5c8eb2 Mon Sep 17 00:00:00 2001 From: David Su Date: Thu, 10 Sep 2020 03:23:04 +0000 Subject: Remove unit test changes in "wifi: Support SAE_TRANSITION when converting to WifiConfiguration" This partially reverts commit 43a326cdb364a01a0bb2ab4d5076b3e6fe87a8bd. Reason for revert: Unit tests are out of sync with prebuilt Wifi mainline module Bug: 168158154 Test: Treehugger Change-Id: I8add72b6de6e470a09a745c32b3e2fea764fc692 Merged-In: I6afba22e4081ba58884ffd1b560b81b1e9960132 --- .../src/android/net/wifi/SoftApConfigurationTest.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'wifi') diff --git a/wifi/tests/src/android/net/wifi/SoftApConfigurationTest.java b/wifi/tests/src/android/net/wifi/SoftApConfigurationTest.java index d78c942d55e2..1a4427034756 100644 --- a/wifi/tests/src/android/net/wifi/SoftApConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/SoftApConfigurationTest.java @@ -282,6 +282,12 @@ public class SoftApConfigurationTest { .build(); assertNull(band_6g_config.toWifiConfiguration()); + SoftApConfiguration sae_transition_config = new SoftApConfiguration.Builder() + .setPassphrase("secretsecret", + SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION) + .build(); + + assertNull(sae_transition_config.toWifiConfiguration()); } @Test @@ -324,16 +330,5 @@ public class SoftApConfigurationTest { assertThat(wifiConfig_2g5g.apBand).isEqualTo(WifiConfiguration.AP_BAND_ANY); assertThat(wifiConfig_2g5g.apChannel).isEqualTo(0); assertThat(wifiConfig_2g5g.hiddenSSID).isEqualTo(true); - - SoftApConfiguration softApConfig_sae_transition = new SoftApConfiguration.Builder() - .setPassphrase("secretsecret", - SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION) - .build(); - - WifiConfiguration wifiConfig_sae_transition = - softApConfig_sae_transition.toWifiConfiguration(); - assertThat(wifiConfig_sae_transition.getAuthType()) - .isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK); - assertThat(wifiConfig_sae_transition.preSharedKey).isEqualTo("secretsecret"); } } -- cgit v1.2.3