summaryrefslogtreecommitdiffstats
path: root/cc/debug/rendering_stats_unittest.cc
diff options
context:
space:
mode:
authorerikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 19:02:09 +0000
committererikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 19:02:09 +0000
commit88bcc14cd89a644f09a0ec660901c1454a5526c0 (patch)
tree92d22c761b891111bd7ebefb625d027afbd065b7 /cc/debug/rendering_stats_unittest.cc
parente9b84dd07ea9dc15a4315703bd94a0b0d89052f9 (diff)
downloadchromium_src-88bcc14cd89a644f09a0ec660901c1454a5526c0.zip
chromium_src-88bcc14cd89a644f09a0ec660901c1454a5526c0.tar.gz
chromium_src-88bcc14cd89a644f09a0ec660901c1454a5526c0.tar.bz2
Revert of Add builders for tracing event's structural arguments (https://codereview.chromium.org/380763002/)
Reason for revert: linux ASAN errors. http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%281%29/builds/4493/steps/base_unittests/logs/stdio Original issue's description: > Add builders for tracing event's structural arguments > > The new classes allow building JSON-like structural arguments. Current implementation uses base::Value as backing store but that can be replaced in the future with something more efficient without changing client code. > > All clients of cc/debug/traced_value.h should eventually switch to use the new builders. > > BUG=361045 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286849 TBR=alph, caseq, dsinclair, nduca, willchan, yurys NOTREECHECKS=true NOTRY=true BUG=361045 Review URL: https://codereview.chromium.org/421183003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/debug/rendering_stats_unittest.cc')
-rw-r--r--cc/debug/rendering_stats_unittest.cc40
1 files changed, 27 insertions, 13 deletions
diff --git a/cc/debug/rendering_stats_unittest.cc b/cc/debug/rendering_stats_unittest.cc
index a634093..ea0276c 100644
--- a/cc/debug/rendering_stats_unittest.cc
+++ b/cc/debug/rendering_stats_unittest.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <string>
-
#include "base/time/time.h"
#include "base/values.h"
#include "cc/debug/rendering_stats.h"
@@ -12,18 +10,20 @@
namespace cc {
namespace {
-static std::string ToString(const RenderingStats::TimeDeltaList& list) {
- scoped_refptr<base::debug::TracedValue> value =
- new base::debug::TracedValue();
- value->BeginArray("list_value");
- list.AddToTracedValue(value.get());
- value->EndArray();
- return value->ToString();
+void CompareDoubleValue(const base::ListValue& list_value,
+ int index,
+ double expected_value) {
+ double value;
+ EXPECT_TRUE(list_value.GetDouble(index, &value));
+ EXPECT_EQ(expected_value, value);
}
TEST(RenderingStatsTest, TimeDeltaListEmpty) {
RenderingStats::TimeDeltaList time_delta_list;
- EXPECT_EQ("{\"list_value\":[]}", ToString(time_delta_list));
+ scoped_ptr<base::ListValue> list_value =
+ time_delta_list.AsListValueInMilliseconds();
+ EXPECT_TRUE(list_value->empty());
+ EXPECT_EQ(0ul, list_value->GetSize());
}
TEST(RenderingStatsTest, TimeDeltaListNonEmpty) {
@@ -31,7 +31,13 @@ TEST(RenderingStatsTest, TimeDeltaListNonEmpty) {
time_delta_list.Append(base::TimeDelta::FromMilliseconds(234));
time_delta_list.Append(base::TimeDelta::FromMilliseconds(827));
- EXPECT_EQ("{\"list_value\":[234.0,827.0]}", ToString(time_delta_list));
+ scoped_ptr<base::ListValue> list_value =
+ time_delta_list.AsListValueInMilliseconds();
+ EXPECT_FALSE(list_value->empty());
+ EXPECT_EQ(2ul, list_value->GetSize());
+
+ CompareDoubleValue(*list_value.get(), 0, 234);
+ CompareDoubleValue(*list_value.get(), 1, 827);
}
TEST(RenderingStatsTest, TimeDeltaListAdd) {
@@ -45,8 +51,16 @@ TEST(RenderingStatsTest, TimeDeltaListAdd) {
time_delta_list_b.Append(base::TimeDelta::FromMilliseconds(2));
time_delta_list_a.Add(time_delta_list_b);
- EXPECT_EQ("{\"list_value\":[810.0,32.0,43.0,938.0,2.0]}",
- ToString(time_delta_list_a));
+ scoped_ptr<base::ListValue> list_value =
+ time_delta_list_a.AsListValueInMilliseconds();
+ EXPECT_FALSE(list_value->empty());
+ EXPECT_EQ(5ul, list_value->GetSize());
+
+ CompareDoubleValue(*list_value.get(), 0, 810);
+ CompareDoubleValue(*list_value.get(), 1, 32);
+ CompareDoubleValue(*list_value.get(), 2, 43);
+ CompareDoubleValue(*list_value.get(), 3, 938);
+ CompareDoubleValue(*list_value.get(), 4, 2);
}
} // namespace