diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/chromium/tests/DateTimeFormatTest.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/chromium/tests/DateTimeFormatTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/DateTimeFormatTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp b/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp index 1c006abaf..a2c5e9f0a 100644 --- a/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp +++ b/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "DateTimeFormat.h" -#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include <gtest/gtest.h> #include <wtf/text/CString.h> #include <wtf/text/StringBuilder.h> @@ -280,7 +280,7 @@ TEST_F(DateTimeFormatTest, SingleLowerCaseCharacter) EXPECT_EQ(DateTimeFormat::FieldTypeSecond, single('s')); EXPECT_EQ(DateTimeFormat::FieldTypeExtendedYear, single('u')); EXPECT_EQ(DateTimeFormat::FieldTypeNonLocationZone, single('v')); - EXPECT_EQ(DateTimeFormat::FieldTypeWeekOfMonth, single('w')); + EXPECT_EQ(DateTimeFormat::FieldTypeWeekOfMonth, single('W')); EXPECT_EQ(DateTimeFormat::FieldTypeYear, single('y')); EXPECT_EQ(DateTimeFormat::FieldTypeZone, single('z')); } @@ -313,7 +313,7 @@ TEST_F(DateTimeFormatTest, SingleUpperCaseCharacter) EXPECT_EQ(DateTimeFormat::FieldTypeMonth, single('M')); EXPECT_EQ(DateTimeFormat::FieldTypeQuater, single('Q')); EXPECT_EQ(DateTimeFormat::FieldTypeFractionalSecond, single('S')); - EXPECT_EQ(DateTimeFormat::FieldTypeWeekOfYear, single('W')); + EXPECT_EQ(DateTimeFormat::FieldTypeWeekOfYear, single('w')); EXPECT_EQ(DateTimeFormat::FieldTypeYearOfWeekOfYear, single('Y')); EXPECT_EQ(DateTimeFormat::FieldTypeRFC822Zone, single('Z')); } |