| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.chrome.browser.feedback; | 5 package org.chromium.chrome.browser.feedback; |
| 6 | 6 |
| 7 import android.test.suitebuilder.annotation.MediumTest; | 7 import android.test.suitebuilder.annotation.MediumTest; |
| 8 import android.test.suitebuilder.annotation.SmallTest; | 8 import android.test.suitebuilder.annotation.SmallTest; |
| 9 | 9 |
| 10 import org.chromium.base.ThreadUtils; | 10 import org.chromium.base.ThreadUtils; |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 @SmallTest | 178 @SmallTest |
| 179 @Feature({"Feedback"}) | 179 @Feature({"Feedback"}) |
| 180 public void testFeedbackDataConversion() { | 180 public void testFeedbackDataConversion() { |
| 181 Map<Type, Integer> connectionMap = new HashMap<>(); | 181 Map<Type, Integer> connectionMap = new HashMap<>(); |
| 182 connectionMap.put(Type.CHROME_HTTP, ConnectivityCheckResult.NOT_CONNECTE
D); | 182 connectionMap.put(Type.CHROME_HTTP, ConnectivityCheckResult.NOT_CONNECTE
D); |
| 183 connectionMap.put(Type.CHROME_HTTPS, ConnectivityCheckResult.CONNECTED); | 183 connectionMap.put(Type.CHROME_HTTPS, ConnectivityCheckResult.CONNECTED); |
| 184 connectionMap.put(Type.SYSTEM_HTTP, ConnectivityCheckResult.UNKNOWN); | 184 connectionMap.put(Type.SYSTEM_HTTP, ConnectivityCheckResult.UNKNOWN); |
| 185 connectionMap.put(Type.SYSTEM_HTTPS, ConnectivityCheckResult.CONNECTED); | 185 connectionMap.put(Type.SYSTEM_HTTPS, ConnectivityCheckResult.CONNECTED); |
| 186 | 186 |
| 187 FeedbackData feedback = | 187 FeedbackData feedback = |
| 188 new FeedbackData(connectionMap, 42, 21, ConnectionType.CONNECTIO
N_WIFI, 4.2); | 188 new FeedbackData(connectionMap, 42, 21, ConnectionType.CONNECTIO
N_WIFI); |
| 189 Map<String, String> map = feedback.toMap(); | 189 Map<String, String> map = feedback.toMap(); |
| 190 | 190 |
| 191 assertEquals("Should have 7 entries.", 7, map.size()); | 191 assertEquals("Should have 6 entries.", 6, map.size()); |
| 192 assertTrue(map.containsKey(ConnectivityTask.CHROME_HTTP_KEY)); | 192 assertTrue(map.containsKey(ConnectivityTask.CHROME_HTTP_KEY)); |
| 193 assertEquals("NOT_CONNECTED", map.get(ConnectivityTask.CHROME_HTTP_KEY))
; | 193 assertEquals("NOT_CONNECTED", map.get(ConnectivityTask.CHROME_HTTP_KEY))
; |
| 194 assertTrue(map.containsKey(ConnectivityTask.CHROME_HTTPS_KEY)); | 194 assertTrue(map.containsKey(ConnectivityTask.CHROME_HTTPS_KEY)); |
| 195 assertEquals("CONNECTED", map.get(ConnectivityTask.CHROME_HTTPS_KEY)); | 195 assertEquals("CONNECTED", map.get(ConnectivityTask.CHROME_HTTPS_KEY)); |
| 196 assertTrue(map.containsKey(ConnectivityTask.SYSTEM_HTTP_KEY)); | 196 assertTrue(map.containsKey(ConnectivityTask.SYSTEM_HTTP_KEY)); |
| 197 assertEquals("UNKNOWN", map.get(ConnectivityTask.SYSTEM_HTTP_KEY)); | 197 assertEquals("UNKNOWN", map.get(ConnectivityTask.SYSTEM_HTTP_KEY)); |
| 198 assertTrue(map.containsKey(ConnectivityTask.SYSTEM_HTTPS_KEY)); | 198 assertTrue(map.containsKey(ConnectivityTask.SYSTEM_HTTPS_KEY)); |
| 199 assertEquals("CONNECTED", map.get(ConnectivityTask.SYSTEM_HTTPS_KEY)); | 199 assertEquals("CONNECTED", map.get(ConnectivityTask.SYSTEM_HTTPS_KEY)); |
| 200 assertTrue(map.containsKey(ConnectivityTask.CONNECTION_CHECK_ELAPSED_KEY
)); | 200 assertTrue(map.containsKey(ConnectivityTask.CONNECTION_CHECK_ELAPSED_KEY
)); |
| 201 assertEquals("21", map.get(ConnectivityTask.CONNECTION_CHECK_ELAPSED_KEY
)); | 201 assertEquals("21", map.get(ConnectivityTask.CONNECTION_CHECK_ELAPSED_KEY
)); |
| 202 assertTrue(map.containsKey(ConnectivityTask.CONNECTION_TYPE_KEY)); | 202 assertTrue(map.containsKey(ConnectivityTask.CONNECTION_TYPE_KEY)); |
| 203 assertEquals("WiFi", map.get(ConnectivityTask.CONNECTION_TYPE_KEY)); | 203 assertEquals("WiFi", map.get(ConnectivityTask.CONNECTION_TYPE_KEY)); |
| 204 assertTrue(map.containsKey(ConnectivityTask.CONNECTION_BANDWIDTH_KEY)); | |
| 205 assertEquals("4.2", map.get(ConnectivityTask.CONNECTION_BANDWIDTH_KEY)); | |
| 206 } | 204 } |
| 207 | 205 |
| 208 private static FeedbackData getResult(final AtomicReference<ConnectivityTask
> task) { | 206 private static FeedbackData getResult(final AtomicReference<ConnectivityTask
> task) { |
| 209 final AtomicReference<FeedbackData> result = new AtomicReference<>(); | 207 final AtomicReference<FeedbackData> result = new AtomicReference<>(); |
| 210 ThreadUtils.runOnUiThreadBlocking(new Runnable() { | 208 ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
| 211 @Override | 209 @Override |
| 212 public void run() { | 210 public void run() { |
| 213 result.set(task.get().get()); | 211 result.set(task.get().get()); |
| 214 } | 212 } |
| 215 }); | 213 }); |
| 216 return result.get(); | 214 return result.get(); |
| 217 } | 215 } |
| 218 } | 216 } |
| OLD | NEW |