OLD | NEW |
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 Loading... |
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 // TODO(hans): Keep an eye out for these tests going flaky. See crbug.com/63675. | 55 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, IndexTest) { |
56 // Crashy, http://crbug.com/67422. | |
57 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_IndexTest) { | |
58 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); | 56 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); |
59 } | 57 } |
60 | 58 |
61 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) { | 59 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) { |
62 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); | 60 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); |
63 } | 61 } |
64 | 62 |
65 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { | 63 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { |
66 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); | 64 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); |
67 } | 65 } |
68 | 66 |
69 // Crashy, http://crbug.com/68446. | 67 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ObjectStoreTest) { |
70 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ObjectStoreTest) { | |
71 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); | 68 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); |
72 } | 69 } |
73 | 70 |
74 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { | 71 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { |
75 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); | 72 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); |
76 } | 73 } |
77 | 74 |
78 // Crashy, http://crbug.com/67422. | 75 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionTest) { |
79 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_TransactionTest) { | |
80 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); | 76 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); |
81 } | 77 } |
82 | 78 |
83 // Crashy, http://crbug.com/66394. | 79 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) { |
84 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) { | |
85 SimpleTest(testUrl(FilePath( | 80 SimpleTest(testUrl(FilePath( |
86 FILE_PATH_LITERAL("transaction_run_forever.html")))); | 81 FILE_PATH_LITERAL("transaction_run_forever.html")))); |
87 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); | 82 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); |
88 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); | 83 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); |
89 } | 84 } |
90 | 85 |
91 // In proc browser test is needed here because ClearLocalState indirectly calls | 86 // In proc browser test is needed here because ClearLocalState indirectly calls |
92 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. | 87 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. |
93 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { | 88 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { |
94 // Create test files. | 89 // Create test files. |
(...skipping 24 matching lines...) Expand all Loading... |
119 // Make sure we wait until the destructor has run. | 114 // Make sure we wait until the destructor has run. |
120 scoped_refptr<ThreadTestHelper> helper( | 115 scoped_refptr<ThreadTestHelper> helper( |
121 new ThreadTestHelper(BrowserThread::WEBKIT)); | 116 new ThreadTestHelper(BrowserThread::WEBKIT)); |
122 ASSERT_TRUE(helper->Run()); | 117 ASSERT_TRUE(helper->Run()); |
123 | 118 |
124 // 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 |
125 // should survive and the first go into vanity. | 120 // should survive and the first go into vanity. |
126 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); | 121 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); |
127 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); | 122 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); |
128 } | 123 } |
OLD | NEW |