OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "build/build_config.h" | |
6 #include "chrome/common/chrome_switches.h" | 5 #include "chrome/common/chrome_switches.h" |
7 #include "chrome/test/automation/tab_proxy.h" | 6 #include "chrome/test/automation/tab_proxy.h" |
8 #include "chrome/test/ui/ui_layout_test.h" | 7 #include "chrome/test/ui/ui_layout_test.h" |
9 | 8 |
10 // TODO(jorlow): Enable all of these tests, eventually... | 9 // TODO(jorlow): Enable all of these tests, eventually... |
11 static const char* kEventsFiles[] = { | 10 static const char* kEventsFiles[] = { |
12 //"complex-values.html", | 11 //"complex-values.html", |
13 //"iframe-events.html", | 12 //"iframe-events.html", |
14 //"index-get-and-set.html", | 13 //"index-get-and-set.html", |
15 //"onstorage-attribute-markup.html", | 14 //"onstorage-attribute-markup.html", |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 ClearDOMStorage(); | 95 ClearDOMStorage(); |
97 RunLayoutTest(*files, false); | 96 RunLayoutTest(*files, false); |
98 ++files; | 97 ++files; |
99 } | 98 } |
100 } | 99 } |
101 | 100 |
102 FilePath test_dir_; | 101 FilePath test_dir_; |
103 }; | 102 }; |
104 | 103 |
105 // http://code.google.com/p/chromium/issues/detail?id=24145 | 104 // http://code.google.com/p/chromium/issues/detail?id=24145 |
106 // Remove build_config.h include when this is removed. | |
107 #if defined(OS_WIN) | 105 #if defined(OS_WIN) |
108 #define MAYBE_LocalStorageLayoutTests FLAKY_LocalStorageLayoutTests | |
109 #define MAYBE_DOMStorageLayoutTests FLAKY_DOMStorageLayoutTests | 106 #define MAYBE_DOMStorageLayoutTests FLAKY_DOMStorageLayoutTests |
110 #define MAYBE_SessionStorageLayoutTests FLAKY_SessionStorageLayoutTests | 107 #define MAYBE_SessionStorageLayoutTests FLAKY_SessionStorageLayoutTests |
111 #else | 108 #else |
112 #define MAYBE_LocalStorageLayoutTests LocalStorageLayoutTests | |
113 #define MAYBE_DOMStorageLayoutTests DOMStorageLayoutTests | 109 #define MAYBE_DOMStorageLayoutTests DOMStorageLayoutTests |
114 #define MAYBE_SessionStorageLayoutTests SessionStorageLayoutTests | 110 #define MAYBE_SessionStorageLayoutTests SessionStorageLayoutTests |
115 #endif // defined(OS_WIN) | 111 #endif // defined(OS_WIN) |
116 | 112 |
117 | 113 |
118 TEST_F(DOMStorageTest, MAYBE_DOMStorageLayoutTests) { | 114 TEST_F(DOMStorageTest, MAYBE_DOMStorageLayoutTests) { |
119 InitializeForLayoutTest(test_dir_, FilePath(), false); | 115 InitializeForLayoutTest(test_dir_, FilePath(), false); |
120 AddResources(); | 116 AddResources(); |
121 RunTests(kTopLevelFiles); | 117 RunTests(kTopLevelFiles); |
122 } | 118 } |
123 | 119 |
124 | 120 |
125 TEST_F(DOMStorageTest, MAYBE_LocalStorageLayoutTests) { | 121 TEST_F(DOMStorageTest, FLAKY_LocalStorageLayoutTests) { |
126 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"), | 122 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"), |
127 false); | 123 false); |
128 AddResources(); | 124 AddResources(); |
129 RunTests(kNoEventsFiles); | 125 RunTests(kNoEventsFiles); |
130 RunTests(kEventsFiles); | 126 RunTests(kEventsFiles); |
131 RunTests(kLocalStorageFiles); | 127 RunTests(kLocalStorageFiles); |
132 } | 128 } |
133 | 129 |
134 TEST_F(DOMStorageTest, MAYBE_SessionStorageLayoutTests) { | 130 TEST_F(DOMStorageTest, MAYBE_SessionStorageLayoutTests) { |
135 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"), | 131 InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"), |
136 false); | 132 false); |
137 AddResources(); | 133 AddResources(); |
138 RunTests(kNoEventsFiles); | 134 RunTests(kNoEventsFiles); |
139 //RunTests(kEventsFiles); | 135 //RunTests(kEventsFiles); |
140 RunTests(kSessionStorageFiles); | 136 RunTests(kSessionStorageFiles); |
141 } | 137 } |
OLD | NEW |