Index: chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java |
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java |
index 18d612d925ebd47ae635164c3abf2852f7c20928..0cc950555891da856c01800288b2c7418dc880f7 100644 |
--- a/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java |
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java |
@@ -13,6 +13,8 @@ import org.junit.Test; |
import org.junit.runner.RunWith; |
import org.robolectric.annotation.Config; |
+import org.chromium.chrome.browser.omnibox.geo.PartnerLocationDescriptor.VisibleNetwork.Cell; |
+import org.chromium.chrome.browser.omnibox.geo.PartnerLocationDescriptor.VisibleNetwork.WiFi; |
import org.chromium.chrome.browser.omnibox.geo.VisibleNetworks.VisibleCell; |
import org.chromium.chrome.browser.omnibox.geo.VisibleNetworks.VisibleCell.RadioType; |
import org.chromium.chrome.browser.omnibox.geo.VisibleNetworks.VisibleWifi; |
@@ -118,6 +120,18 @@ public class VisibleNetworksTest { |
assertEquals(VISIBLE_WIFI2.hashCode(), visibleWifi3.hashCode()); |
} |
+ @Test |
+ public void testVisibleWifiToProto() { |
+ boolean connected = true; |
+ PartnerLocationDescriptor.VisibleNetwork visibleNetwork = VISIBLE_WIFI1.toProto(connected); |
+ WiFi wifi = visibleNetwork.wifi; |
+ |
+ assertEquals(VISIBLE_WIFI1.bssid(), wifi.bssid); |
+ assertEquals(VISIBLE_WIFI1.level(), wifi.levelDbm); |
+ assertEquals(VISIBLE_WIFI1.timestampMs(), visibleNetwork.timestampMs); |
+ assertEquals(connected, visibleNetwork.connected); |
+ } |
+ |
@Test |
public void testVisibleCellBuilder() { |
for (@RadioType int radioType : RADIO_TYPES) { |
@@ -167,6 +181,44 @@ public class VisibleNetworksTest { |
assertEquals(VISIBLE_CELL1.hashCode(), VISIBLE_CELL1_DIFFERENT_TIMESTAMP.hashCode()); |
} |
+ @Test |
+ public void testVisibleCellToProto() { |
+ boolean connected = true; |
+ PartnerLocationDescriptor.VisibleNetwork visibleNetwork = VISIBLE_CELL1.toProto(connected); |
+ PartnerLocationDescriptor.VisibleNetwork.Cell cell = visibleNetwork.cell; |
+ |
+ assertEquals(VISIBLE_CELL1.cellId(), cell.cellId); |
+ assertEquals(VISIBLE_CELL1.locationAreaCode(), cell.locationAreaCode); |
+ assertEquals(VISIBLE_CELL1.mobileCountryCode(), cell.mobileCountryCode); |
+ assertEquals(VISIBLE_CELL1.mobileNetworkCode(), cell.mobileNetworkCode); |
+ assertEquals(VISIBLE_CELL1.primaryScramblingCode(), cell.primaryScramblingCode); |
+ assertEquals(VISIBLE_CELL1.physicalCellId(), cell.physicalCellId); |
+ assertEquals(VISIBLE_CELL1.trackingAreaCode(), cell.trackingAreaCode); |
+ assertEquals(VISIBLE_CELL1.timestampMs(), visibleNetwork.timestampMs); |
+ assertEquals(connected, visibleNetwork.connected); |
+ |
+ switch (VISIBLE_CELL1.radioType()) { |
+ case VisibleCell.UNKNOWN_RADIO_TYPE: |
Ted C
2017/05/17 17:44:25
I "think" this is a bit misleading. There is only
lbargu
2017/05/18 12:42:48
Done.
|
+ assertTrue(Cell.UNKNOWN == cell.type); |
+ break; |
+ case VisibleCell.UNKNOWN_MISSING_LOCATION_PERMISSION_RADIO_TYPE: |
+ assertTrue(Cell.UNKNOWN == cell.type); |
+ break; |
+ case VisibleCell.WCDMA_RADIO_TYPE: |
+ assertTrue(Cell.WCDMA == cell.type); |
+ break; |
+ case VisibleCell.LTE_RADIO_TYPE: |
+ assertTrue(Cell.LTE == cell.type); |
+ break; |
+ case VisibleCell.GSM_RADIO_TYPE: |
+ assertTrue(Cell.GSM == cell.type); |
+ break; |
+ case VisibleCell.CDMA_RADIO_TYPE: |
+ assertTrue(Cell.CDMA == cell.type); |
+ break; |
+ } |
+ } |
+ |
@Test |
public void testVisibleNetworksCreate() { |
Set<VisibleCell> expectedVisibleCells = |