Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beb3609d authored by David Su's avatar David Su
Browse files

Remove unit test changes added in "[Suggestion] Fix setWpa3EnterpriseConfig" in rvc-qpr-dev 

This partially reverts commit 08744836.

Reason for revert: Unit tests are out of sync with prebuilt Wifi mainline module

Bug: 168158154
Change-Id: I0cda9de836b6f00a06474515f17e67194c6246cd
Test: Treehugger
Merged-In: I875d0d0584d71fe6dd3fedc8f5371e0b5ed2e5e5
parent 08744836

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

+3 −410

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −105
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import static android.os.PatternMatcher.PATTERN_SIMPLE_GLOB; 


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;



import android.net.MacAddress;
@@ -37,8 +35,6 @@ import androidx.test.filters.SmallTest; 


import org.junit.Test;



import java.security.cert.X509Certificate;



/**

 * Unit tests for {@link android.net.wifi.WifiNetworkSpecifier}.

 */
@@ -49,7 +45,6 @@ public class WifiNetworkSpecifierTest { 
    private static final String TEST_BSSID_OUI_MASK = "ff:ff:ff:00:00:00";

    private static final String TEST_BSSID = "12:12:12:12:12:12";

    private static final String TEST_PRESHARED_KEY = "\"Test123\"";

    private static final String TEST_DOMAIN_SUFFIX_MATCH = "domainSuffixMatch";



    /**

     * Validate correctness of WifiNetworkSpecifier object created by
@@ -140,106 +135,6 @@ public class WifiNetworkSpecifierTest { 
                wifiNetworkSpecifier.wifiConfiguration.enterpriseConfig.getPhase2Method());

    }



    /**

     * Validate correctness of WifiNetworkSuggestion object created by

     * {@link WifiNetworkSuggestion.Builder#build()} for WPA3-Enterprise network.

     */

    @Test

    public void testWifiNetworkSuggestionBuilderForWpa3EapNetwork() {

        WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();

        enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);

        enterpriseConfig.setCaCertificate(FakeKeys.CA_CERT0);

        enterpriseConfig.setDomainSuffixMatch(TEST_DOMAIN_SUFFIX_MATCH);



        NetworkSpecifier specifier = new WifiNetworkSpecifier.Builder()

                .setSsid(TEST_SSID)

                .setWpa3EnterpriseConfig(enterpriseConfig)

                .build();



        assertTrue(specifier instanceof WifiNetworkSpecifier);

        WifiNetworkSpecifier wifiNetworkSpecifier = (WifiNetworkSpecifier) specifier;



        assertEquals("\"" + TEST_SSID + "\"", wifiNetworkSpecifier.wifiConfiguration.SSID);

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.IEEE8021X));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.WPA_EAP));

        assertFalse(wifiNetworkSpecifier.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.SUITE_B_192));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedGroupCiphers

                .get(WifiConfiguration.GroupCipher.CCMP));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.requirePmf);

        assertNull(wifiNetworkSpecifier.wifiConfiguration.preSharedKey);

        assertNotNull(wifiNetworkSpecifier.wifiConfiguration.enterpriseConfig);

    }



    /**

     * Validate correctness of WifiNetworkSuggestion object created by

     * {@link WifiNetworkSuggestion.Builder#build()} for WPA3-Enterprise 192-bit RSA SuiteB network.

     */

    @Test

    public void testWifiNetworkSuggestionBuilderForWpa3SuiteBRsaEapNetwork() {

        WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();

        enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);

        enterpriseConfig.setCaCertificate(FakeKeys.CA_SUITE_B_RSA3072_CERT);

        enterpriseConfig.setClientKeyEntryWithCertificateChain(FakeKeys.CLIENT_SUITE_B_RSA3072_KEY,

                new X509Certificate[] {FakeKeys.CLIENT_SUITE_B_RSA3072_CERT});



        enterpriseConfig.setDomainSuffixMatch(TEST_DOMAIN_SUFFIX_MATCH);



        NetworkSpecifier specifier = new WifiNetworkSpecifier.Builder()

                .setSsid(TEST_SSID)

                .setWpa3EnterpriseConfig(enterpriseConfig)

                .build();



        assertTrue(specifier instanceof WifiNetworkSpecifier);

        WifiNetworkSpecifier wifiNetworkSpecifier = (WifiNetworkSpecifier) specifier;



        assertEquals("\"" + TEST_SSID + "\"", wifiNetworkSpecifier.wifiConfiguration.SSID);

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.SUITE_B_192));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedGroupCiphers

                .get(WifiConfiguration.GroupCipher.GCMP_256));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedGroupManagementCiphers

                .get(WifiConfiguration.GroupMgmtCipher.BIP_GMAC_256));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.requirePmf);

        assertNull(wifiNetworkSpecifier.wifiConfiguration.preSharedKey);

        assertNotNull(wifiNetworkSpecifier.wifiConfiguration.enterpriseConfig);

    }



    /**

     * Validate correctness of WifiNetworkSuggestion object created by

     * {@link WifiNetworkSuggestion.Builder#build()} for WPA3-Enterprise 192-bit ECC SuiteB network.

     */

    @Test

    public void testWifiNetworkSuggestionBuilderForWpa3SuiteBEccEapNetwork() {

        WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();

        enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);

        enterpriseConfig.setCaCertificate(FakeKeys.CA_SUITE_B_ECDSA_CERT);

        enterpriseConfig.setClientKeyEntryWithCertificateChain(FakeKeys.CLIENT_SUITE_B_ECC_KEY,

                new X509Certificate[] {FakeKeys.CLIENT_SUITE_B_ECDSA_CERT});



        enterpriseConfig.setDomainSuffixMatch(TEST_DOMAIN_SUFFIX_MATCH);



        NetworkSpecifier specifier = new WifiNetworkSpecifier.Builder()

                .setSsid(TEST_SSID)

                .setWpa3EnterpriseConfig(enterpriseConfig)

                .build();



        assertTrue(specifier instanceof WifiNetworkSpecifier);

        WifiNetworkSpecifier wifiNetworkSpecifier = (WifiNetworkSpecifier) specifier;



        assertEquals("\"" + TEST_SSID + "\"", wifiNetworkSpecifier.wifiConfiguration.SSID);

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.SUITE_B_192));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedGroupCiphers

                .get(WifiConfiguration.GroupCipher.GCMP_256));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedGroupManagementCiphers

                .get(WifiConfiguration.GroupMgmtCipher.BIP_GMAC_256));

        assertTrue(wifiNetworkSpecifier.wifiConfiguration.requirePmf);

        assertNull(wifiNetworkSpecifier.wifiConfiguration.preSharedKey);

        assertNotNull(wifiNetworkSpecifier.wifiConfiguration.enterpriseConfig);

    }



    /**

     * Ensure {@link WifiNetworkSpecifier.Builder#setSsid(String)} throws an exception

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

+3 −75
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import androidx.test.filters.SmallTest; 


import org.junit.Test;



import java.security.cert.X509Certificate;



/**

 * Unit tests for {@link android.net.wifi.WifiNetworkSuggestion}.

 */
