admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change StdoutMetricsExporter format to improve readability

Browse Source 
Change from
<test case>/<metric name>

to
<test case> / <metric name>

to increase readability when <test case> itself contains "/" or
<metric name> contains "/"

Bug: b/246095034
Change-Id: If870fdcac37275aecf87e7d57e8aada05a5ef454
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/276263
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38155}
This commit is contained in:
Artem Titov 2022-09-21 14:27:29 +02:00 committed by WebRTC LUCI CQ
parent b2ccd85269
commit 45c6f5e2e1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/test/metrics/stdout_metrics_exporter.cc
View File

@ -79,7 +79,7 @@ bool StdoutMetricsExporter::Export(rtc::ArrayView<const Metric> metrics) {
void StdoutMetricsExporter::PrintMetric(const Metric& metric) { void StdoutMetricsExporter::PrintMetric(const Metric& metric) {
rtc::StringBuilder value_stream; rtc::StringBuilder value_stream;
value_stream << metric.test_case << "/" << metric.name << "= {mean="; value_stream << metric.test_case << " / " << metric.name << "= {mean=";
if (metric.stats.mean.has_value()) { if (metric.stats.mean.has_value()) {
AppendWithPrecision(*metric.stats.mean, 8, value_stream); AppendWithPrecision(*metric.stats.mean, 8, value_stream);
} else { } else {

24
api/test/metrics/stdout_metrics_exporter_test.cc
View File

@ -69,9 +69,9 @@ TEST(StdoutMetricsExporterTest, ExportMetricFormatCorrect) {
StdoutMetricsExporter exporter; StdoutMetricsExporter exporter;
std::string expected = std::string expected =
"RESULT: test_case_name1/test_metric1= " "RESULT: test_case_name1 / test_metric1= "
"{mean=15, stddev=5} Milliseconds (BiggerIsBetter)\n" "{mean=15, stddev=5} Milliseconds (BiggerIsBetter)\n"
"RESULT: test_case_name2/test_metric2= " "RESULT: test_case_name2 / test_metric2= "
"{mean=30, stddev=10} KilobitsPerSecond (SmallerIsBetter)\n"; "{mean=30, stddev=10} KilobitsPerSecond (SmallerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric1, metric2})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric1, metric2}));
@ -84,7 +84,7 @@ TEST(StdoutMetricsExporterNumberFormatTest, PositiveNumberMaxPrecision) {
Metric metric = PsnrForTestFoo(15.00000001, 0.00000001); Metric metric = PsnrForTestFoo(15.00000001, 0.00000001);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=15.00000001, stddev=0.00000001} Unitless (BiggerIsBetter)\n"; "{mean=15.00000001, stddev=0.00000001} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -97,7 +97,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(15.12345, 0.12); Metric metric = PsnrForTestFoo(15.12345, 0.12);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=15.12345, stddev=0.12} Unitless (BiggerIsBetter)\n"; "{mean=15.12345, stddev=0.12} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -110,7 +110,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(15.123450000, 0.120000000); Metric metric = PsnrForTestFoo(15.123450000, 0.120000000);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=15.12345, stddev=0.12} Unitless (BiggerIsBetter)\n"; "{mean=15.12345, stddev=0.12} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -123,7 +123,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(15.000000009, 0.999999999); Metric metric = PsnrForTestFoo(15.000000009, 0.999999999);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=15.00000001, stddev=1} Unitless (BiggerIsBetter)\n"; "{mean=15.00000001, stddev=1} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -136,7 +136,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(15.0000000049, 0.9999999949); Metric metric = PsnrForTestFoo(15.0000000049, 0.9999999949);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=15, stddev=0.99999999} Unitless (BiggerIsBetter)\n"; "{mean=15, stddev=0.99999999} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -148,7 +148,7 @@ TEST(StdoutMetricsExporterNumberFormatTest, NegativeNumberMaxPrecision) {
Metric metric = PsnrForTestFoo(-15.00000001, -0.00000001); Metric metric = PsnrForTestFoo(-15.00000001, -0.00000001);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=-15.00000001, stddev=-0.00000001} Unitless (BiggerIsBetter)\n"; "{mean=-15.00000001, stddev=-0.00000001} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -161,7 +161,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(-15.12345, -0.12); Metric metric = PsnrForTestFoo(-15.12345, -0.12);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=-15.12345, stddev=-0.12} Unitless (BiggerIsBetter)\n"; "{mean=-15.12345, stddev=-0.12} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -174,7 +174,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(-15.123450000, -0.120000000); Metric metric = PsnrForTestFoo(-15.123450000, -0.120000000);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=-15.12345, stddev=-0.12} Unitless (BiggerIsBetter)\n"; "{mean=-15.12345, stddev=-0.12} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -187,7 +187,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(-15.000000009, -0.999999999); Metric metric = PsnrForTestFoo(-15.000000009, -0.999999999);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=-15.00000001, stddev=-1} Unitless (BiggerIsBetter)\n"; "{mean=-15.00000001, stddev=-1} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());
@ -200,7 +200,7 @@ TEST(StdoutMetricsExporterNumberFormatTest,
Metric metric = PsnrForTestFoo(-15.0000000049, -0.9999999949); Metric metric = PsnrForTestFoo(-15.0000000049, -0.9999999949);
std::string expected = std::string expected =
"RESULT: foo/psnr= " "RESULT: foo / psnr= "
"{mean=-15, stddev=-0.99999999} Unitless (BiggerIsBetter)\n"; "{mean=-15, stddev=-0.99999999} Unitless (BiggerIsBetter)\n";
EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric})); EXPECT_TRUE(exporter.Export(std::vector<Metric>{metric}));
EXPECT_EQ(expected, testing::internal::GetCapturedStdout()); EXPECT_EQ(expected, testing::internal::GetCapturedStdout());