Merge "Make AnrTimerTest.testDumpOutput hermetic" into main
diff --git a/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java b/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java
index 076d5ca..44d1161 100644
--- a/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java
+++ b/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java
@@ -147,7 +147,7 @@
final int n = 4;
StackTraceElement[] stack = Thread.currentThread().getStackTrace();
if (stack.length < n+1) return "test";
- return stack[n].getMethodName();
+ return stack[n].getClassName() + "." + stack[n].getMethodName();
}
}
@@ -318,8 +318,11 @@
public void testDumpOutput() throws Exception {
if (!AnrTimer.nativeTimersSupported()) return;
+ // The timers in this class are named "class.method".
+ final String timerName = "timer: com.android.server.utils.AnrTimerTest";
+
String r1 = getDumpOutput();
- assertThat(r1).doesNotContain("timer:");
+ assertThat(r1).doesNotContain(timerName);
Helper helper = new Helper(2);
TestArg t1 = new TestArg(1, 1);
@@ -333,14 +336,14 @@
String r2 = getDumpOutput();
// There are timers in the list if and only if the feature is enabled.
if (mEnabled) {
- assertThat(r2).contains("timer:");
+ assertThat(r2).contains(timerName);
} else {
- assertThat(r2).doesNotContain("timer:");
+ assertThat(r2).doesNotContain(timerName);
}
}
String r3 = getDumpOutput();
- assertThat(r3).doesNotContain("timer:");
+ assertThat(r3).doesNotContain(timerName);
}
/**