Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1993)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: apps/benchmark/measurements_unittest.cc

Issue 1380023005: benchmark.mojo: add time_between measurement type. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/benchmark/measurements.cc ('k') | apps/benchmark/run_args.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/benchmark/measurements_unittest.cc
diff --git a/apps/benchmark/measurements_unittest.cc b/apps/benchmark/measurements_unittest.cc
index a77651d18e0aba38c2ad24f8a6b186614e8701ec..d47ce45a1f9d4641eafa9c64bdf7ecf51aad6391 100644
--- a/apps/benchmark/measurements_unittest.cc
+++ b/apps/benchmark/measurements_unittest.cc
@@ -22,12 +22,18 @@ base::TimeDelta Delta(int64 value) {
class MeasurementsTest : public ::testing::Test {
protected:
void SetUp() override {
- events_.resize(6);
+ events_.resize(8);
events_[0] = Event(EventType::COMPLETE, "a", "some", Ticks(10), Delta(2));
events_[1] = Event(EventType::COMPLETE, "a", "some", Ticks(11), Delta(4));
events_[2] = Event(EventType::COMPLETE, "a", "other", Ticks(12), Delta(8));
events_[3] = Event(EventType::COMPLETE, "b", "some", Ticks(3), Delta(16));
events_[4] = Event(EventType::COMPLETE, "b", "some", Ticks(13), Delta(32));
+ events_[5] =
+ Event(EventType::INSTANT, "instant", "another", Ticks(20), Delta(0));
+ events_[6] = Event(EventType::INSTANT, "multi_occurence", "another",
+ Ticks(30), Delta(0));
+ events_[7] = Event(EventType::INSTANT, "multi_occurence", "another",
+ Ticks(40), Delta(0));
reversed_ = events_;
reverse(reversed_.begin(), reversed_.end());
@@ -42,20 +48,66 @@ TEST_F(MeasurementsTest, MeasureTimeUntil) {
Measurements regular(events_, base::TimeTicks::FromInternalValue(2));
Measurements reversed(reversed_, base::TimeTicks::FromInternalValue(2));
- EXPECT_DOUBLE_EQ(0.008, regular.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "a", "some")));
- EXPECT_DOUBLE_EQ(0.008, reversed.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "a", "some")));
+ EXPECT_DOUBLE_EQ(0.008,
+ regular.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("a", "some"))));
+ EXPECT_DOUBLE_EQ(0.008,
+ reversed.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("a", "some"))));
+
+ EXPECT_DOUBLE_EQ(0.01,
+ regular.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("a", "other"))));
+ EXPECT_DOUBLE_EQ(0.01,
+ reversed.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("a", "other"))));
+
+ EXPECT_DOUBLE_EQ(0.001,
+ regular.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("b", "some"))));
+ EXPECT_DOUBLE_EQ(0.001,
+ reversed.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("b", "some"))));
+}
- EXPECT_DOUBLE_EQ(0.01, regular.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "a", "other")));
- EXPECT_DOUBLE_EQ(0.01, reversed.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "a", "other")));
+TEST_F(MeasurementsTest, MeasureTimeBetween) {
+ // The results should be the same regardless of the order of events.
+ Measurements regular(events_, base::TimeTicks::FromInternalValue(2));
+ Measurements reversed(reversed_, base::TimeTicks::FromInternalValue(2));
- EXPECT_DOUBLE_EQ(0.001, regular.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "b", "some")));
- EXPECT_DOUBLE_EQ(0.001, reversed.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "b", "some")));
+ EXPECT_DOUBLE_EQ(0.0, regular.Measure(Measurement(
+ MeasurementType::TIME_BETWEEN,
+ EventSpec("a", "some"), EventSpec("a", "some"))));
+ EXPECT_DOUBLE_EQ(0.0, reversed.Measure(Measurement(
+ MeasurementType::TIME_BETWEEN,
+ EventSpec("a", "some"), EventSpec("a", "some"))));
+
+ EXPECT_DOUBLE_EQ(
+ 0.01, regular.Measure(Measurement(
+ MeasurementType::TIME_BETWEEN, EventSpec("instant", "another"),
+ EventSpec("multi_occurence", "another"))));
+ EXPECT_DOUBLE_EQ(
+ 0.01, reversed.Measure(Measurement(
+ MeasurementType::TIME_BETWEEN, EventSpec("instant", "another"),
+ EventSpec("multi_occurence", "another"))));
+
+ EXPECT_DOUBLE_EQ(
+ -1.0, regular.Measure(Measurement(MeasurementType::TIME_BETWEEN,
+ EventSpec("multi_occurence", "another"),
+ EventSpec("instant", "another"))));
+ EXPECT_DOUBLE_EQ(-1.0, reversed.Measure(Measurement(
+ MeasurementType::TIME_BETWEEN,
+ EventSpec("multi_occurence", "another"),
+ EventSpec("instant", "another"))));
+
+ EXPECT_DOUBLE_EQ(
+ 0.01, regular.Measure(Measurement(MeasurementType::TIME_BETWEEN,
+ EventSpec("a", "some"),
+ EventSpec("instant", "another"))));
+ EXPECT_DOUBLE_EQ(
+ 0.01, reversed.Measure(Measurement(MeasurementType::TIME_BETWEEN,
+ EventSpec("a", "some"),
+ EventSpec("instant", "another"))));
}
TEST_F(MeasurementsTest, MeasureAvgDuration) {
@@ -63,20 +115,26 @@ TEST_F(MeasurementsTest, MeasureAvgDuration) {
Measurements regular(events_, base::TimeTicks::FromInternalValue(2));
Measurements reversed(reversed_, base::TimeTicks::FromInternalValue(2));
- EXPECT_DOUBLE_EQ(0.003, regular.Measure(Measurement(
- MeasurementType::AVG_DURATION, "a", "some")));
- EXPECT_DOUBLE_EQ(0.003, reversed.Measure(Measurement(
- MeasurementType::AVG_DURATION, "a", "some")));
-
- EXPECT_DOUBLE_EQ(0.008, regular.Measure(Measurement(
- MeasurementType::AVG_DURATION, "a", "other")));
- EXPECT_DOUBLE_EQ(0.008, reversed.Measure(Measurement(
- MeasurementType::AVG_DURATION, "a", "other")));
-
- EXPECT_DOUBLE_EQ(0.024, regular.Measure(Measurement(
- MeasurementType::AVG_DURATION, "b", "some")));
- EXPECT_DOUBLE_EQ(0.024, reversed.Measure(Measurement(
- MeasurementType::AVG_DURATION, "b", "some")));
+ EXPECT_DOUBLE_EQ(0.003,
+ regular.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("a", "some"))));
+ EXPECT_DOUBLE_EQ(0.003,
+ reversed.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("a", "some"))));
+
+ EXPECT_DOUBLE_EQ(0.008,
+ regular.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("a", "other"))));
+ EXPECT_DOUBLE_EQ(0.008,
+ reversed.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("a", "other"))));
+
+ EXPECT_DOUBLE_EQ(0.024,
+ regular.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("b", "some"))));
+ EXPECT_DOUBLE_EQ(0.024,
+ reversed.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("b", "some"))));
}
TEST_F(MeasurementsTest, NoMatchingEvent) {
@@ -86,19 +144,24 @@ TEST_F(MeasurementsTest, NoMatchingEvent) {
Measurements regular(events_, base::TimeTicks::FromInternalValue(0));
Measurements reversed(reversed_, base::TimeTicks::FromInternalValue(0));
- EXPECT_DOUBLE_EQ(-1.0, empty.Measure(Measurement(
- MeasurementType::AVG_DURATION, "miss", "cat")));
- EXPECT_DOUBLE_EQ(-1.0, regular.Measure(Measurement(
- MeasurementType::AVG_DURATION, "miss", "cat")));
- EXPECT_DOUBLE_EQ(-1.0, reversed.Measure(Measurement(
- MeasurementType::AVG_DURATION, "miss", "cat")));
+ EXPECT_DOUBLE_EQ(-1.0,
+ empty.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("miss", "cat"))));
+ EXPECT_DOUBLE_EQ(-1.0,
+ regular.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("miss", "cat"))));
+ EXPECT_DOUBLE_EQ(-1.0,
+ reversed.Measure(Measurement(MeasurementType::AVG_DURATION,
+ EventSpec("miss", "cat"))));
EXPECT_DOUBLE_EQ(-1.0, empty.Measure(Measurement(MeasurementType::TIME_UNTIL,
- "miss", "cat")));
- EXPECT_DOUBLE_EQ(-1.0, regular.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "miss", "cat")));
- EXPECT_DOUBLE_EQ(-1.0, reversed.Measure(Measurement(
- MeasurementType::TIME_UNTIL, "miss", "cat")));
+ EventSpec("miss", "cat"))));
+ EXPECT_DOUBLE_EQ(-1.0,
+ regular.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("miss", "cat"))));
+ EXPECT_DOUBLE_EQ(-1.0,
+ reversed.Measure(Measurement(MeasurementType::TIME_UNTIL,
+ EventSpec("miss", "cat"))));
}
} // namespace
« no previous file with comments | « apps/benchmark/measurements.cc ('k') | apps/benchmark/run_args.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698