summaryrefslogtreecommitdiffstats
path: root/base/metrics
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-31 19:16:38 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-31 19:16:38 +0000
commitd117d35a46d16907c89b92e5ed03d40690fb8f81 (patch)
treee658e811bd9bf5a0ebb26f9963c747d91f9f5e88 /base/metrics
parentee38bd94f32f68ffd4884da2f850fe36f10455e3 (diff)
downloadchromium_src-d117d35a46d16907c89b92e5ed03d40690fb8f81.zip
chromium_src-d117d35a46d16907c89b92e5ed03d40690fb8f81.tar.gz
chromium_src-d117d35a46d16907c89b92e5ed03d40690fb8f81.tar.bz2
Update Sleep() calls in metrics tests to use TimeDelta instead of int.
R=jar@chromium.org BUG=108171 TEST= Review URL: http://codereview.chromium.org/9056001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
-rw-r--r--base/metrics/stats_table_unittest.cc40
1 files changed, 20 insertions, 20 deletions
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 32484a6..1ccde4da 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -101,7 +101,7 @@ void StatsTableThread::Run() {
mixed_counter.Decrement();
else
mixed_counter.Increment();
- PlatformThread::Sleep(index % 10); // short wait
+ PlatformThread::Sleep(TimeDelta::FromMilliseconds(index % 10));
}
}
@@ -180,7 +180,7 @@ MULTIPROCESS_TEST_MAIN(StatsTableMultipleProcessMain) {
lucky13_counter.Set(1313);
increment_counter.Increment();
decrement_counter.Decrement();
- PlatformThread::Sleep(index % 10); // short wait
+ PlatformThread::Sleep(TimeDelta::FromMilliseconds(index % 10));
}
return 0;
}
@@ -315,21 +315,21 @@ TEST_F(StatsTableTest, StatsCounterTimer) {
EXPECT_TRUE(bar.start_time().is_null());
EXPECT_TRUE(bar.stop_time().is_null());
- const int kRunMs = 100;
+ const TimeDelta kDuration = TimeDelta::FromMilliseconds(100);
// Do some timing.
bar.Start();
- PlatformThread::Sleep(kRunMs);
+ PlatformThread::Sleep(kDuration);
bar.Stop();
EXPECT_GT(table.GetCounterValue("t:bar"), 0);
- EXPECT_LE(kRunMs, table.GetCounterValue("t:bar"));
+ EXPECT_LE(kDuration.InMilliseconds(), table.GetCounterValue("t:bar"));
// Verify that timing again is additive.
bar.Start();
- PlatformThread::Sleep(kRunMs);
+ PlatformThread::Sleep(kDuration);
bar.Stop();
EXPECT_GT(table.GetCounterValue("t:bar"), 0);
- EXPECT_LE(kRunMs * 2, table.GetCounterValue("t:bar"));
+ EXPECT_LE(kDuration.InMilliseconds() * 2, table.GetCounterValue("t:bar"));
}
// Test some basic StatsRate operations
@@ -348,21 +348,21 @@ TEST_F(StatsTableTest, StatsRate) {
EXPECT_EQ(0, table.GetCounterValue("c:baz"));
EXPECT_EQ(0, table.GetCounterValue("t:baz"));
- const int kRunMs = 100;
+ const TimeDelta kDuration = TimeDelta::FromMilliseconds(100);
// Do some timing.
baz.Start();
- PlatformThread::Sleep(kRunMs);
+ PlatformThread::Sleep(kDuration);
baz.Stop();
EXPECT_EQ(1, table.GetCounterValue("c:baz"));
- EXPECT_LE(kRunMs, table.GetCounterValue("t:baz"));
+ EXPECT_LE(kDuration.InMilliseconds(), table.GetCounterValue("t:baz"));
// Verify that timing again is additive.
baz.Start();
- PlatformThread::Sleep(kRunMs);
+ PlatformThread::Sleep(kDuration);
baz.Stop();
EXPECT_EQ(2, table.GetCounterValue("c:baz"));
- EXPECT_LE(kRunMs * 2, table.GetCounterValue("t:baz"));
+ EXPECT_LE(kDuration.InMilliseconds() * 2, table.GetCounterValue("t:baz"));
}
// Test some basic StatsScope operations
@@ -383,26 +383,26 @@ TEST_F(StatsTableTest, StatsScope) {
EXPECT_EQ(0, table.GetCounterValue("t:bar"));
EXPECT_EQ(0, table.GetCounterValue("c:bar"));
- const int kRunMs = 100;
+ const TimeDelta kDuration = TimeDelta::FromMilliseconds(100);
// Try a scope.
{
StatsScope<StatsCounterTimer> timer(foo);
StatsScope<StatsRate> timer2(bar);
- PlatformThread::Sleep(kRunMs);
+ PlatformThread::Sleep(kDuration);
}
- EXPECT_LE(kRunMs, table.GetCounterValue("t:foo"));
- EXPECT_LE(kRunMs, table.GetCounterValue("t:bar"));
+ EXPECT_LE(kDuration.InMilliseconds(), table.GetCounterValue("t:foo"));
+ EXPECT_LE(kDuration.InMilliseconds(), table.GetCounterValue("t:bar"));
EXPECT_EQ(1, table.GetCounterValue("c:bar"));
// Try a second scope.
{
StatsScope<StatsCounterTimer> timer(foo);
StatsScope<StatsRate> timer2(bar);
- PlatformThread::Sleep(kRunMs);
+ PlatformThread::Sleep(kDuration);
}
- EXPECT_LE(kRunMs * 2, table.GetCounterValue("t:foo"));
- EXPECT_LE(kRunMs * 2, table.GetCounterValue("t:bar"));
+ EXPECT_LE(kDuration.InMilliseconds() * 2, table.GetCounterValue("t:foo"));
+ EXPECT_LE(kDuration.InMilliseconds() * 2, table.GetCounterValue("t:bar"));
EXPECT_EQ(2, table.GetCounterValue("c:bar"));
DeleteShmem(kTableName);