summaryrefslogtreecommitdiffstats
path: root/views/controls/progress_bar_unittest.cc
diff options
context:
space:
mode:
authoravayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-15 12:39:13 +0000
committeravayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-15 12:39:13 +0000
commit857e79dae449847fe9045034039e57b1433ddb38 (patch)
treeb6be69ac644126f33ab5f32933ef720929ff6409 /views/controls/progress_bar_unittest.cc
parent6a6ce8b3a868dd1f94f8731ebd05abd39da46fec (diff)
downloadchromium_src-857e79dae449847fe9045034039e57b1433ddb38.zip
chromium_src-857e79dae449847fe9045034039e57b1433ddb38.tar.gz
chromium_src-857e79dae449847fe9045034039e57b1433ddb38.tar.bz2
Switched progress bar to integral positions (from 0 to 100).
BUG=none TEST=Launch with --login-manager --login-screen=update and verify that progress bar shows increasing progress and login screen is shown at the end. Review URL: http://codereview.chromium.org/945003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/progress_bar_unittest.cc')
-rw-r--r--views/controls/progress_bar_unittest.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/views/controls/progress_bar_unittest.cc b/views/controls/progress_bar_unittest.cc
index 1f653b7..971b424 100644
--- a/views/controls/progress_bar_unittest.cc
+++ b/views/controls/progress_bar_unittest.cc
@@ -11,16 +11,15 @@ namespace views {
TEST(ProgressBarTest, ProgressProperty) {
ProgressBar bar;
- double progress = 0;
bar.SetProgress(-1);
- progress = bar.GetProgress();
+ int progress = bar.GetProgress();
EXPECT_EQ(0, progress);
- bar.SetProgress(3);
+ bar.SetProgress(300);
progress = bar.GetProgress();
- EXPECT_EQ(1, progress);
- bar.SetProgress(0.618);
+ EXPECT_EQ(100, progress);
+ bar.SetProgress(62);
progress = bar.GetProgress();
- EXPECT_EQ(0.618, progress);
+ EXPECT_EQ(62, progress);
}
TEST(ProgressBarTest, TooltipTextProperty) {
@@ -36,7 +35,7 @@ TEST(ProgressBarTest, TooltipTextProperty) {
TEST(ProgressBarTest, Accessibility) {
ProgressBar bar;
- bar.SetProgress(0.618);
+ bar.SetProgress(62);
AccessibilityTypes::Role role;
EXPECT_TRUE(bar.GetAccessibleRole(&role));