Extra unit tests for watchdog test coverage
These unit tests should be replaced with the
@ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE). This
requires System API approval given the classes are annotated with
@SystemApi.
Test: atest CarServiceUnitTest
Bug: 190838629
Bug: 190838274
Bug: 190838204
Bug: 190837875
Bug: 190837658
Change-Id: I08ab24892a77a7c6c5b3a72b57f8af0b1aa45669
diff --git a/car-lib/src/android/car/watchdog/IoOveruseAlertThreshold.java b/car-lib/src/android/car/watchdog/IoOveruseAlertThreshold.java
index 153e811..a9886ac 100644
--- a/car-lib/src/android/car/watchdog/IoOveruseAlertThreshold.java
+++ b/car-lib/src/android/car/watchdog/IoOveruseAlertThreshold.java
@@ -16,11 +16,14 @@
package android.car.watchdog;
+import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
+
import android.annotation.NonNull;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.os.Parcelable;
+import com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport;
import com.android.internal.util.DataClass;
/**
@@ -166,6 +169,7 @@
sourceFile = "packages/services/Car/car-lib/src/android/car/watchdog/IoOveruseAlertThreshold.java",
inputSignatures = "private @android.annotation.SuppressLint long mDurationInSeconds\nprivate long mWrittenBytesPerSecond\nclass IoOveruseAlertThreshold extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstructor=true)")
@Deprecated
+ @ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
private void __metadata() {}
diff --git a/car-lib/src/android/car/watchdog/IoOveruseConfiguration.java b/car-lib/src/android/car/watchdog/IoOveruseConfiguration.java
index 7dec00c..608c3c3 100644
--- a/car-lib/src/android/car/watchdog/IoOveruseConfiguration.java
+++ b/car-lib/src/android/car/watchdog/IoOveruseConfiguration.java
@@ -16,10 +16,13 @@
package android.car.watchdog;
+import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
+
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcelable;
+import com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport;
import com.android.internal.util.DataClass;
import java.util.List;
@@ -414,6 +417,7 @@
sourceFile = "packages/services/Car/car-lib/src/android/car/watchdog/IoOveruseConfiguration.java",
inputSignatures = "private @android.annotation.NonNull android.car.watchdog.PerStateBytes mComponentLevelThresholds\nprivate @android.annotation.NonNull java.util.Map<java.lang.String,android.car.watchdog.PerStateBytes> mPackageSpecificThresholds\nprivate @android.annotation.NonNull java.util.Map<java.lang.String,android.car.watchdog.PerStateBytes> mAppCategorySpecificThresholds\nprivate @android.annotation.NonNull java.util.List<android.car.watchdog.IoOveruseAlertThreshold> mSystemWideThresholds\nclass IoOveruseConfiguration extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genBuilder=true, genHiddenConstDefs=true)")
@Deprecated
+ @ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
private void __metadata() {}
diff --git a/car-lib/src/android/car/watchdog/IoOveruseStats.java b/car-lib/src/android/car/watchdog/IoOveruseStats.java
index acb30db..4b5c480 100644
--- a/car-lib/src/android/car/watchdog/IoOveruseStats.java
+++ b/car-lib/src/android/car/watchdog/IoOveruseStats.java
@@ -16,9 +16,12 @@
package android.car.watchdog;
+import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
+
import android.annotation.NonNull;
import android.os.Parcelable;
+import com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport;
import com.android.internal.util.DataClass;
/**
@@ -414,6 +417,7 @@
sourceFile = "packages/services/Car/car-lib/src/android/car/watchdog/IoOveruseStats.java",
inputSignatures = "private long mStartTime\nprivate long mDurationInSeconds\nprivate long mTotalOveruses\nprivate long mTotalTimesKilled\nprivate long mTotalBytesWritten\nprivate boolean mKillableOnOveruse\nprivate @android.annotation.NonNull android.car.watchdog.PerStateBytes mRemainingWriteBytes\nclass IoOveruseStats extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenBuilder=true)")
@Deprecated
+ @ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
private void __metadata() {}
diff --git a/car-lib/src/android/car/watchdog/PackageKillableState.java b/car-lib/src/android/car/watchdog/PackageKillableState.java
index 53eff70..cd9cfda 100644
--- a/car-lib/src/android/car/watchdog/PackageKillableState.java
+++ b/car-lib/src/android/car/watchdog/PackageKillableState.java
@@ -16,11 +16,14 @@
package android.car.watchdog;
+import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
+
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.UserIdInt;
import android.os.Parcelable;
+import com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport;
import com.android.internal.util.DataClass;
/**
@@ -243,6 +246,7 @@
sourceFile = "packages/services/Car/car-lib/src/android/car/watchdog/PackageKillableState.java",
inputSignatures = "public static final int KILLABLE_STATE_YES\npublic static final int KILLABLE_STATE_NO\npublic static final int KILLABLE_STATE_NEVER\nprivate @android.annotation.NonNull java.lang.String mPackageName\nprivate @android.annotation.UserIdInt int mUserId\nprivate @android.car.watchdog.PackageKillableState.KillableState int mKillableState\nclass PackageKillableState extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstructor=true, genHiddenConstDefs=true)")
@Deprecated
+ @ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
private void __metadata() {}
diff --git a/car-lib/src/android/car/watchdog/PerStateBytes.java b/car-lib/src/android/car/watchdog/PerStateBytes.java
index 421f607..9343f93 100644
--- a/car-lib/src/android/car/watchdog/PerStateBytes.java
+++ b/car-lib/src/android/car/watchdog/PerStateBytes.java
@@ -16,8 +16,11 @@
package android.car.watchdog;
+import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
+
import android.os.Parcelable;
+import com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport;
import com.android.internal.util.DataClass;
/**
@@ -167,6 +170,7 @@
sourceFile = "packages/services/Car/car-lib/src/android/car/watchdog/PerStateBytes.java",
inputSignatures = "private long mForegroundModeBytes\nprivate long mBackgroundModeBytes\nprivate long mGarageModeBytes\nclass PerStateBytes extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true)")
@Deprecated
+ @ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
private void __metadata() {}
diff --git a/car-lib/src/android/car/watchdog/ResourceOveruseConfiguration.java b/car-lib/src/android/car/watchdog/ResourceOveruseConfiguration.java
index b179590..03a972a 100644
--- a/car-lib/src/android/car/watchdog/ResourceOveruseConfiguration.java
+++ b/car-lib/src/android/car/watchdog/ResourceOveruseConfiguration.java
@@ -16,6 +16,8 @@
package android.car.watchdog;
+import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
+
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -23,6 +25,7 @@
import android.annotation.SystemApi;
import android.os.Parcelable;
+import com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport;
import com.android.internal.util.DataClass;
import java.lang.annotation.Retention;
@@ -525,6 +528,7 @@
sourceFile = "packages/services/Car/car-lib/src/android/car/watchdog/ResourceOveruseConfiguration.java",
inputSignatures = "public static final int COMPONENT_TYPE_SYSTEM\npublic static final int COMPONENT_TYPE_VENDOR\npublic static final int COMPONENT_TYPE_THIRD_PARTY\npublic static final java.lang.String APPLICATION_CATEGORY_TYPE_MAPS\npublic static final java.lang.String APPLICATION_CATEGORY_TYPE_MEDIA\nprivate @android.car.watchdog.ResourceOveruseConfiguration.ComponentType int mComponentType\nprivate @android.annotation.NonNull java.util.List<java.lang.String> mSafeToKillPackages\nprivate @android.annotation.NonNull java.util.List<java.lang.String> mVendorPackagePrefixes\nprivate @android.annotation.NonNull java.util.Map<java.lang.String,java.lang.String> mPackagesToAppCategoryTypes\nprivate @android.annotation.Nullable android.car.watchdog.IoOveruseConfiguration mIoOveruseConfiguration\nclass ResourceOveruseConfiguration extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genBuilder=true, genHiddenConstDefs=true)")
@Deprecated
+ @ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
private void __metadata() {}
diff --git a/car-lib/src/android/car/watchdog/ResourceOveruseStats.java b/car-lib/src/android/car/watchdog/ResourceOveruseStats.java
index c57acfd..992cff2 100644
--- a/car-lib/src/android/car/watchdog/ResourceOveruseStats.java
+++ b/car-lib/src/android/car/watchdog/ResourceOveruseStats.java
@@ -16,11 +16,14 @@
package android.car.watchdog;
+import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
+
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Parcelable;
import android.os.UserHandle;
+import com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport;
import com.android.internal.util.DataClass;
/**
@@ -256,6 +259,7 @@
sourceFile = "packages/services/Car/car-lib/src/android/car/watchdog/ResourceOveruseStats.java",
inputSignatures = "private @android.annotation.NonNull java.lang.String mPackageName\nprivate @android.annotation.NonNull android.os.UserHandle mUserHandle\nprivate @android.annotation.Nullable android.car.watchdog.IoOveruseStats mIoOveruseStats\nclass ResourceOveruseStats extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenBuilder=true)")
@Deprecated
+ @ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
private void __metadata() {}
diff --git a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java
index a8b1362..1828c01 100644
--- a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java
@@ -40,6 +40,7 @@
import android.car.watchdog.ICarWatchdogService;
import android.car.watchdog.ICarWatchdogServiceCallback;
import android.car.watchdog.IResourceOveruseListener;
+import android.car.watchdog.IoOveruseAlertThreshold;
import android.car.watchdog.IoOveruseConfiguration;
import android.car.watchdog.IoOveruseStats;
import android.car.watchdog.PackageKillableState;
@@ -68,6 +69,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.concurrent.Executor;
@@ -476,6 +478,80 @@
.isEqualTo(null);
}
+ @Test
+ public void testIoOveruseAlertThresholdToStringAndDescribeContent() {
+ IoOveruseAlertThreshold ioOveruseAlertThreshold = new IoOveruseAlertThreshold(1, 2);
+ int content = ioOveruseAlertThreshold.describeContents();
+ String string = ioOveruseAlertThreshold.toString();
+
+ assertThat(content).isEqualTo(0);
+ assertThat(string).isEqualTo(
+ "IoOveruseAlertThreshold { durationInSeconds = 1, writtenBytesPerSecond = 2 }");
+ }
+
+ @Test
+ public void testIoOveruseConfigurationToStringAndDescribeContent() {
+ PerStateBytes expectedPerStateBytes = new PerStateBytes(6666666, 7777777, 8888888);
+ IoOveruseConfiguration ioOveruseConfiguration = new IoOveruseConfiguration.Builder(
+ expectedPerStateBytes,
+ new HashMap<>(), new HashMap<>(), new ArrayList<>()).build();
+ int content = ioOveruseConfiguration.describeContents();
+ String string = ioOveruseConfiguration.toString();
+
+ assertThat(content).isEqualTo(0);
+ assertThat(string)
+ .isEqualTo("IoOveruseConfiguration { componentLevelThresholds = "
+ + expectedPerStateBytes
+ + ", packageSpecificThresholds = {}, appCategorySpecificThresholds = {}, "
+ + "systemWideThresholds = [] }");
+ }
+
+ @Test
+ public void testIoOveruseStatsDescribeContent() {
+ IoOveruseStats ioOveruseStats =
+ new IoOveruseStats.Builder(0, 10).setStartTime(1).setDurationInSeconds(5).build();
+ int content = ioOveruseStats.describeContents();
+
+ assertThat(content).isEqualTo(0);
+ }
+
+ @Test
+ public void testPackageKillableStateToStringAndDescribeContent() {
+ PackageKillableState packageKillableState = new PackageKillableState("packageName", 10, 1);
+ int content = packageKillableState.describeContents();
+ String string = packageKillableState.toString();
+
+ assertThat(content).isEqualTo(0);
+ assertThat(string).isEqualTo(
+ "PackageKillableState { packageName = packageName, userId = 10, "
+ + "killableState = "
+ + PackageKillableState.killableStateToString(1)
+ + " }");
+ }
+
+ @Test
+ public void testResourceOveruseConfigurationToStringAndDescribeContent() {
+ ResourceOveruseConfiguration resourceOveruseConfiguration =
+ new ResourceOveruseConfiguration.Builder(
+ ResourceOveruseConfiguration.COMPONENT_TYPE_SYSTEM, new ArrayList<>(),
+ new ArrayList<>(), new HashMap<>())
+ .addPackagesToAppCategoryTypes("key", "value")
+ .addSafeToKillPackages("safeToKillApp")
+ .addVendorPackagePrefixes("vendorPackagePrefix")
+ .build();
+ int content = resourceOveruseConfiguration.describeContents();
+ String string = resourceOveruseConfiguration.toString();
+
+ assertThat(content).isEqualTo(0);
+ assertThat(string)
+ .isEqualTo("ResourceOveruseConfiguration { componentType = "
+ + ResourceOveruseConfiguration.componentTypeToString(
+ ResourceOveruseConfiguration.COMPONENT_TYPE_SYSTEM)
+ + ", safeToKillPackages = [safeToKillApp], vendorPackagePrefixes = "
+ + "[vendorPackagePrefix], packagesToAppCategoryTypes = {key=value}, "
+ + "ioOveruseConfiguration = null }");
+ }
+
private ICarWatchdogServiceCallback registerClient(
CarWatchdogManager.CarWatchdogClientCallback client) throws Exception {
mCarWatchdogManager.registerClient(mExecutor, client, TIMEOUT_CRITICAL);