Merge "Check validity of staticIpConfigurations" into oc-dev

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index 4a4caec81..fa34e07f9 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -18,6 +18,7 @@ package com.android.server.wifi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
@@ -25,6 +26,7 @@ import static org.mockito.Mockito.*;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.net.IpConfiguration;
 import android.net.wifi.WifiConfiguration;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -176,6 +178,24 @@ public class WifiServiceImplTest {
     }
 
     /**
+     * Tests the isValid() check for StaticIpConfigurations, ensuring that configurations with null
+     * ipAddress are rejected, and configurations with ipAddresses are valid.
+     */
+    @Test
+    public void testStaticIpConfigurationValidityCheck() {
+        WifiConfiguration conf = WifiConfigurationTestUtil.createOpenNetwork();
+        IpConfiguration ipConf =
+                WifiConfigurationTestUtil.createStaticIpConfigurationWithStaticProxy();
+        conf.setIpConfiguration(ipConf);
+        // Ensure staticIpConfiguration with IP Address is valid
+        assertTrue(mWifiServiceImpl.isValid(conf));
+        ipConf.staticIpConfiguration.ipAddress = null;
+        // Ensure staticIpConfiguration with null IP Address it is not valid
+        conf.setIpConfiguration(ipConf);
+        assertFalse(mWifiServiceImpl.isValid(conf));
+    }
+
+    /**
      * Ensure WifiMetrics.dump() is the only dump called when 'dumpsys wifi WifiMetricsProto' is
      * called. This is required to support simple metrics collection via dumpsys
      */