Change assertions for TimeElapsedDelta in metrics_test.cc am: 5b8016bb2c
Original change: https://android-review.googlesource.com/c/platform/art/+/2751788
Change-Id: I2f1965864697d2bc95333f84ea76fa03be01f327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libartbase/base/metrics/metrics_test.cc b/libartbase/base/metrics/metrics_test.cc
index 2eefa02..f123530 100644
--- a/libartbase/base/metrics/metrics_test.cc
+++ b/libartbase/base/metrics/metrics_test.cc
@@ -297,7 +297,12 @@
class ZeroBackend : public TestBackendBase {
public:
void ReportCounter(DatumId counter_type, uint64_t value) override {
- EXPECT_EQ(value, 0u) << "Unexpected value for counter " << DatumName(counter_type);
+ if (counter_type == DatumId::kTimeElapsedDelta) {
+ // TimeElapsedData can be greater than 0 if the test takes more than 1ms to run
+ EXPECT_GE(value, 0u) << "Unexpected value for counter " << DatumName(counter_type);
+ } else {
+ EXPECT_EQ(value, 0u) << "Unexpected value for counter " << DatumName(counter_type);
+ }
}
void ReportHistogram([[maybe_unused]] DatumId histogram_type,
@@ -352,7 +357,12 @@
#define CHECK_METRIC(name, ...) case DatumId::k##name:
ART_VALUE_METRICS(CHECK_METRIC)
#undef CHECK_METRIC
- EXPECT_EQ(value, 0u) << "Unexpected value for metric " << DatumName(datum_id);
+ if (datum_id == DatumId::kTimeElapsedDelta) {
+ // TimeElapsedData can be greater than 0 if the test takes more than 1ms to run
+ EXPECT_GE(value, 0u) << "Unexpected value for counter " << DatumName(datum_id);
+ } else {
+ EXPECT_EQ(value, 0u) << "Unexpected value for counter " << DatumName(datum_id);
+ }
return;
// Event metrics - expected to have retained their previous value