@@ -201,89 +199,19 @@ public class WifiNetworkSuggestionTest { 
        assertFalse(suggestion.isInitialAutoJoinEnabled);

    }





    /**

     * Validate correctness of WifiNetworkSuggestion object created by

     * {@link WifiNetworkSuggestion.Builder#build()} for WPA3-Enterprise network.

     * {@link WifiNetworkSuggestion.Builder#build()} for SuiteB network.

     */

    @Test

    public void testWifiNetworkSuggestionBuilderForWpa3EapNetwork() {

        WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();

        enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);

        enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.GTC);

        enterpriseConfig.setCaCertificate(FakeKeys.CA_CERT0);

        enterpriseConfig.setDomainSuffixMatch(TEST_DOMAIN_SUFFIX_MATCH);



        WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder()

                .setSsid(TEST_SSID)

                .setWpa3EnterpriseConfig(enterpriseConfig)

                .build();



        assertEquals("\"" + TEST_SSID + "\"", suggestion.wifiConfiguration.SSID);

        assertTrue(suggestion.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.IEEE8021X));

        assertTrue(suggestion.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.WPA_EAP));

        assertFalse(suggestion.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.SUITE_B_192));

        assertTrue(suggestion.wifiConfiguration.allowedGroupCiphers

                .get(WifiConfiguration.GroupCipher.CCMP));

        assertTrue(suggestion.wifiConfiguration.requirePmf);

        assertNull(suggestion.wifiConfiguration.preSharedKey);

        // allowedSuiteBCiphers are set according to the loaded certificate and cannot be tested

        // here.

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertNotNull(suggestion.getEnterpriseConfig());

    }



    /**

     * Validate correctness of WifiNetworkSuggestion object created by

     * {@link WifiNetworkSuggestion.Builder#build()} for WPA3-Enterprise 192-bit RSA SuiteB network.

     */

    @Test

    public void testWifiNetworkSuggestionBuilderForWpa3SuiteBRsaEapNetwork() {

        WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();

        enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);

        enterpriseConfig.setCaCertificate(FakeKeys.CA_SUITE_B_RSA3072_CERT);

        enterpriseConfig.setClientKeyEntryWithCertificateChain(FakeKeys.CLIENT_SUITE_B_RSA3072_KEY,

                new X509Certificate[] {FakeKeys.CLIENT_SUITE_B_RSA3072_CERT});



        enterpriseConfig.setDomainSuffixMatch(TEST_DOMAIN_SUFFIX_MATCH);



        WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder()

                .setSsid(TEST_SSID)

                .setWpa3EnterpriseConfig(enterpriseConfig)

                .build();



        assertEquals("\"" + TEST_SSID + "\"", suggestion.wifiConfiguration.SSID);

        assertTrue(suggestion.wifiConfiguration.allowedKeyManagement

                .get(WifiConfiguration.KeyMgmt.SUITE_B_192));

        assertTrue(suggestion.wifiConfiguration.allowedGroupCiphers

                .get(WifiConfiguration.GroupCipher.GCMP_256));

        assertTrue(suggestion.wifiConfiguration.allowedGroupManagementCiphers

                .get(WifiConfiguration.GroupMgmtCipher.BIP_GMAC_256));

        assertTrue(suggestion.wifiConfiguration.requirePmf);

        assertNull(suggestion.wifiConfiguration.preSharedKey);

        // allowedSuiteBCiphers are set according to the loaded certificate and cannot be tested

        // here.

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertNotNull(suggestion.getEnterpriseConfig());

    }



    /**

     * Validate correctness of WifiNetworkSuggestion object created by

     * {@link WifiNetworkSuggestion.Builder#build()} for WPA3-Enterprise 192-bit ECC SuiteB network.

     */

    @Test

    public void testWifiNetworkSuggestionBuilderForWpa3SuiteBEccEapNetwork() {

        WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();

        enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);

        enterpriseConfig.setCaCertificate(FakeKeys.CA_SUITE_B_ECDSA_CERT);

        enterpriseConfig.setClientKeyEntryWithCertificateChain(FakeKeys.CLIENT_SUITE_B_ECC_KEY,

                new X509Certificate[] {FakeKeys.CLIENT_SUITE_B_ECDSA_CERT});



        enterpriseConfig.setDomainSuffixMatch(TEST_DOMAIN_SUFFIX_MATCH);



        WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder()

                .setSsid(TEST_SSID)

                .setWpa3EnterpriseConfig(enterpriseConfig)