Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid catching AssertionError for actual failures."

Browse Source
This commit is contained in:
Michael Wright
2022-02-07 16:05:56 +00:00
committed by Android (Google) Code Review
parent 48caf9d6a1 5c97595aaf
commit dda94e8f13
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/Android.bp
View File

@@ -18,6 +18,7 @@ java_defaults {
// "-Xep:AndroidFrameworkUid:ERROR",
"-Xep:SelfEquals:ERROR",
"-Xep:NullTernary:ERROR",
"-Xep:TryFailThrowable:ERROR",
// NOTE: only enable to generate local patchfiles
// "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",
// "-XepPatchLocation:/tmp/refaster/",

22
services/tests/servicestests/src/com/android/server/am/ActivityManagerUtilsTest.java
View File

@@ -17,7 +17,7 @@ package com.android.server.am;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
import static org.junit.Assert.assertTrue;
import androidx.test.filters.SmallTest;
@@ -89,18 +89,20 @@ public class ActivityManagerUtilsTest {
}
@Test
public void testSheckShouldSamplePackage() {
public void testCheckShouldSamplePackage() {
// Just make sure checkShouldSamplePackage is actually working...
assertFailure(() -> checkShouldSamplePackage(0.3f, 0.6f, false, true));
assertFailure(() -> checkShouldSamplePackage(0.6f, 0.3f, true, false));
}
private static void assertFailure(Runnable r) {
boolean failed = false;
try {
checkShouldSamplePackage(0.3f, 0.6f, false, true);
fail();
} catch (AssertionError expected) {
}
try {
checkShouldSamplePackage(0.6f, 0.3f, true, false);
fail();
} catch (AssertionError expected) {
r.run();
} catch (AssertionError e) {
failed = true;
}
assertTrue(failed);
}
private void checkShouldSamplePackage(float inputSampleRate, float expectedRate,