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

Unified Diff: webrtc/stats/rtcstatsreport_unittest.cc

Issue 2340443002: Making sure rtc_stats_unittests passes on all bots (tsan fix) (Closed)
Patch Set: String compare fix Created 4 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 | « webrtc/stats/rtcstatscollector_unittest.cc ('k') | webrtc/stats/stats.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/stats/rtcstatsreport_unittest.cc
diff --git a/webrtc/stats/rtcstatsreport_unittest.cc b/webrtc/stats/rtcstatsreport_unittest.cc
deleted file mode 100644
index 2dcb58428a5db7de25e0bae632d8a4aaf85fd6fc..0000000000000000000000000000000000000000
--- a/webrtc/stats/rtcstatsreport_unittest.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2016 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/api/rtcstatsreport.h"
-
-#include "webrtc/api/rtcstats.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-
-namespace webrtc {
-
-class RTCTestStats1 : public RTCStats {
- public:
- RTCTestStats1(const std::string& id, int64_t timestamp_us)
- : RTCStats(id, timestamp_us),
- integer("integer") {}
-
- WEBRTC_RTCSTATS_IMPL(RTCStats, RTCTestStats1,
- &integer);
-
- RTCStatsMember<int32_t> integer;
-};
-
-const char RTCTestStats1::kType[] = "test-stats-1";
-
-class RTCTestStats2 : public RTCStats {
- public:
- RTCTestStats2(const std::string& id, int64_t timestamp_us)
- : RTCStats(id, timestamp_us),
- number("number") {}
-
- WEBRTC_RTCSTATS_IMPL(RTCStats, RTCTestStats2,
- &number);
-
- RTCStatsMember<double> number;
-};
-
-const char RTCTestStats2::kType[] = "test-stats-2";
-
-class RTCTestStats3 : public RTCStats {
- public:
- RTCTestStats3(const std::string& id, int64_t timestamp_us)
- : RTCStats(id, timestamp_us),
- string("string") {}
-
- WEBRTC_RTCSTATS_IMPL(RTCStats, RTCTestStats3,
- &string);
-
- RTCStatsMember<std::string> string;
-};
-
-const char RTCTestStats3::kType[] = "test-stats-3";
-
-TEST(RTCStatsReport, AddAndGetStats) {
- rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create();
- EXPECT_EQ(report->size(), static_cast<size_t>(0));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("a0", 1)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("a1", 2)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("b0", 4)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("b1", 8)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("a2", 16)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("b2", 32)));
- EXPECT_EQ(report->size(), static_cast<size_t>(6));
-
- EXPECT_EQ(report->Get("missing"), nullptr);
- EXPECT_EQ(report->Get("a0")->id(), "a0");
- EXPECT_EQ(report->Get("b2")->id(), "b2");
-
- std::vector<const RTCTestStats1*> a = report->GetStatsOfType<RTCTestStats1>();
- EXPECT_EQ(a.size(), static_cast<size_t>(3));
- int64_t mask = 0;
- for (const RTCTestStats1* stats : a)
- mask |= stats->timestamp_us();
- EXPECT_EQ(mask, static_cast<int64_t>(1 | 2 | 16));
-
- std::vector<const RTCTestStats2*> b = report->GetStatsOfType<RTCTestStats2>();
- EXPECT_EQ(b.size(), static_cast<size_t>(3));
- mask = 0;
- for (const RTCTestStats2* stats : b)
- mask |= stats->timestamp_us();
- EXPECT_EQ(mask, static_cast<int64_t>(4 | 8 | 32));
-
- EXPECT_EQ(report->GetStatsOfType<RTCTestStats3>().size(),
- static_cast<size_t>(0));
-}
-
-TEST(RTCStatsReport, StatsOrder) {
- rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create();
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("C", 2)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("D", 3)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("B", 1)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("A", 0)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("E", 4)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("F", 5)));
- report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("G", 6)));
- int64_t i = 0;
- for (const RTCStats& stats : *report) {
- EXPECT_EQ(stats.timestamp_us(), i);
- ++i;
- }
- EXPECT_EQ(i, static_cast<int64_t>(7));
-}
-
-TEST(RTCStatsReport, TakeMembersFrom) {
- rtc::scoped_refptr<RTCStatsReport> a = RTCStatsReport::Create();
- a->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("B", 1)));
- a->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("C", 2)));
- a->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("E", 4)));
- rtc::scoped_refptr<RTCStatsReport> b = RTCStatsReport::Create();
- b->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("A", 0)));
- b->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("D", 3)));
- b->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("F", 5)));
-
- a->TakeMembersFrom(b);
- EXPECT_EQ(b->size(), static_cast<size_t>(0));
- int64_t i = 0;
- for (const RTCStats& stats : *a) {
- EXPECT_EQ(stats.timestamp_us(), i);
- ++i;
- }
- EXPECT_EQ(i, static_cast<int64_t>(6));
-}
-
-} // namespace webrtc
« no previous file with comments | « webrtc/stats/rtcstatscollector_unittest.cc ('k') | webrtc/stats/stats.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698