diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit/chromium/tests/DateTimeFormatTest.cpp | |
parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
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 a2c5e9f0a..1c006abaf 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_MULTIPLE_FIELDS_UI) +#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) #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')); } |