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

Commit b1383c16 authored by Nate Jiang's avatar Nate Jiang Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig" am: f570f1bd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294734

Change-Id: Id2f8900d4a08b3377f8d3fe232125dee34a7bf33
parents 39ed7a1b f570f1bd

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

+0 −11
Original line number Original line Diff line number Diff line
@@ -62,7 +62,6 @@ public class WifiNetworkSuggestionTest { 
        assertEquals(-1, suggestion.wifiConfiguration.priority);

        assertEquals(-1, suggestion.wifiConfiguration.priority);

        assertFalse(suggestion.isUserAllowedToManuallyConnect);

        assertFalse(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -93,7 +92,6 @@ public class WifiNetworkSuggestionTest { 
        assertEquals(0, suggestion.wifiConfiguration.priority);

        assertEquals(0, suggestion.wifiConfiguration.priority);

        assertFalse(suggestion.isUserAllowedToManuallyConnect);

        assertFalse(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -124,7 +122,6 @@ public class WifiNetworkSuggestionTest { 
        assertEquals(-1, suggestion.wifiConfiguration.priority);

        assertEquals(-1, suggestion.wifiConfiguration.priority);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertFalse(suggestion.isInitialAutoJoinEnabled);

        assertFalse(suggestion.isInitialAutoJoinEnabled);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -155,7 +152,6 @@ public class WifiNetworkSuggestionTest { 
        assertEquals(-1, suggestion.wifiConfiguration.priority);

        assertEquals(-1, suggestion.wifiConfiguration.priority);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertFalse(suggestion.isInitialAutoJoinEnabled);

        assertFalse(suggestion.isInitialAutoJoinEnabled);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -178,7 +174,6 @@ public class WifiNetworkSuggestionTest { 
        assertTrue(suggestion.wifiConfiguration.requirePmf);

        assertTrue(suggestion.wifiConfiguration.requirePmf);

        assertFalse(suggestion.isUserAllowedToManuallyConnect);

        assertFalse(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -202,7 +197,6 @@ public class WifiNetworkSuggestionTest { 
        assertTrue(suggestion.wifiConfiguration.requirePmf);

        assertTrue(suggestion.wifiConfiguration.requirePmf);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertFalse(suggestion.isInitialAutoJoinEnabled);

        assertFalse(suggestion.isInitialAutoJoinEnabled);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }
@@ -236,7 +230,6 @@ public class WifiNetworkSuggestionTest { 
        // here.

        // here.

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertTrue(suggestion.isInitialAutoJoinEnabled);

        assertNotNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -293,7 +286,6 @@ public class WifiNetworkSuggestionTest { 
                .get(WifiConfiguration.GroupCipher.SMS4));

                .get(WifiConfiguration.GroupCipher.SMS4));

        assertEquals("\"" + TEST_PRESHARED_KEY + "\"",

        assertEquals("\"" + TEST_PRESHARED_KEY + "\"",

                suggestion.wifiConfiguration.preSharedKey);

                suggestion.wifiConfiguration.preSharedKey);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }
@@ -324,7 +316,6 @@ public class WifiNetworkSuggestionTest { 
                suggestion.wifiConfiguration.enterpriseConfig.getEapMethod());

                suggestion.wifiConfiguration.enterpriseConfig.getEapMethod());

        assertEquals(TEST_WAPI_CERT_SUITE,

        assertEquals(TEST_WAPI_CERT_SUITE,

                suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite());

                suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite());

        assertNotNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -354,7 +345,6 @@ public class WifiNetworkSuggestionTest { 
                suggestion.wifiConfiguration.enterpriseConfig.getEapMethod());

                suggestion.wifiConfiguration.enterpriseConfig.getEapMethod());

        assertEquals("",

        assertEquals("",

                suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite());

                suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite());

        assertNotNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**
@@ -377,7 +367,6 @@ public class WifiNetworkSuggestionTest { 
        assertEquals(suggestion.getPasspointConfig().getMeteredOverride(),

        assertEquals(suggestion.getPasspointConfig().getMeteredOverride(),

                WifiConfiguration.METERED_OVERRIDE_METERED);

                WifiConfiguration.METERED_OVERRIDE_METERED);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertTrue(suggestion.isUserAllowedToManuallyConnect);

        assertNull(suggestion.getEnterpriseConfig());

    }

    }





    /**

    /**