Import utils tests am: 1b159a4341

Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2633281

Change-Id: I9622fc6ce8f6c4cc85e04fde92a60823658fde0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5 files changed, 363 insertions, 3 deletions

diff --git a/Android.extras.bp b/Android.extras.bp
index 1e3283722..cacf7c52d 100644
--- a/Android.extras.bp
+++ b/Android.extras.bp
@@ -346,6 +346,15 @@ genrule {
     ],
 }
 
+filegroup {
+   name: "cronet_logger_tests_sources",
+   srcs: [
+        "logging/SizeBucketsTest.java",
+        "logging/RateLimiterTest.java",
+        "logging/ExperimentalOptionsTest.java",
+    ],
+}
+
 android_library {
     name: "cronet_java_tests",
     defaults: ["jni_proxy_natives_defaults"],
@@ -357,6 +366,7 @@ android_library {
     srcs: [
         ":cronet_aml_javatests_sources",
         ":cronet_java_tests_jni",
+        ":cronet_logger_tests_sources",
         ":cronet_testserver_utils_srcs",
     ],
     sdk_version: "module_current",
@@ -365,6 +375,10 @@ android_library {
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "cronet_aml_java__testing",
+        "cronet_experimental_options",
+        "cronet_rate_limiter",
+        "cronet_size_buckets",
+        "cronetstatslog_autogenerated_methods",
         "guava",
         "hamcrest-library",
         "junit",
diff --git a/logging/Android.bp b/logging/Android.bp
index 923eabdba..b4e223982 100644
--- a/logging/Android.bp
+++ b/logging/Android.bp
@@ -35,7 +35,7 @@ java_library {
 }
 
 java_library {
-    name: "experimental_options",
+    name: "cronet_experimental_options",
     srcs: [
         "ExperimentalOptions.java",
     ],
@@ -50,7 +50,7 @@ java_library {
 }
 
 java_library {
-    name: "rate_limiter",
+    name: "cronet_rate_limiter",
     srcs: [
         "RateLimiter.java",
     ],
@@ -62,7 +62,7 @@ java_library {
 }
 
 java_library {
-    name: "size_buckets",
+    name: "cronet_size_buckets",
     srcs: [
         "SizeBuckets.java",
     ],
diff --git a/logging/ExperimentalOptionsTest.java b/logging/ExperimentalOptionsTest.java
new file mode 100644
index 000000000..137f0179e
--- /dev/null
+++ b/logging/ExperimentalOptionsTest.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.http;
+
+import static com.google.common.truth.Truth.assertThat;
+import static android.net.http.ExperimentalOptions.UNSET_INT_VALUE;
+import static android.net.http.ExperimentalOptions.validConnectionOptions;
+import static org.junit.Assert.assertEquals;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.common.base.Splitter;
+import android.net.http.ExperimentalOptions.OptionalBoolean;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class ExperimentalOptionsTest {
+
+  // Some random numbers to test with
+  private static final int TEST_VALUE = 2;
+  private static final String CONN_STRING = "CHLO,IW10";
+
+  @Test
+  public void testExperimentalOptionsConnectionoptions_shouldConsistofCommaSeparatedStringofChars()
+      throws JSONException {
+    // QUIC connection options are represented with a comma separated list of {3,4}-char strings eg
+    // 'ABCD, EFGH'
+    JSONObject quicExperiment =
+        new JSONObject().put("connection_options", "|we/3," + CONN_STRING + ",bbra@google.com");
+    JSONObject experimentalOptions = new JSONObject().put("QUIC", quicExperiment);
+    ExperimentalOptions options = new ExperimentalOptions(experimentalOptions.toString());
+
+    String connectionOptions = options.getConnectionOptionsOption();
+    Iterable<String> optionsArray = Splitter.on(',').split(connectionOptions);
+
+    assertEquals(CONN_STRING, connectionOptions);
+    for (String option : optionsArray) {
+      assertThat(validConnectionOptions).contains(option);
+    }
+  }
+
+  @Test
+  public void testNullString_shouldUseUnsetValues() {
+    ExperimentalOptions option = new ExperimentalOptions("");
+
+    assertThat(option.getConnectionOptionsOption()).isNull();
+    assertEquals(OptionalBoolean.UNSET, option.getStoreServerConfigsInPropertiesOption());
+    assertEquals(UNSET_INT_VALUE, option.getMaxServerConfigsStoredInPropertiesOption());
+    assertEquals(UNSET_INT_VALUE, option.getIdleConnectionTimeoutSecondsOption());
+    assertEquals(OptionalBoolean.UNSET, option.getGoawaySessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.UNSET, option.getCloseSessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsOnNetworkChangeV2Option());
+    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsEarlyV2());
+    assertEquals(OptionalBoolean.UNSET, option.getDisableBidirectionalStreamsOption());
+    assertEquals(UNSET_INT_VALUE, option.getMaxTimeBeforeCryptoHandshakeSecondsOption());
+    assertEquals(UNSET_INT_VALUE, option.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption());
+    assertEquals(OptionalBoolean.UNSET, option.getEnableSocketRecvOptimizationOption());
+    assertEquals(OptionalBoolean.UNSET, option.getAsyncDnsEnableOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsEnableOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsDelayMillisOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxExpiredTimeMillisOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxStaleUsesOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsAllowOtherNetworkOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsPersistToDiskOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsPersistDelayMillisOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsUseStaleOnNameNotResolvedOption());
+    assertEquals(OptionalBoolean.UNSET, option.getDisableIpv6OnWifiOption());
+  }
+
+  @Test
+  public void testInvalidString_shouldUseUnsetValues() {
+    ExperimentalOptions option = new ExperimentalOptions("blah");
+
+    assertThat(option.getConnectionOptionsOption()).isNull();
+    assertEquals(OptionalBoolean.UNSET, option.getStoreServerConfigsInPropertiesOption());
+    assertEquals(UNSET_INT_VALUE, option.getMaxServerConfigsStoredInPropertiesOption());
+    assertEquals(UNSET_INT_VALUE, option.getIdleConnectionTimeoutSecondsOption());
+    assertEquals(OptionalBoolean.UNSET, option.getGoawaySessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.UNSET, option.getCloseSessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsOnNetworkChangeV2Option());
+    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsEarlyV2());
+    assertEquals(OptionalBoolean.UNSET, option.getDisableBidirectionalStreamsOption());
+    assertEquals(UNSET_INT_VALUE, option.getMaxTimeBeforeCryptoHandshakeSecondsOption());
+    assertEquals(UNSET_INT_VALUE, option.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption());
+    assertEquals(OptionalBoolean.UNSET, option.getEnableSocketRecvOptimizationOption());
+    assertEquals(OptionalBoolean.UNSET, option.getAsyncDnsEnableOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsEnableOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsDelayMillisOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxExpiredTimeMillisOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxStaleUsesOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsAllowOtherNetworkOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsPersistToDiskOption());
+    assertEquals(UNSET_INT_VALUE, option.getStaleDnsPersistDelayMillisOption());
+    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsUseStaleOnNameNotResolvedOption());
+    assertEquals(OptionalBoolean.UNSET, option.getDisableIpv6OnWifiOption());
+  }
+
+  @Test
+  public void testSetToTrueOptions_shouldUseSetValues() throws JSONException {
+    ExperimentalOptions option = generateExperimentalValuesWith(true);
+
+    assertEquals(OptionalBoolean.TRUE, option.getStoreServerConfigsInPropertiesOption());
+    assertEquals(TEST_VALUE, option.getMaxServerConfigsStoredInPropertiesOption());
+    assertEquals(TEST_VALUE, option.getIdleConnectionTimeoutSecondsOption());
+    assertEquals(OptionalBoolean.TRUE, option.getGoawaySessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.TRUE, option.getCloseSessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.TRUE, option.getMigrateSessionsOnNetworkChangeV2Option());
+    assertEquals(OptionalBoolean.TRUE, option.getMigrateSessionsEarlyV2());
+    assertEquals(OptionalBoolean.TRUE, option.getDisableBidirectionalStreamsOption());
+    assertEquals(TEST_VALUE, option.getMaxTimeBeforeCryptoHandshakeSecondsOption());
+    assertEquals(TEST_VALUE, option.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption());
+    assertEquals(OptionalBoolean.TRUE, option.getEnableSocketRecvOptimizationOption());
+    assertEquals(OptionalBoolean.TRUE, option.getAsyncDnsEnableOption());
+    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsEnableOption());
+    assertEquals(TEST_VALUE, option.getStaleDnsDelayMillisOption());
+    assertEquals(TEST_VALUE, option.getStaleDnsMaxExpiredTimeMillisOption());
+    assertEquals(TEST_VALUE, option.getStaleDnsMaxStaleUsesOption());
+    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsAllowOtherNetworkOption());
+    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsPersistToDiskOption());
+    assertEquals(TEST_VALUE, option.getStaleDnsPersistDelayMillisOption());
+    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsUseStaleOnNameNotResolvedOption());
+    assertEquals(OptionalBoolean.TRUE, option.getDisableIpv6OnWifiOption());
+  }
+
+  @Test
+  public void testSetToFalseOptions_shouldUseFalseValues() throws JSONException {
+    ExperimentalOptions option = generateExperimentalValuesWith(false);
+
+    assertEquals(OptionalBoolean.FALSE, option.getStoreServerConfigsInPropertiesOption());
+    assertEquals(OptionalBoolean.FALSE, option.getGoawaySessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.FALSE, option.getCloseSessionsOnIpChangeOption());
+    assertEquals(OptionalBoolean.FALSE, option.getMigrateSessionsOnNetworkChangeV2Option());
+    assertEquals(OptionalBoolean.FALSE, option.getMigrateSessionsEarlyV2());
+    assertEquals(OptionalBoolean.FALSE, option.getDisableBidirectionalStreamsOption());
+    assertEquals(OptionalBoolean.FALSE, option.getEnableSocketRecvOptimizationOption());
+    assertEquals(OptionalBoolean.FALSE, option.getAsyncDnsEnableOption());
+    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsEnableOption());
+    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsAllowOtherNetworkOption());
+    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsPersistToDiskOption());
+    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsUseStaleOnNameNotResolvedOption());
+    assertEquals(OptionalBoolean.FALSE, option.getDisableIpv6OnWifiOption());
+  }
+
+  private ExperimentalOptions generateExperimentalValuesWith(Boolean value) throws JSONException {
+    JSONObject quicExperiment =
+        new JSONObject()
+            .put("connection_options", "")
+            .put("store_server_configs_in_properties", value)
+            .put("goaway_sessions_on_ip_change", value)
+            .put("close_sessions_on_ip_change", value)
+            .put("migrate_sessions_on_network_change_v2", value)
+            .put("migrate_sessions_early_v2", value)
+            .put("disable_bidirectional_streams", value)
+            .put("enable_socket_recv_optimization", value);
+    JSONObject asyncDNS = new JSONObject().put("enable", value);
+    JSONObject staleDNS =
+        new JSONObject()
+            .put("enable", value)
+            .put("allow_other_network", value)
+            .put("persist_to_disk", value)
+            .put("use_stale_on_name_not_resolved", value);
+
+    // add the integer values if needed
+    if (value) {
+      quicExperiment
+          .put("connection_options", CONN_STRING)
+          .put("max_server_configs_stored_in_properties", TEST_VALUE)
+          .put("idle_connection_timeout_seconds", TEST_VALUE)
+          .put("max_time_before_crypto_handshake_seconds", TEST_VALUE)
+          .put("max_idle_time_before_crypto_handshake_seconds", TEST_VALUE);
+
+      staleDNS
+          .put("delay_ms", TEST_VALUE)
+          .put("max_expired_time_ms", TEST_VALUE)
+          .put("max_stale_uses", TEST_VALUE)
+          .put("persist_delay_ms", TEST_VALUE);
+    }
+
+    JSONObject options =
+        new JSONObject()
+            .put("QUIC", quicExperiment)
+            .put("AsyncDNS", asyncDNS)
+            .put("StaleDNS", staleDNS)
+            .put("disable_ipv6_on_wifi", value);
+
+    return new ExperimentalOptions(options.toString());
+  }
+}
diff --git a/logging/RateLimiterTest.java b/logging/RateLimiterTest.java
new file mode 100644
index 000000000..b3fc29f78
--- /dev/null
+++ b/logging/RateLimiterTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.http;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.time.Duration;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class RateLimiterTest {
+
+  @Test
+  public void testImmediateRateLimit() {
+    RateLimiter rateLimiter = new RateLimiter(1);
+    assertTrue("First request was rate limited", rateLimiter.tryAcquire());
+    assertFalse("Second request was not rate limited", rateLimiter.tryAcquire());
+  }
+
+  @Test
+  public void testInvalidSamplePerSecond() {
+    int samplesPerSecond = -1;
+    assertThrows(
+        "samples per second was negative",
+        IllegalArgumentException.class,
+        () -> new RateLimiter(samplesPerSecond));
+  }
+}
diff --git a/logging/SizeBucketsTest.java b/logging/SizeBucketsTest.java
new file mode 100644
index 000000000..0f309fa3b
--- /dev/null
+++ b/logging/SizeBucketsTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class SizeBucketsTest {
+
+  private static final long INVALID = -1L;
+  private static final long ZERO = 0L;
+  private static final long ONE_KB_IN_BYTES = 1024L;
+  private static final long FIFTY_KB_IN_BYTES = 50L * ONE_KB_IN_BYTES;
+  private static final long TWO_HUNDRED_KB_IN_BYTES = 200L * ONE_KB_IN_BYTES;
+  private static final long ONE_THOUSAND_KB_IN_BYTES = 1000L * ONE_KB_IN_BYTES;
+  private static final long FIVE_THOUSAND_KB_IN_BYTES = 5000L * ONE_KB_IN_BYTES;
+
+  @Test
+  public void calcRequestHeadersSizeBucket_validInput_shouldReturnTheRightBucketSize() {
+    assertEquals(
+        CronetStatsLog
+            .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_UNDER_ONE_KIB,
+        SizeBuckets.calcRequestHeadersSizeBucket(ZERO));
+    assertEquals(
+        CronetStatsLog
+            .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_OVER_HUNDRED_KIB,
+        SizeBuckets.calcRequestHeadersSizeBucket(TWO_HUNDRED_KB_IN_BYTES));
+  }
+
+  @Test
+  public void calcResponseHeadersSizeBucket_validInput_shouldReturnTheRightBucketSize() {
+    assertEquals(
+        CronetStatsLog
+            .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_ONE_TO_TEN_KIB,
+        SizeBuckets.calcResponseHeadersSizeBucket(ONE_KB_IN_BYTES));
+    assertEquals(
+        CronetStatsLog
+            .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_FIFTY_TO_HUNDRED_KIB,
+        SizeBuckets.calcResponseHeadersSizeBucket(FIFTY_KB_IN_BYTES));
+  }
+
+  @Test
+  public void calcRequestBodySizeBucket_validInput_shouldReturnTheRightBucketSize() {
+    assertEquals(
+        CronetStatsLog.CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_ZERO,
+        SizeBuckets.calcRequestBodySizeBucket(ZERO));
+    assertEquals(
+        CronetStatsLog
+            .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_OVER_FIVE_MIB,
+        SizeBuckets.calcRequestBodySizeBucket(FIVE_THOUSAND_KB_IN_BYTES));
+  }
+
+  @Test
+  public void calcResponseBodySizeBucket_validInput_shouldReturnTheRightBucketSize() {
+    assertEquals(
+        CronetStatsLog
+            .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_UNDER_TEN_KIB,
+        SizeBuckets.calcResponseBodySizeBucket(ONE_KB_IN_BYTES));
+    assertEquals(
+        CronetStatsLog
+            .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_ONE_TO_FIVE_MIB,
+        SizeBuckets.calcResponseBodySizeBucket(ONE_THOUSAND_KB_IN_BYTES));
+  }
+
+  @Test
+  public void calcSizeBucket_invalidInput_shouldThrow() {
+    assertThrows(
+        IllegalArgumentException.class, () -> SizeBuckets.calcRequestBodySizeBucket(INVALID));
+    assertThrows(
+        IllegalArgumentException.class, () -> SizeBuckets.calcRequestHeadersSizeBucket(INVALID));
+    assertThrows(
+        IllegalArgumentException.class, () -> SizeBuckets.calcRequestBodySizeBucket(INVALID));
+    assertThrows(
+        IllegalArgumentException.class, () -> SizeBuckets.calcResponseHeadersSizeBucket(INVALID));
+  }
+}
+