From 033704f47fee8b873efff82f16c2279ea1369a6f Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Fri, 25 Jun 2010 02:17:44 +0000 Subject: Revert r50807 TBR=arv@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50811 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/form_autocomplete_browsertest.cc | 120 +++++++++++++++++++++++ chrome/renderer/form_autocomplete_unittest.cc | 120 ----------------------- 2 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 chrome/renderer/form_autocomplete_browsertest.cc delete mode 100644 chrome/renderer/form_autocomplete_unittest.cc (limited to 'chrome/renderer') diff --git a/chrome/renderer/form_autocomplete_browsertest.cc b/chrome/renderer/form_autocomplete_browsertest.cc new file mode 100644 index 0000000..5f0d8ab --- /dev/null +++ b/chrome/renderer/form_autocomplete_browsertest.cc @@ -0,0 +1,120 @@ +// Copyright (c) 2010 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. + +#include "chrome/common/render_messages.h" +#include "chrome/test/render_view_test.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" +#include "webkit/glue/form_data.h" + +using webkit_glue::FormData; +using WebKit::WebCompositionCommand; +using WebKit::WebFrame; +using WebKit::WebString; +using WebKit::WebTextDirection; +using WebKit::WebURLError; + +typedef RenderViewTest FormAutocompleteTest; + +// Tests that submitting a form generates a FormSubmitted message +// with the form fields. +TEST_F(FormAutocompleteTest, NormalFormSubmit) { + // Load a form. + LoadHTML("
" + "
"); + + // Submit the form. + ExecuteJavaScript("document.getElementById('myForm').submit();"); + ProcessPendingMessages(); + + const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching( + ViewHostMsg_FormSubmitted::ID); + ASSERT_TRUE(message != NULL); + + Tuple1 forms; + ViewHostMsg_FormSubmitted::Read(message, &forms); + ASSERT_EQ(2U, forms.a.fields.size()); + + webkit_glue::FormField& form_field = forms.a.fields[0]; + EXPECT_EQ(WebString("fname"), form_field.name()); + EXPECT_EQ(WebString("Rick"), form_field.value()); + + form_field = forms.a.fields[1]; + EXPECT_EQ(WebString("lname"), form_field.name()); + EXPECT_EQ(WebString("Deckard"), form_field.value()); +} + +// Tests that submitting a form that has autocomplete="off" does not generate a +// FormSubmitted message. +TEST_F(FormAutocompleteTest, AutoCompleteOffFormSubmit) { + // Load a form. + LoadHTML("
" + "" + "" + "
"); + + // Submit the form. + ExecuteJavaScript("document.getElementById('myForm').submit();"); + ProcessPendingMessages(); + + // No FormSubmitted message should have been sent. + EXPECT_FALSE(render_thread_.sink().GetFirstMessageMatching( + ViewHostMsg_FormSubmitted::ID)); +} + +// Tests that fields with autocomplete off are not submitted. +TEST_F(FormAutocompleteTest, AutoCompleteOffInputSubmit) { + // Load a form. + LoadHTML("
" + "" + "" + "
"); + + // Submit the form. + ExecuteJavaScript("document.getElementById('myForm').submit();"); + ProcessPendingMessages(); + + // No FormSubmitted message should have been sent. + const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching( + ViewHostMsg_FormSubmitted::ID); + ASSERT_TRUE(message != NULL); + + Tuple1 forms; + ViewHostMsg_FormSubmitted::Read(message, &forms); + ASSERT_EQ(1U, forms.a.fields.size()); + + webkit_glue::FormField& form_field = forms.a.fields[0]; + EXPECT_EQ(WebString("fname"), form_field.name()); + EXPECT_EQ(WebString("Rick"), form_field.value()); +} + +// Tests that submitting a form that has been dynamically set as autocomplete +// off does not generate a FormSubmitted message. +// http://crbug.com/36520 +// TODO(jcampan): Waiting on WebKit bug 35823. +TEST_F(FormAutocompleteTest, FAILS_DynamicAutoCompleteOffFormSubmit) { + LoadHTML("
" + "
"); + + WebKit::WebElement element = + GetMainFrame()->document().getElementById(WebKit::WebString("myForm")); + ASSERT_FALSE(element.isNull()); + WebKit::WebFormElement form = element.to(); + EXPECT_TRUE(form.autoComplete()); + + // Dynamically mark the form as autocomplete off. + ExecuteJavaScript("document.getElementById('myForm').autocomplete='off';"); + ProcessPendingMessages(); + EXPECT_FALSE(form.autoComplete()); + + // Submit the form. + ExecuteJavaScript("document.getElementById('myForm').submit();"); + ProcessPendingMessages(); + + // No FormSubmitted message should have been sent. + EXPECT_FALSE(render_thread_.sink().GetFirstMessageMatching( + ViewHostMsg_FormSubmitted::ID)); +} diff --git a/chrome/renderer/form_autocomplete_unittest.cc b/chrome/renderer/form_autocomplete_unittest.cc deleted file mode 100644 index 5f0d8ab..0000000 --- a/chrome/renderer/form_autocomplete_unittest.cc +++ /dev/null @@ -1,120 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/render_messages.h" -#include "chrome/test/render_view_test.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" -#include "webkit/glue/form_data.h" - -using webkit_glue::FormData; -using WebKit::WebCompositionCommand; -using WebKit::WebFrame; -using WebKit::WebString; -using WebKit::WebTextDirection; -using WebKit::WebURLError; - -typedef RenderViewTest FormAutocompleteTest; - -// Tests that submitting a form generates a FormSubmitted message -// with the form fields. -TEST_F(FormAutocompleteTest, NormalFormSubmit) { - // Load a form. - LoadHTML("
" - "
"); - - // Submit the form. - ExecuteJavaScript("document.getElementById('myForm').submit();"); - ProcessPendingMessages(); - - const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching( - ViewHostMsg_FormSubmitted::ID); - ASSERT_TRUE(message != NULL); - - Tuple1 forms; - ViewHostMsg_FormSubmitted::Read(message, &forms); - ASSERT_EQ(2U, forms.a.fields.size()); - - webkit_glue::FormField& form_field = forms.a.fields[0]; - EXPECT_EQ(WebString("fname"), form_field.name()); - EXPECT_EQ(WebString("Rick"), form_field.value()); - - form_field = forms.a.fields[1]; - EXPECT_EQ(WebString("lname"), form_field.name()); - EXPECT_EQ(WebString("Deckard"), form_field.value()); -} - -// Tests that submitting a form that has autocomplete="off" does not generate a -// FormSubmitted message. -TEST_F(FormAutocompleteTest, AutoCompleteOffFormSubmit) { - // Load a form. - LoadHTML("
" - "" - "" - "
"); - - // Submit the form. - ExecuteJavaScript("document.getElementById('myForm').submit();"); - ProcessPendingMessages(); - - // No FormSubmitted message should have been sent. - EXPECT_FALSE(render_thread_.sink().GetFirstMessageMatching( - ViewHostMsg_FormSubmitted::ID)); -} - -// Tests that fields with autocomplete off are not submitted. -TEST_F(FormAutocompleteTest, AutoCompleteOffInputSubmit) { - // Load a form. - LoadHTML("
" - "" - "" - "
"); - - // Submit the form. - ExecuteJavaScript("document.getElementById('myForm').submit();"); - ProcessPendingMessages(); - - // No FormSubmitted message should have been sent. - const IPC::Message* message = render_thread_.sink().GetFirstMessageMatching( - ViewHostMsg_FormSubmitted::ID); - ASSERT_TRUE(message != NULL); - - Tuple1 forms; - ViewHostMsg_FormSubmitted::Read(message, &forms); - ASSERT_EQ(1U, forms.a.fields.size()); - - webkit_glue::FormField& form_field = forms.a.fields[0]; - EXPECT_EQ(WebString("fname"), form_field.name()); - EXPECT_EQ(WebString("Rick"), form_field.value()); -} - -// Tests that submitting a form that has been dynamically set as autocomplete -// off does not generate a FormSubmitted message. -// http://crbug.com/36520 -// TODO(jcampan): Waiting on WebKit bug 35823. -TEST_F(FormAutocompleteTest, FAILS_DynamicAutoCompleteOffFormSubmit) { - LoadHTML("
" - "
"); - - WebKit::WebElement element = - GetMainFrame()->document().getElementById(WebKit::WebString("myForm")); - ASSERT_FALSE(element.isNull()); - WebKit::WebFormElement form = element.to(); - EXPECT_TRUE(form.autoComplete()); - - // Dynamically mark the form as autocomplete off. - ExecuteJavaScript("document.getElementById('myForm').autocomplete='off';"); - ProcessPendingMessages(); - EXPECT_FALSE(form.autoComplete()); - - // Submit the form. - ExecuteJavaScript("document.getElementById('myForm').submit();"); - ProcessPendingMessages(); - - // No FormSubmitted message should have been sent. - EXPECT_FALSE(render_thread_.sink().GetFirstMessageMatching( - ViewHostMsg_FormSubmitted::ID)); -} -- cgit v1.1