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

Side by Side Diff: chrome/browser/in_process_webkit/indexed_db_browsertest.cc

Issue 6309015: Re-enable indexedDB browser tests after picking up WebKit revision 76531 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months 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 | « no previous file | chrome/test/data/indexeddb/cursor_test.js » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/ref_counted.h" 8 #include "base/ref_counted.h"
9 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 L"window.domAutomationController.send(getLog())", &js_result)); 45 L"window.domAutomationController.send(getLog())", &js_result));
46 FAIL() << "Failed: " << js_result; 46 FAIL() << "Failed: " << js_result;
47 } 47 }
48 } 48 }
49 }; 49 };
50 50
51 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) { 51 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
52 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html")))); 52 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
53 } 53 }
54 54
55 // Flaky. See http://crbug.com/70643. 55 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, IndexTest) {
56 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_IndexTest) {
57 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); 56 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html"))));
58 } 57 }
59 58
60 // Flaky on windows, see http://crbug.com/67422 and http://crbug.com/69293. 59 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) {
61 //#if defined(OS_WIN)
62 //#define MAYBE_KeyPathTest FLAKY_KeyPathTest
63 //#else
64 //#define MAYBE_KeyPathTest KeyPathTest
65 //#endif
66
67 // Disabled per http://trac.webkit.org/changeset/76531. See http://crbug.com/706 65.
68 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_KeyPathTest) {
69 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); 60 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html"))));
70 } 61 }
71 62
72 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { 63 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) {
73 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); 64 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html"))));
74 } 65 }
75 66
76 // Flaky. See http://crbug.com/70643. 67 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ObjectStoreTest) {
77 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_ObjectStoreTest) {
78 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); 68 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html"))));
79 } 69 }
80 70
81 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { 71 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) {
82 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); 72 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html"))));
83 } 73 }
84 74
85 // Flaky. See http://crbug.com/70643 and http://crbug.com/70665. 75 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionTest) {
86 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_TransactionTest) {
87 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); 76 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
88 } 77 }
89 78
90 // Flaky. See http://crbug.com/70643 and http://crbug.com/70665. 79 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) {
91 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) {
92 SimpleTest(testUrl(FilePath( 80 SimpleTest(testUrl(FilePath(
93 FILE_PATH_LITERAL("transaction_run_forever.html")))); 81 FILE_PATH_LITERAL("transaction_run_forever.html"))));
94 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); 82 ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
95 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); 83 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
96 } 84 }
97 85
98 // In proc browser test is needed here because ClearLocalState indirectly calls 86 // In proc browser test is needed here because ClearLocalState indirectly calls
99 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. 87 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin.
100 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { 88 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) {
101 // Create test files. 89 // Create test files.
(...skipping 24 matching lines...) Expand all
126 // Make sure we wait until the destructor has run. 114 // Make sure we wait until the destructor has run.
127 scoped_refptr<ThreadTestHelper> helper( 115 scoped_refptr<ThreadTestHelper> helper(
128 new ThreadTestHelper(BrowserThread::WEBKIT)); 116 new ThreadTestHelper(BrowserThread::WEBKIT));
129 ASSERT_TRUE(helper->Run()); 117 ASSERT_TRUE(helper->Run());
130 118
131 // Because we specified https for scheme to be skipped the second file 119 // Because we specified https for scheme to be skipped the second file
132 // should survive and the first go into vanity. 120 // should survive and the first go into vanity.
133 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); 121 ASSERT_FALSE(file_util::PathExists(temp_file_path_1));
134 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); 122 ASSERT_TRUE(file_util::PathExists(temp_file_path_2));
135 } 123 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/indexeddb/cursor_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698