Skip to content

Commit

Permalink
Incorporated review feedback2
Browse files Browse the repository at this point in the history
  • Loading branch information
@anush-apple
anush-apple committed Mar 7, 2024
1 parent 66427d5 commit a2cffb7
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions src/tracing/tests/TestMetricEvents.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class MetricEventBackend : public Backend
{
public:
MetricEventBackend() {}
const std::vector<MetricEvent> & metricEvents() const { return mMetricEvents; }
const std::vector<MetricEvent> & GetMetricEvents() const { return mMetricEvents; }

// Implementation
virtual void LogMetricEvent(const MetricEvent & event) { mMetricEvents.push_back(event); }
Expand Down Expand Up @@ -141,9 +141,9 @@ void TestInstantMetricEvent(nlTestSuite * inSuite, void * inContext)
MetricEvent(MetricEvent::Type::kInstantEvent, "event3"),
};

NL_TEST_ASSERT(inSuite, backend.metricEvents().size() == expected.size());
NL_TEST_ASSERT(inSuite, backend.GetMetricEvents().size() == expected.size());
NL_TEST_ASSERT(inSuite,
std::equal(backend.metricEvents().begin(), backend.metricEvents().end(), expected.begin(), expected.end()));
std::equal(backend.GetMetricEvents().begin(), backend.GetMetricEvents().end(), expected.begin(), expected.end()));
}

void TestBeginEndMetricEvent(nlTestSuite * inSuite, void * inContext)
Expand All @@ -168,10 +168,10 @@ void TestBeginEndMetricEvent(nlTestSuite * inSuite, void * inContext)
MetricEvent(MetricEvent::Type::kEndEvent, "event1"),
};

NL_TEST_ASSERT(inSuite, backend1.metricEvents().size() == expected1.size());
NL_TEST_ASSERT(inSuite, backend1.GetMetricEvents().size() == expected1.size());
NL_TEST_ASSERT(
inSuite,
std::equal(backend1.metricEvents().begin(), backend1.metricEvents().end(), expected1.begin(), expected1.end()));
std::equal(backend1.GetMetricEvents().begin(), backend1.GetMetricEvents().end(), expected1.begin(), expected1.end()));

{
ScopedRegistration scope2(backend2);
Expand All @@ -197,10 +197,10 @@ void TestBeginEndMetricEvent(nlTestSuite * inSuite, void * inContext)
MetricEvent(MetricEvent::Type::kEndEvent, "event4"),
};

NL_TEST_ASSERT(inSuite, backend2.metricEvents().size() == expected2.size());
NL_TEST_ASSERT(inSuite, backend2.GetMetricEvents().size() == expected2.size());
NL_TEST_ASSERT(
inSuite,
std::equal(backend2.metricEvents().begin(), backend2.metricEvents().end(), expected2.begin(), expected2.end()));
std::equal(backend2.GetMetricEvents().begin(), backend2.GetMetricEvents().end(), expected2.begin(), expected2.end()));
}
}

Expand Down Expand Up @@ -247,10 +247,10 @@ void TestScopedMetricEvent(nlTestSuite * inSuite, void * inContext)
MetricEvent(MetricEvent::Type::kEndEvent, "event1", CHIP_ERROR_BUSY),
};

NL_TEST_ASSERT(inSuite, backend1.metricEvents().size() == expected1.size());
NL_TEST_ASSERT(inSuite, backend1.GetMetricEvents().size() == expected1.size());
NL_TEST_ASSERT(
inSuite,
std::equal(backend1.metricEvents().begin(), backend1.metricEvents().end(), expected1.begin(), expected1.end()));
std::equal(backend1.GetMetricEvents().begin(), backend1.GetMetricEvents().end(), expected1.begin(), expected1.end()));

std::vector<MetricEvent> expected2 = {
MetricEvent(MetricEvent::Type::kBeginEvent, "event2"),
Expand All @@ -261,20 +261,20 @@ void TestScopedMetricEvent(nlTestSuite * inSuite, void * inContext)
MetricEvent(MetricEvent::Type::kEndEvent, "event2", CHIP_ERROR_BAD_REQUEST),
};

NL_TEST_ASSERT(inSuite, backend2.metricEvents().size() == expected2.size());
NL_TEST_ASSERT(inSuite, backend2.GetMetricEvents().size() == expected2.size());
NL_TEST_ASSERT(
inSuite,
std::equal(backend2.metricEvents().begin(), backend2.metricEvents().end(), expected2.begin(), expected2.end()));
std::equal(backend2.GetMetricEvents().begin(), backend2.GetMetricEvents().end(), expected2.begin(), expected2.end()));

std::vector<MetricEvent> expected3 = {
MetricEvent(MetricEvent::Type::kBeginEvent, "event3"),
MetricEvent(MetricEvent::Type::kEndEvent, "event3", CHIP_ERROR_EVENT_ID_FOUND),
};

NL_TEST_ASSERT(inSuite, backend3.metricEvents().size() == expected3.size());
NL_TEST_ASSERT(inSuite, backend3.GetMetricEvents().size() == expected3.size());
NL_TEST_ASSERT(
inSuite,
std::equal(backend3.metricEvents().begin(), backend3.metricEvents().end(), expected3.begin(), expected3.end()));
std::equal(backend3.GetMetricEvents().begin(), backend3.GetMetricEvents().end(), expected3.begin(), expected3.end()));
}
}

Expand All @@ -298,9 +298,9 @@ void TestVerifyOrExitWithMetric(nlTestSuite * inSuite, void * inContext)
};

NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);
NL_TEST_ASSERT(inSuite, backend.metricEvents().size() == expected.size());
NL_TEST_ASSERT(inSuite, backend.GetMetricEvents().size() == expected.size());
NL_TEST_ASSERT(inSuite,
std::equal(backend.metricEvents().begin(), backend.metricEvents().end(), expected.begin(), expected.end()));
std::equal(backend.GetMetricEvents().begin(), backend.GetMetricEvents().end(), expected.begin(), expected.end()));
}

void TestSuccessOrExitWithMetric(nlTestSuite * inSuite, void * inContext)
Expand All @@ -319,9 +319,9 @@ void TestSuccessOrExitWithMetric(nlTestSuite * inSuite, void * inContext)
};

NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_BUSY);
NL_TEST_ASSERT(inSuite, backend.metricEvents().size() == expected.size());
NL_TEST_ASSERT(inSuite, backend.GetMetricEvents().size() == expected.size());
NL_TEST_ASSERT(inSuite,
std::equal(backend.metricEvents().begin(), backend.metricEvents().end(), expected.begin(), expected.end()));
std::equal(backend.GetMetricEvents().begin(), backend.GetMetricEvents().end(), expected.begin(), expected.end()));
}

static const nlTest sMetricTests[] = {
Expand Down

0 comments on commit a2cffb7

Please sign in to comment.