| 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 // Flaky on windows, see http://crbug.com/67422 and http://crbug.com/69293. | 59 // Flaky on windows, see http://crbug.com/67422 and http://crbug.com/69293. |
| 62 #if defined(OS_WIN) | 60 #if defined(OS_WIN) |
| 63 #define MAYBE_KeyPathTest FLAKY_KeyPathTest | 61 #define MAYBE_KeyPathTest FLAKY_KeyPathTest |
| 64 #else | 62 #else |
| 65 #define MAYBE_KeyPathTest KeyPathTest | 63 #define MAYBE_KeyPathTest KeyPathTest |
| 66 #endif | 64 #endif |
| 67 | 65 |
| 68 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_KeyPathTest) { | 66 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_KeyPathTest) { |
| 69 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); | 67 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); |
| 70 } | 68 } |
| 71 | 69 |
| 72 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { | 70 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { |
| 73 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); | 71 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); |
| 74 } | 72 } |
| 75 | 73 |
| 76 // Crashy, http://crbug.com/68446. | 74 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ObjectStoreTest) { |
| 77 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ObjectStoreTest) { | |
| 78 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); | 75 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); |
| 79 } | 76 } |
| 80 | 77 |
| 81 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { | 78 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { |
| 82 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); | 79 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); |
| 83 } | 80 } |
| 84 | 81 |
| 85 // Crashy, http://crbug.com/67422. | 82 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")))); | 83 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); |
| 88 } | 84 } |
| 89 | 85 |
| 90 // Crashy, http://crbug.com/66394. | 86 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) { |
| 91 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) { | |
| 92 SimpleTest(testUrl(FilePath( | 87 SimpleTest(testUrl(FilePath( |
| 93 FILE_PATH_LITERAL("transaction_run_forever.html")))); | 88 FILE_PATH_LITERAL("transaction_run_forever.html")))); |
| 94 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); | 89 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); |
| 95 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); | 90 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); |
| 96 } | 91 } |
| 97 | 92 |
| 98 // In proc browser test is needed here because ClearLocalState indirectly calls | 93 // In proc browser test is needed here because ClearLocalState indirectly calls |
| 99 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. | 94 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. |
| 100 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { | 95 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { |
| 101 // Create test files. | 96 // Create test files. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 126 // Make sure we wait until the destructor has run. | 121 // Make sure we wait until the destructor has run. |
| 127 scoped_refptr<ThreadTestHelper> helper( | 122 scoped_refptr<ThreadTestHelper> helper( |
| 128 new ThreadTestHelper(BrowserThread::WEBKIT)); | 123 new ThreadTestHelper(BrowserThread::WEBKIT)); |
| 129 ASSERT_TRUE(helper->Run()); | 124 ASSERT_TRUE(helper->Run()); |
| 130 | 125 |
| 131 // Because we specified https for scheme to be skipped the second file | 126 // Because we specified https for scheme to be skipped the second file |
| 132 // should survive and the first go into vanity. | 127 // should survive and the first go into vanity. |
| 133 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); | 128 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); |
| 134 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); | 129 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); |
| 135 } | 130 } |
| OLD | NEW |