| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "content/test/layout_browsertest.h" | 6 #include "content/test/layout_browsertest.h" |
| 7 | 7 |
| 8 class IndexedDBLayoutTest : public InProcessBrowserLayoutTest { | 8 class IndexedDBLayoutTest : public InProcessBrowserLayoutTest { |
| 9 public: | 9 public: |
| 10 IndexedDBLayoutTest() : InProcessBrowserLayoutTest( | 10 IndexedDBLayoutTest() : InProcessBrowserLayoutTest( |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 "basics-workers.html", | 32 "basics-workers.html", |
| 33 "database-basics.html", | 33 "database-basics.html", |
| 34 "factory-basics.html", | 34 "factory-basics.html", |
| 35 "index-basics.html", | 35 "index-basics.html", |
| 36 "objectstore-basics.html", | 36 "objectstore-basics.html", |
| 37 NULL | 37 NULL |
| 38 }; | 38 }; |
| 39 | 39 |
| 40 static const char* kComplexTests[] = { | 40 static const char* kComplexTests[] = { |
| 41 "prefetch-bugfix-108071.html", | 41 "prefetch-bugfix-108071.html", |
| 42 "pending-version-change-stuck-works-with-terminate.html", | 42 // Flaky: http://crbug.com/123685 |
| 43 // "pending-version-change-stuck-works-with-terminate.html", |
| 43 NULL | 44 NULL |
| 44 }; | 45 }; |
| 45 | 46 |
| 46 static const char* kIndexTests[] = { | 47 static const char* kIndexTests[] = { |
| 47 "deleteIndex.html", | 48 "deleteIndex.html", |
| 49 // Flaky: http://crbug.com/123685 |
| 50 // "index-basics-workers.html", |
| 48 "index-count.html", | 51 "index-count.html", |
| 49 "index-cursor.html", // Locally takes ~6s compared to <1 for the others. | 52 "index-cursor.html", // Locally takes ~6s compared to <1 for the others. |
| 50 "index-get-key-argument-required.html", | 53 "index-get-key-argument-required.html", |
| 51 "index-multientry.html", | 54 "index-multientry.html", |
| 52 "index-population.html", | 55 "index-population.html", |
| 53 "index-unique.html", | 56 "index-unique.html", |
| 54 NULL | 57 NULL |
| 55 }; | 58 }; |
| 56 | 59 |
| 57 static const char* kKeyTests[] = { | 60 static const char* kKeyTests[] = { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 } | 96 } |
| 94 | 97 |
| 95 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, BasicTests) { | 98 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, BasicTests) { |
| 96 RunLayoutTests(kBasicTests); | 99 RunLayoutTests(kBasicTests); |
| 97 } | 100 } |
| 98 | 101 |
| 99 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, ComplexTests) { | 102 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, ComplexTests) { |
| 100 RunLayoutTests(kComplexTests); | 103 RunLayoutTests(kComplexTests); |
| 101 } | 104 } |
| 102 | 105 |
| 103 // Frequently times out, sometimes due to webkit assertion failure. | |
| 104 // http://crbug.com/120924 | |
| 105 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, FAILS_IndexBasicsWorkersTest) { | |
| 106 RunLayoutTest("deleteIndex.html"); | |
| 107 RunLayoutTest("index-basics-workers.html"); | |
| 108 } | |
| 109 | |
| 110 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IndexTests) { | 106 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IndexTests) { |
| 111 RunLayoutTests(kIndexTests); | 107 RunLayoutTests(kIndexTests); |
| 112 } | 108 } |
| 113 | 109 |
| 114 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, KeyTests) { | 110 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, KeyTests) { |
| 115 RunLayoutTests(kKeyTests); | 111 RunLayoutTests(kKeyTests); |
| 116 } | 112 } |
| 117 | 113 |
| 118 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, TransactionTests) { | 114 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, TransactionTests) { |
| 119 RunLayoutTests(kTransactionTests); | 115 RunLayoutTests(kTransactionTests); |
| 120 } | 116 } |
| 121 | 117 |
| 122 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, RegressionTests) { | 118 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, RegressionTests) { |
| 123 RunLayoutTests(kRegressionTests); | 119 RunLayoutTests(kRegressionTests); |
| 124 } | 120 } |
| OLD | NEW |