| OLD | NEW |
| 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/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
| 8 #include "chrome/test/automation/tab_proxy.h" | 8 #include "chrome/test/automation/tab_proxy.h" |
| 9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 10 #include "chrome/test/ui/ui_layout_test.h" | 10 #include "chrome/test/ui/ui_layout_test.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("events"), | 112 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("events"), |
| 113 kNoHttpPort); | 113 kNoHttpPort); |
| 114 AddJSTestResources(); | 114 AddJSTestResources(); |
| 115 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("events"). | 115 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("events"). |
| 116 AppendASCII("resources")); | 116 AppendASCII("resources")); |
| 117 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("events"). | 117 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("events"). |
| 118 AppendASCII("script-tests")); | 118 AppendASCII("script-tests")); |
| 119 RunTests(kEventsFiles); | 119 RunTests(kEventsFiles); |
| 120 } | 120 } |
| 121 | 121 |
| 122 TEST_F(DOMStorageTest, LocalStorageLayoutTests) { | 122 #if defined(OS_LINUX) |
| 123 // http://crbug.com/104872 |
| 124 #define MAYBE_LocalStorageLayoutTests FAILS_LocalStorageLayoutTests |
| 125 #else |
| 126 #define MAYBE_LocalStorageLayoutTests LocalStorageLayoutTests |
| 127 #endif |
| 128 |
| 129 TEST_F(DOMStorageTest, MAYBE_LocalStorageLayoutTests) { |
| 123 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"), | 130 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"), |
| 124 kNoHttpPort); | 131 kNoHttpPort); |
| 125 AddJSTestResources(); | 132 AddJSTestResources(); |
| 126 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"). | 133 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"). |
| 127 AppendASCII("resources")); | 134 AppendASCII("resources")); |
| 128 RunTests(kStorageFiles); | 135 RunTests(kStorageFiles); |
| 129 } | 136 } |
| 130 | 137 |
| 131 TEST_F(DOMStorageTest, SessionStorageLayoutTests) { | 138 #if defined(OS_LINUX) |
| 139 // http://crbug.com/104872 |
| 140 #define MAYBE_SessionStorageLayoutTests FAILS_SessionStorageLayoutTests |
| 141 #else |
| 142 #define MAYBE_SessionStorageLayoutTests SessionStorageLayoutTests |
| 143 #endif |
| 144 |
| 145 TEST_F(DOMStorageTest, MAYBE_SessionStorageLayoutTests) { |
| 132 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"), | 146 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"), |
| 133 kNoHttpPort); | 147 kNoHttpPort); |
| 134 AddJSTestResources(); | 148 AddJSTestResources(); |
| 135 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"). | 149 AddResourceForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"). |
| 136 AppendASCII("resources")); | 150 AppendASCII("resources")); |
| 137 RunTests(kStorageFiles); | 151 RunTests(kStorageFiles); |
| 138 } | 152 } |
| 139 | 153 |
| 140 class DomStorageEmptyDatabaseTest : public UITest { | 154 class DomStorageEmptyDatabaseTest : public UITest { |
| 141 protected: | 155 protected: |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 NavigateToURL(GURL("javascript:set()")); | 201 NavigateToURL(GURL("javascript:set()")); |
| 188 QuitBrowser(); | 202 QuitBrowser(); |
| 189 EXPECT_FALSE(StorageDirIsEmpty()); | 203 EXPECT_FALSE(StorageDirIsEmpty()); |
| 190 | 204 |
| 191 LaunchBrowserAndServer(); | 205 LaunchBrowserAndServer(); |
| 192 NavigateToURL(TestUrl()); | 206 NavigateToURL(TestUrl()); |
| 193 NavigateToURL(GURL("javascript:clear()")); | 207 NavigateToURL(GURL("javascript:clear()")); |
| 194 QuitBrowser(); | 208 QuitBrowser(); |
| 195 EXPECT_TRUE(StorageDirIsEmpty()); | 209 EXPECT_TRUE(StorageDirIsEmpty()); |
| 196 } | 210 } |
| OLD | NEW |