Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/nqe/network_quality_estimator_unittest.cc

Issue 2228253002: NQE: Remove Broadband from the list of ECT enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/nqe/effective_connection_type.cc ('k') | third_party/WebKit/public/platform/WebEffectiveConnectionType.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/nqe/network_quality_estimator_unittest.cc
diff --git a/net/nqe/network_quality_estimator_unittest.cc b/net/nqe/network_quality_estimator_unittest.cc
index 211bf0668abe91b7f1005fcf61cb5cd1ba755e16..d8bbbe7f7836185d4eaac4e608d34a67d99c77ab 100644
--- a/net/nqe/network_quality_estimator_unittest.cc
+++ b/net/nqe/network_quality_estimator_unittest.cc
@@ -785,7 +785,6 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsOnlyRTT) {
variation_params["2G.ThresholdMedianHttpRTTMsec"] = "1000";
variation_params["3G.ThresholdMedianHttpRTTMsec"] = "500";
variation_params["4G.ThresholdMedianHttpRTTMsec"] = "300";
- variation_params["Broadband.ThresholdMedianHttpRTTMsec"] = "100";
TestNetworkQualityEstimator estimator(variation_params);
@@ -808,9 +807,9 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsOnlyRTT) {
{500, EFFECTIVE_CONNECTION_TYPE_3G},
{400, EFFECTIVE_CONNECTION_TYPE_4G},
{300, EFFECTIVE_CONNECTION_TYPE_4G},
- {200, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {100, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {200, EFFECTIVE_CONNECTION_TYPE_4G},
+ {100, EFFECTIVE_CONNECTION_TYPE_4G},
+ {20, EFFECTIVE_CONNECTION_TYPE_4G},
};
for (const auto& test : tests) {
@@ -838,8 +837,8 @@ TEST(NetworkQualityEstimatorTest, DefaultTransportRTTBasedThresholds) {
{false, 3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
{false, 2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
{false, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
- {false, 1000, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {false, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {false, 1000, EFFECTIVE_CONNECTION_TYPE_4G},
+ {false, 20, EFFECTIVE_CONNECTION_TYPE_4G},
// Override default thresholds using variation params.
{true, 5000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
{true, 4000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
@@ -847,7 +846,7 @@ TEST(NetworkQualityEstimatorTest, DefaultTransportRTTBasedThresholds) {
{true, 2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
{true, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
{true, 1000, EFFECTIVE_CONNECTION_TYPE_2G},
- {true, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {true, 20, EFFECTIVE_CONNECTION_TYPE_4G},
};
for (const auto& test : tests) {
@@ -892,8 +891,8 @@ TEST(NetworkQualityEstimatorTest, DefaultHttpRTTBasedThresholds) {
{false, 3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
{false, 2000, EFFECTIVE_CONNECTION_TYPE_2G},
{false, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
- {false, 1000, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {false, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {false, 1000, EFFECTIVE_CONNECTION_TYPE_4G},
+ {false, 20, EFFECTIVE_CONNECTION_TYPE_4G},
// Override default thresholds using variation params.
{true, 5000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
{true, 4000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
@@ -901,7 +900,7 @@ TEST(NetworkQualityEstimatorTest, DefaultHttpRTTBasedThresholds) {
{true, 2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
{true, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
{true, 1000, EFFECTIVE_CONNECTION_TYPE_2G},
- {true, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {true, 20, EFFECTIVE_CONNECTION_TYPE_4G},
};
for (const auto& test : tests) {
@@ -941,7 +940,6 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsOnlyTransportRTT) {
variation_params["2G.ThresholdMedianTransportRTTMsec"] = "1000";
variation_params["3G.ThresholdMedianTransportRTTMsec"] = "500";
variation_params["4G.ThresholdMedianTransportRTTMsec"] = "300";
- variation_params["Broadband.ThresholdMedianTransportRTTMsec"] = "100";
TestNetworkQualityEstimator estimator(variation_params);
@@ -964,9 +962,9 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsOnlyTransportRTT) {
{500, EFFECTIVE_CONNECTION_TYPE_3G},
{400, EFFECTIVE_CONNECTION_TYPE_4G},
{300, EFFECTIVE_CONNECTION_TYPE_4G},
- {200, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {100, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {200, EFFECTIVE_CONNECTION_TYPE_4G},
+ {100, EFFECTIVE_CONNECTION_TYPE_4G},
+ {20, EFFECTIVE_CONNECTION_TYPE_4G},
};
for (const auto& test : tests) {
@@ -991,14 +989,12 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsHttpRTTandThroughput) {
variation_params["2G.ThresholdMedianHttpRTTMsec"] = "1000";
variation_params["3G.ThresholdMedianHttpRTTMsec"] = "500";
variation_params["4G.ThresholdMedianHttpRTTMsec"] = "300";
- variation_params["Broadband.ThresholdMedianHttpRTTMsec"] = "100";
variation_params["Offline.ThresholdMedianKbps"] = "10";
variation_params["Slow2G.ThresholdMedianKbps"] = "100";
variation_params["2G.ThresholdMedianKbps"] = "300";
variation_params["3G.ThresholdMedianKbps"] = "500";
variation_params["4G.ThresholdMedianKbps"] = "1000";
- variation_params["Broadband.ThresholdMedianKbps"] = "2000";
TestNetworkQualityEstimator estimator(variation_params);
@@ -1024,8 +1020,8 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsHttpRTTandThroughput) {
{1, 500, EFFECTIVE_CONNECTION_TYPE_3G},
{1, 700, EFFECTIVE_CONNECTION_TYPE_4G},
{1, 1000, EFFECTIVE_CONNECTION_TYPE_4G},
- {1, 1500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {1, 2500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {1, 1500, EFFECTIVE_CONNECTION_TYPE_4G},
+ {1, 2500, EFFECTIVE_CONNECTION_TYPE_4G},
// Set both RTT and throughput. RTT is the bottleneck.
{3000, 25000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
{700, 25000, EFFECTIVE_CONNECTION_TYPE_3G},
@@ -1055,14 +1051,12 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsTransportRTTandThroughput) {
variation_params["2G.ThresholdMedianTransportRTTMsec"] = "1000";
variation_params["3G.ThresholdMedianTransportRTTMsec"] = "500";
variation_params["4G.ThresholdMedianTransportRTTMsec"] = "300";
- variation_params["Broadband.ThresholdMedianTransportRTTMsec"] = "100";
variation_params["Offline.ThresholdMedianKbps"] = "10";
variation_params["Slow2G.ThresholdMedianKbps"] = "100";
variation_params["2G.ThresholdMedianKbps"] = "300";
variation_params["3G.ThresholdMedianKbps"] = "500";
variation_params["4G.ThresholdMedianKbps"] = "1000";
- variation_params["Broadband.ThresholdMedianKbps"] = "2000";
TestNetworkQualityEstimator estimator(variation_params);
@@ -1088,8 +1082,8 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsTransportRTTandThroughput) {
{1, 500, EFFECTIVE_CONNECTION_TYPE_3G},
{1, 700, EFFECTIVE_CONNECTION_TYPE_4G},
{1, 1000, EFFECTIVE_CONNECTION_TYPE_4G},
- {1, 1500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {1, 2500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {1, 1500, EFFECTIVE_CONNECTION_TYPE_4G},
+ {1, 2500, EFFECTIVE_CONNECTION_TYPE_4G},
// Set both RTT and throughput. RTT is the bottleneck.
{3000, 25000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
{700, 25000, EFFECTIVE_CONNECTION_TYPE_3G},
@@ -1138,15 +1132,14 @@ TEST(NetworkQualityEstimatorTest, HalfLifeParam) {
TEST(NetworkQualityEstimatorTest, TestGetMetricsSince) {
std::map<std::string, std::string> variation_params;
- const base::TimeDelta rtt_threshold_4g =
+ const base::TimeDelta rtt_threshold_3g =
base::TimeDelta::FromMilliseconds(30);
- const base::TimeDelta rtt_threshold_broadband =
- base::TimeDelta::FromMilliseconds(1);
+ const base::TimeDelta rtt_threshold_4g = base::TimeDelta::FromMilliseconds(1);
+ variation_params["3G.ThresholdMedianHttpRTTMsec"] =
+ base::IntToString(rtt_threshold_3g.InMilliseconds());
variation_params["4G.ThresholdMedianHttpRTTMsec"] =
base::IntToString(rtt_threshold_4g.InMilliseconds());
- variation_params["Broadband.ThresholdMedianHttpRTTMsec"] =
- base::IntToString(rtt_threshold_broadband.InMilliseconds());
variation_params["HalfLifeSeconds"] = "300000";
TestNetworkQualityEstimator estimator(variation_params);
@@ -1161,8 +1154,8 @@ TEST(NetworkQualityEstimatorTest, TestGetMetricsSince) {
const base::TimeDelta old_url_rtt = base::TimeDelta::FromMilliseconds(1);
const base::TimeDelta old_tcp_rtt = base::TimeDelta::FromMilliseconds(10);
- DCHECK_LT(old_url_rtt, rtt_threshold_4g);
- DCHECK_LT(old_tcp_rtt, rtt_threshold_4g);
+ DCHECK_LT(old_url_rtt, rtt_threshold_3g);
+ DCHECK_LT(old_tcp_rtt, rtt_threshold_3g);
// First sample has very old timestamp.
for (size_t i = 0; i < 2; ++i) {
@@ -1185,10 +1178,10 @@ TEST(NetworkQualityEstimatorTest, TestGetMetricsSince) {
DCHECK_NE(old_downlink_kbps, new_downlink_kbps);
DCHECK_NE(old_url_rtt, new_url_rtt);
DCHECK_NE(old_tcp_rtt, new_tcp_rtt);
+ DCHECK_GT(new_url_rtt, rtt_threshold_3g);
+ DCHECK_GT(new_tcp_rtt, rtt_threshold_3g);
DCHECK_GT(new_url_rtt, rtt_threshold_4g);
DCHECK_GT(new_tcp_rtt, rtt_threshold_4g);
- DCHECK_GT(new_url_rtt, rtt_threshold_broadband);
- DCHECK_GT(new_tcp_rtt, rtt_threshold_broadband);
estimator.downstream_throughput_kbps_observations_.AddObservation(
NetworkQualityEstimator::ThroughputObservation(
@@ -1211,12 +1204,11 @@ TEST(NetworkQualityEstimatorTest, TestGetMetricsSince) {
} tests[] = {
{now + base::TimeDelta::FromSeconds(10), false,
base::TimeDelta::FromMilliseconds(0),
- base::TimeDelta::FromMilliseconds(0), 0,
- EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ base::TimeDelta::FromMilliseconds(0), 0, EFFECTIVE_CONNECTION_TYPE_4G},
{now, true, new_url_rtt, new_tcp_rtt, new_downlink_kbps,
- EFFECTIVE_CONNECTION_TYPE_4G},
+ EFFECTIVE_CONNECTION_TYPE_3G},
{old - base::TimeDelta::FromMicroseconds(500), true, old_url_rtt,
- old_tcp_rtt, old_downlink_kbps, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ old_tcp_rtt, old_downlink_kbps, EFFECTIVE_CONNECTION_TYPE_4G},
};
for (const auto& test : tests) {
« no previous file with comments | « net/nqe/effective_connection_type.cc ('k') | third_party/WebKit/public/platform/WebEffectiveConnectionType.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698