Merge "Override equals() for wificond java side parceable classes"

2 files changed, 4 insertions, 37 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java b/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java
index 7cdba9c69..ee40197a4 100644
--- a/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java
@@ -16,7 +16,6 @@
 
 package com.android.server.wifi.wificond;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -72,24 +71,7 @@ public class PnoSettingsTest {
         PnoSettings pnoSettingsDeserialized =
                 pnoSettings.CREATOR.createFromParcel(parcel);
 
-        assertEquals(pnoSettings.intervalMs,
-                     pnoSettingsDeserialized.intervalMs);
-        assertEquals(pnoSettings.min2gRssi,
-                     pnoSettingsDeserialized.min2gRssi);
-        assertEquals(pnoSettings.min5gRssi,
-                     pnoSettingsDeserialized.min5gRssi);
-
-        assertNotNull(pnoSettingsDeserialized.pnoNetworks);
-        assertEquals(pnoSettings.pnoNetworks.size(),
-                     pnoSettingsDeserialized.pnoNetworks.size());
-        assertArrayEquals(pnoSettings.pnoNetworks.get(0).ssid,
-                          pnoSettingsDeserialized.pnoNetworks.get(0).ssid);
-        assertArrayEquals(pnoSettings.pnoNetworks.get(1).ssid,
-                          pnoSettingsDeserialized.pnoNetworks.get(1).ssid);
-        assertEquals(pnoSettings.pnoNetworks.get(0).isHidden,
-                          pnoSettingsDeserialized.pnoNetworks.get(0).isHidden);
-        assertEquals(pnoSettings.pnoNetworks.get(1).isHidden,
-                          pnoSettingsDeserialized.pnoNetworks.get(1).isHidden);
-
+        assertNotNull(pnoSettingsDeserialized);
+        assertEquals(pnoSettings, pnoSettingsDeserialized);
     }
 }
diff --git a/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java b/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java
index 072506d9d..0a63616af 100644
--- a/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java
@@ -16,7 +16,6 @@
 
 package com.android.server.wifi.wificond;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -69,21 +68,7 @@ public class SingleScanSettingsTest {
         SingleScanSettings scanSettingsDeserialized =
                 SingleScanSettings.CREATOR.createFromParcel(parcel);
 
-        assertNotNull(scanSettingsDeserialized.channelSettings);
-        assertEquals(scanSettings.channelSettings.size(),
-                     scanSettingsDeserialized.channelSettings.size());
-        assertArrayEquals(scanSettings.hiddenNetworks.get(0).ssid,
-                          scanSettingsDeserialized.hiddenNetworks.get(0).ssid);
-        assertArrayEquals(scanSettings.hiddenNetworks.get(1).ssid,
-                          scanSettingsDeserialized.hiddenNetworks.get(1).ssid);
-
-        assertNotNull(scanSettingsDeserialized.hiddenNetworks);
-        assertEquals(scanSettings.hiddenNetworks.size(),
-                     scanSettingsDeserialized.hiddenNetworks.size());
-        assertEquals(scanSettings.channelSettings.get(0).frequency,
-                          scanSettingsDeserialized.channelSettings.get(0).frequency);
-        assertEquals(scanSettings.channelSettings.get(1).frequency,
-                          scanSettingsDeserialized.channelSettings.get(1).frequency);
-
+        assertNotNull(scanSettingsDeserialized);
+        assertEquals(scanSettings, scanSettingsDeserialized);
     }
 }