Chromium Code Reviews Chromium Code Reviews
Issue 389343002:
Custom validation message to take into account text direction (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "config.h" | |
| 6 #include "core/html/HTMLFormControlElement.h" | |
| 7 | |
| 8 #include "core/frame/FrameView.h" | |
| 9 #include "core/html/HTMLDocument.h" | |
| 10 #include "core/html/HTMLInputElement.h" | |
| 11 #include "core/testing/DummyPageHolder.h" | |
| 12 #include <gtest/gtest.h> | |
| 13 | |
| 14 namespace blink { | |
| 15 | |
| 16 class HTMLFormControlElementTest : public ::testing::Test { | |
| 17 protected: | |
| 18 virtual void SetUp() OVERRIDE; | |
| 19 | |
| 20 DummyPageHolder& page() const { return *m_dummyPageHolder; } | |
| 21 HTMLDocument& document() const { return *m_document; } | |
| 22 | |
| 23 private: | |
| 24 OwnPtr<DummyPageHolder> m_dummyPageHolder; | |
| 25 RefPtrWillBePersistent<HTMLDocument> m_document; | |
| 26 }; | |
| 27 | |
| 28 void HTMLFormControlElementTest::SetUp() | |
| 29 { | |
| 30 Page::PageClients pageClients; | |
| 31 fillWithEmptyClients(pageClients); | |
| 32 m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600), &pageClients) ; | |
| 33 | |
| 34 m_document = toHTMLDocument(&m_dummyPageHolder->document()); | |
| 35 m_document->setMimeType("text/html"); | |
| 36 m_document->setCharset("utf-8"); | |
| 37 } | |
| 38 | |
| 39 TEST_F(HTMLFormControlElementTest, customValidationMessageTextDirection) | |
| 40 { | |
| 41 document().documentElement()->setInnerHTML("<body><input required id=input>< /body>", ASSERT_NO_EXCEPTION); | |
| 42 document().view()->updateLayoutAndStyleIfNeededRecursive(); | |
| 43 | |
| 44 HTMLInputElement* input = toHTMLInputElement(document().getElementById("inpu t")); | |
| 45 input->setCustomValidity(String::fromUTF8("\xD8\xB9\xD8\xB1\xD8\xA8\xD9\x89" )); | |
| 46 input->setAttribute(HTMLNames::titleAttr, AtomicString::fromUTF8("\xD8\xB9\x D8\xB1\xD8\xA8\xD9\x89")); | |
| 47 | |
| 48 String message = input->validationMessage().stripWhiteSpace(); | |
| 49 String subMessage = String(); | |
| 50 TextDirection messageDir = RTL; | |
| 51 TextDirection subMessageDir = LTR; | |
| 52 | |
| 53 input->findCustomValidationMessageTextDirection(message, messageDir, subMess age, subMessageDir); | |
| 54 EXPECT_EQ(messageDir, RTL); | |
|
tkent
2014/08/12 00:19:58
Please reverse the arguments. EXPECT_EQ(RTL, mess
Habib Virji
2014/08/12 07:56:17
Done.
| |
| 55 EXPECT_EQ(subMessageDir, LTR); | |
|
tkent
2014/08/12 00:19:58
Ditto.
Habib Virji
2014/08/12 07:56:17
Done.
| |
| 56 | |
| 57 input->renderer()->style()->setDirection(RTL); | |
| 58 input->findCustomValidationMessageTextDirection(message, messageDir, subMess age, subMessageDir); | |
| 59 EXPECT_EQ(messageDir, RTL); | |
|
tkent
2014/08/12 00:19:58
Ditto.
Habib Virji
2014/08/12 07:56:16
Done.
| |
| 60 EXPECT_EQ(subMessageDir, RTL); | |
|
tkent
2014/08/12 00:19:58
Ditto.
Habib Virji
2014/08/12 07:56:16
Done.
| |
| 61 | |
| 62 input->setCustomValidity(String::fromUTF8("Main message.")); | |
| 63 message = input->validationMessage().stripWhiteSpace(); | |
| 64 input->findCustomValidationMessageTextDirection(message, messageDir, subMess age, subMessageDir); | |
| 65 EXPECT_EQ(messageDir, LTR); | |
|
tkent
2014/08/12 00:19:58
Ditto.
Habib Virji
2014/08/12 07:56:17
Done.
| |
| 66 EXPECT_EQ(subMessageDir, RTL); | |
|
tkent
2014/08/12 00:19:58
Ditto.
Habib Virji
2014/08/12 07:56:16
Done.
| |
| 67 } | |
| 68 | |
| 69 } | |
| OLD | NEW |
