Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(722)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/renderer/autofill/form_autocomplete_browsertest.cc

Issue 8680040: Group forms-related files in webkit/glue in a forms/ subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + another build fix Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/autofill/autofill_browsertest.cc ('k') | chrome/renderer/autofill/form_autofill_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/time.h" 5 #include "base/time.h"
6 #include "chrome/common/autofill_messages.h" 6 #include "chrome/common/autofill_messages.h"
7 #include "chrome/test/base/chrome_render_view_test.h" 7 #include "chrome/test/base/chrome_render_view_test.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h"
13 #include "webkit/glue/form_data.h" 13 #include "webkit/forms/form_data.h"
14 #include "webkit/glue/web_io_operators.h" 14 #include "webkit/glue/web_io_operators.h"
15 15
16 using webkit_glue::FormData; 16 using webkit::forms::FormData;
17 using WebKit::WebFrame; 17 using WebKit::WebFrame;
18 using WebKit::WebString; 18 using WebKit::WebString;
19 using WebKit::WebTextDirection; 19 using WebKit::WebTextDirection;
20 using WebKit::WebURLError; 20 using WebKit::WebURLError;
21 21
22 typedef ChromeRenderViewTest FormAutocompleteTest; 22 typedef ChromeRenderViewTest FormAutocompleteTest;
23 23
24 // Tests that submitting a form generates a FormSubmitted message 24 // Tests that submitting a form generates a FormSubmitted message
25 // with the form fields. 25 // with the form fields.
26 TEST_F(FormAutocompleteTest, NormalFormSubmit) { 26 TEST_F(FormAutocompleteTest, NormalFormSubmit) {
27 // Load a form. 27 // Load a form.
28 LoadHTML("<html><form id='myForm'><input name='fname' value='Rick'/>" 28 LoadHTML("<html><form id='myForm'><input name='fname' value='Rick'/>"
29 "<input name='lname' value='Deckard'/></form></html>"); 29 "<input name='lname' value='Deckard'/></form></html>");
30 30
31 // Submit the form. 31 // Submit the form.
32 ExecuteJavaScript("document.getElementById('myForm').submit();"); 32 ExecuteJavaScript("document.getElementById('myForm').submit();");
33 ProcessPendingMessages(); 33 ProcessPendingMessages();
34 34
35 const IPC::Message* message = render_thread_->sink().GetFirstMessageMatching( 35 const IPC::Message* message = render_thread_->sink().GetFirstMessageMatching(
36 AutofillHostMsg_FormSubmitted::ID); 36 AutofillHostMsg_FormSubmitted::ID);
37 ASSERT_TRUE(message != NULL); 37 ASSERT_TRUE(message != NULL);
38 38
39 // The tuple also includes a timestamp, which is ignored. 39 // The tuple also includes a timestamp, which is ignored.
40 Tuple2<FormData, base::TimeTicks> forms; 40 Tuple2<FormData, base::TimeTicks> forms;
41 AutofillHostMsg_FormSubmitted::Read(message, &forms); 41 AutofillHostMsg_FormSubmitted::Read(message, &forms);
42 ASSERT_EQ(2U, forms.a.fields.size()); 42 ASSERT_EQ(2U, forms.a.fields.size());
43 43
44 webkit_glue::FormField& form_field = forms.a.fields[0]; 44 webkit::forms::FormField& form_field = forms.a.fields[0];
45 EXPECT_EQ(WebString("fname"), form_field.name); 45 EXPECT_EQ(WebString("fname"), form_field.name);
46 EXPECT_EQ(WebString("Rick"), form_field.value); 46 EXPECT_EQ(WebString("Rick"), form_field.value);
47 47
48 form_field = forms.a.fields[1]; 48 form_field = forms.a.fields[1];
49 EXPECT_EQ(WebString("lname"), form_field.name); 49 EXPECT_EQ(WebString("lname"), form_field.name);
50 EXPECT_EQ(WebString("Deckard"), form_field.value); 50 EXPECT_EQ(WebString("Deckard"), form_field.value);
51 } 51 }
52 52
53 // Tests that submitting a form that has autocomplete="off" does not generate a 53 // Tests that submitting a form that has autocomplete="off" does not generate a
54 // FormSubmitted message. 54 // FormSubmitted message.
(...skipping 28 matching lines...) Expand all
83 // No FormSubmitted message should have been sent. 83 // No FormSubmitted message should have been sent.
84 const IPC::Message* message = render_thread_->sink().GetFirstMessageMatching( 84 const IPC::Message* message = render_thread_->sink().GetFirstMessageMatching(
85 AutofillHostMsg_FormSubmitted::ID); 85 AutofillHostMsg_FormSubmitted::ID);
86 ASSERT_TRUE(message != NULL); 86 ASSERT_TRUE(message != NULL);
87 87
88 // The tuple also includes a timestamp, which is ignored. 88 // The tuple also includes a timestamp, which is ignored.
89 Tuple2<FormData, base::TimeTicks> forms; 89 Tuple2<FormData, base::TimeTicks> forms;
90 AutofillHostMsg_FormSubmitted::Read(message, &forms); 90 AutofillHostMsg_FormSubmitted::Read(message, &forms);
91 ASSERT_EQ(1U, forms.a.fields.size()); 91 ASSERT_EQ(1U, forms.a.fields.size());
92 92
93 webkit_glue::FormField& form_field = forms.a.fields[0]; 93 webkit::forms::FormField& form_field = forms.a.fields[0];
94 EXPECT_EQ(WebString("fname"), form_field.name); 94 EXPECT_EQ(WebString("fname"), form_field.name);
95 EXPECT_EQ(WebString("Rick"), form_field.value); 95 EXPECT_EQ(WebString("Rick"), form_field.value);
96 } 96 }
97 97
98 // Tests that submitting a form that has been dynamically set as autocomplete 98 // Tests that submitting a form that has been dynamically set as autocomplete
99 // off does not generate a FormSubmitted message. 99 // off does not generate a FormSubmitted message.
100 // http://crbug.com/36520 100 // http://crbug.com/36520
101 TEST_F(FormAutocompleteTest, DynamicAutoCompleteOffFormSubmit) { 101 TEST_F(FormAutocompleteTest, DynamicAutoCompleteOffFormSubmit) {
102 LoadHTML("<html><form id='myForm'><input name='fname' value='Rick'/>" 102 LoadHTML("<html><form id='myForm'><input name='fname' value='Rick'/>"
103 "<input name='lname' value='Deckard'/></form></html>"); 103 "<input name='lname' value='Deckard'/></form></html>");
(...skipping 11 matching lines...) Expand all
115 EXPECT_FALSE(form.autoComplete()); 115 EXPECT_FALSE(form.autoComplete());
116 116
117 // Submit the form. 117 // Submit the form.
118 ExecuteJavaScript("document.getElementById('myForm').submit();"); 118 ExecuteJavaScript("document.getElementById('myForm').submit();");
119 ProcessPendingMessages(); 119 ProcessPendingMessages();
120 120
121 // No FormSubmitted message should have been sent. 121 // No FormSubmitted message should have been sent.
122 EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching( 122 EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching(
123 AutofillHostMsg_FormSubmitted::ID)); 123 AutofillHostMsg_FormSubmitted::ID));
124 } 124 }
OLDNEW
« no previous file with comments | « chrome/renderer/autofill/autofill_browsertest.cc ('k') | chrome/renderer/autofill/form_autofill_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698