From b8f296da22509434a35cb173956e63b374c2b632 Mon Sep 17 00:00:00 2001 From: Tej Singh Date: Fri, 20 Dec 2019 17:13:06 -0800 Subject: [PATCH] Unit tests for PullAtomMetadata Bug: 146385269 Test: bit FrameworksCoreTests:android.app.PullAtomMetadata Change-Id: I4c78d2744348dbab6ee792caa0a7a8bbd3c17f28 --- core/java/android/app/StatsManager.java | 38 ++++++++- .../src/android/app/PullAtomMetadataTest.java | 85 +++++++++++++++++++ 2 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 core/tests/coretests/src/android/app/PullAtomMetadataTest.java diff --git a/core/java/android/app/StatsManager.java b/core/java/android/app/StatsManager.java index 2d851e0abe6d8..b9893aaa66a48 100644 --- a/core/java/android/app/StatsManager.java +++ b/core/java/android/app/StatsManager.java @@ -38,6 +38,7 @@ import android.util.StatsEvent; import android.util.StatsEventParcel; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.List; @@ -121,8 +122,17 @@ public final class StatsManager { **/ public static final int PULL_SKIP = 1; - private static final long DEFAULT_COOL_DOWN_NS = 1_000_000_000L; // 1 second. - private static final long DEFAULT_TIMEOUT_NS = 10_000_000_000L; // 10 seconds. + /** + * @hide + **/ + @VisibleForTesting + public static final long DEFAULT_COOL_DOWN_NS = 1_000_000_000L; // 1 second. + + /** + * @hide + **/ + @VisibleForTesting + public static final long DEFAULT_TIMEOUT_NS = 10_000_000_000L; // 10 seconds. /** * Constructor for StatsManagerClient. @@ -677,6 +687,30 @@ public final class StatsManager { return new PullAtomMetadata(mCoolDownNs, mTimeoutNs, mAdditiveFields); } } + + /** + * @hide + */ + @VisibleForTesting + public long getCoolDownNs() { + return mCoolDownNs; + } + + /** + * @hide + */ + @VisibleForTesting + public long getTimeoutNs() { + return mTimeoutNs; + } + + /** + * @hide + */ + @VisibleForTesting + public int[] getAdditiveFields() { + return mAdditiveFields; + } } /** diff --git a/core/tests/coretests/src/android/app/PullAtomMetadataTest.java b/core/tests/coretests/src/android/app/PullAtomMetadataTest.java new file mode 100644 index 0000000000000..2e3f8928d9c25 --- /dev/null +++ b/core/tests/coretests/src/android/app/PullAtomMetadataTest.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2019 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.app; + +import static com.google.common.truth.Truth.assertThat; + +import android.app.StatsManager.PullAtomMetadata; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public final class PullAtomMetadataTest { + + @Test + public void testEmpty() { + PullAtomMetadata metadata = PullAtomMetadata.newBuilder().build(); + assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS); + assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS); + assertThat(metadata.getAdditiveFields()).isNull(); + } + + @Test + public void testSetTimeoutNs() { + long timeoutNs = 500_000_000L; + PullAtomMetadata metadata = + PullAtomMetadata.newBuilder().setTimeoutNs(timeoutNs).build(); + assertThat(metadata.getTimeoutNs()).isEqualTo(timeoutNs); + assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS); + assertThat(metadata.getAdditiveFields()).isNull(); + } + + @Test + public void testSetCoolDownNs() { + long coolDownNs = 10_000_000_000L; + PullAtomMetadata metadata = + PullAtomMetadata.newBuilder().setCoolDownNs(coolDownNs).build(); + assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS); + assertThat(metadata.getCoolDownNs()).isEqualTo(coolDownNs); + assertThat(metadata.getAdditiveFields()).isNull(); + } + + @Test + public void testSetAdditiveFields() { + int[] fields = {2, 4, 6}; + PullAtomMetadata metadata = + PullAtomMetadata.newBuilder().setAdditiveFields(fields).build(); + assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS); + assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS); + assertThat(metadata.getAdditiveFields()).isEqualTo(fields); + } + + @Test + public void testSetAllElements() { + long timeoutNs = 300L; + long coolDownNs = 9572L; + int[] fields = {3, 2}; + PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + .setTimeoutNs(timeoutNs) + .setCoolDownNs(coolDownNs) + .setAdditiveFields(fields) + .build(); + assertThat(metadata.getTimeoutNs()).isEqualTo(timeoutNs); + assertThat(metadata.getCoolDownNs()).isEqualTo(coolDownNs); + assertThat(metadata.getAdditiveFields()).isEqualTo(fields); + } +}