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

Side by Side Diff: base/debug/trace_event_unittest.cc

Issue 13590005: Add a ConvertableToTraceFormat type to the trace framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/debug/trace_event_unittest.h" 5 #include "base/debug/trace_event_unittest.h"
6 6
7 #include <cstdlib> 7 #include <cstdlib>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1583 TRACE_EVENT_SAMPLE_STATE(1, "cc", "Things"); 1583 TRACE_EVENT_SAMPLE_STATE(1, "cc", "Things");
1584 sampled->Wait(); 1584 sampled->Wait();
1585 1585
1586 EndTraceAndFlush(); 1586 EndTraceAndFlush();
1587 1587
1588 // Make sure we hit at least once. 1588 // Make sure we hit at least once.
1589 EXPECT_TRUE(FindNamePhase("Stuff", "P")); 1589 EXPECT_TRUE(FindNamePhase("Stuff", "P"));
1590 EXPECT_TRUE(FindNamePhase("Things", "P")); 1590 EXPECT_TRUE(FindNamePhase("Things", "P"));
1591 } 1591 }
1592 1592
1593 class MyData : public base::debug::ConvertableToJSON {
1594 public:
1595 MyData() {}
1596 virtual ~MyData() {}
1597
1598 virtual void ToJSON(std::string& out) const OVERRIDE {
1599 out.append("{\"foo\":1}");
1600 }
1601
1602 private:
1603 DISALLOW_COPY_AND_ASSIGN(MyData);
1604 };
1605
1606 TEST_F(TraceEventTestFixture, ConvertableTypes) {
1607 ManualTestSetUp();
1608 TraceLog::GetInstance()->SetEnabled(true, TraceLog::RECORD_UNTIL_FULL);
1609
1610 MyData* data(new MyData());
1611
1612 TRACE_EVENT1("foo", "bar", "data", static_cast<ConvertableToJSON*>(data));
1613 EndTraceAndFlush();
1614
1615 DictionaryValue* dict = FindNamePhase("bar", "B");
1616 ASSERT_TRUE(dict);
1617
1618 const DictionaryValue* args_dict = NULL;
1619 dict->GetDictionary("args", &args_dict);
1620 ASSERT_TRUE(args_dict);
1621
1622 const Value* value = NULL;
1623 const DictionaryValue* convertable_dict = NULL;
1624 EXPECT_TRUE(args_dict->Get("data", &value));
1625 EXPECT_TRUE(value->GetAsDictionary(&convertable_dict));
1626
1627 int foo_val;
1628 EXPECT_TRUE(convertable_dict->GetInteger("foo", &foo_val));
1629 EXPECT_EQ(1, foo_val);
1630 }
1631
1632
1593 class TraceEventCallbackTest : public TraceEventTestFixture { 1633 class TraceEventCallbackTest : public TraceEventTestFixture {
1594 public: 1634 public:
1595 virtual void SetUp() OVERRIDE { 1635 virtual void SetUp() OVERRIDE {
1596 TraceEventTestFixture::SetUp(); 1636 TraceEventTestFixture::SetUp();
1597 ManualTestSetUp(); 1637 ManualTestSetUp();
1598 ASSERT_EQ(NULL, s_instance); 1638 ASSERT_EQ(NULL, s_instance);
1599 s_instance = this; 1639 s_instance = this;
1600 } 1640 }
1601 virtual void TearDown() OVERRIDE { 1641 virtual void TearDown() OVERRIDE {
1602 while (TraceLog::GetInstance()->IsEnabled()) 1642 while (TraceLog::GetInstance()->IsEnabled())
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1637 TRACE_EVENT_SCOPE_GLOBAL); 1677 TRACE_EVENT_SCOPE_GLOBAL);
1638 EXPECT_EQ(2u, collected_events_.size()); 1678 EXPECT_EQ(2u, collected_events_.size());
1639 EXPECT_EQ("event1", collected_events_[0]); 1679 EXPECT_EQ("event1", collected_events_[0]);
1640 EXPECT_EQ("event2", collected_events_[1]); 1680 EXPECT_EQ("event2", collected_events_[1]);
1641 } 1681 }
1642 1682
1643 // TODO(dsinclair): Continuous Tracing unit test. 1683 // TODO(dsinclair): Continuous Tracing unit test.
1644 1684
1645 } // namespace debug 1685 } // namespace debug
1646 } // namespace base 1686 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698