Changeset 169367 in webkit
- Timestamp:
- May 26, 2014 9:52:36 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r169366 r169367 1 2014-05-26 Shivakumar JM <shiva.jm@samsung.com> 2 3 [EFL][WK2] Fix EWK2BackForwardListTest test fails. 4 https://bugs.webkit.org/show_bug.cgi?id=133171 5 6 Reviewed by Gyuyoung Kim. 7 8 Use local test html pages instead of EWK2UnitTestServer, call ewk_view_url_set() to load test html pages. 9 Since even after setting no_proxy="localhost,127.0.0.1", still test server was unable to load the test 10 html pages for ewk2_back_forward_list tests, so changed to use local html pages. 11 12 * UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp: 13 (TEST_F): 14 1 15 2014-05-26 Shivakumar JM <shiva.jm@samsung.com> 2 16 -
trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp
r159190 r169367 101 101 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_previous_item_get) 102 102 { 103 std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>(); 104 httpServer->run(serverCallbackNavigation); 105 106 WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1); 107 ASSERT_TRUE(loadUrlSync(url1)); 108 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 109 110 ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2))); 103 WKEinaSharedString url1 = environment->urlForResource("/Page1.html").data(); 104 ewk_view_url_set(webView(), url1); 105 ASSERT_TRUE(waitUntilTitleChangedTo(title1)); 106 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 107 108 ewk_view_url_set(webView(), environment->urlForResource("/Page2.html").data()); 109 ASSERT_TRUE(waitUntilTitleChangedTo(title2)); 111 110 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 112 111 … … 123 122 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_next_item_get) 124 123 { 125 std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>(); 126 httpServer->run(serverCallbackNavigation); 127 128 ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1))); 129 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 130 131 WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2); 132 ASSERT_TRUE(loadUrlSync(url2)); 124 ewk_view_url_set(webView(), environment->urlForResource("/Page1.html").data()); 125 ASSERT_TRUE(waitUntilTitleChangedTo(title1)); 126 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 127 128 WKEinaSharedString url2 = environment->urlForResource("/Page2.html").data(); 129 ewk_view_url_set(webView(), url2); 130 ASSERT_TRUE(waitUntilTitleChangedTo(title2)); 133 131 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 134 132 … … 149 147 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_item_at_index_get) 150 148 { 151 std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>(); 152 httpServer->run(serverCallbackNavigation); 153 154 WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1); 155 ASSERT_TRUE(loadUrlSync(url1)); 156 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 157 158 ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2))); 149 WKEinaSharedString url1 = environment->urlForResource("/Page1.html").data(); 150 ewk_view_url_set(webView(), url1); 151 ASSERT_TRUE(waitUntilTitleChangedTo(title1)); 152 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 153 154 ewk_view_url_set(webView(), environment->urlForResource("/Page2.html").data()); 155 ASSERT_TRUE(waitUntilTitleChangedTo(title2)); 159 156 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 160 157 … … 174 171 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_count) 175 172 { 176 std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>(); 177 httpServer->run(serverCallbackNavigation); 178 179 ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1))); 180 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 181 182 ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2))); 173 ewk_view_url_set(webView(), environment->urlForResource("/Page1.html").data()); 174 ASSERT_TRUE(waitUntilTitleChangedTo(title1)); 175 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 176 177 ewk_view_url_set(webView(), environment->urlForResource("/Page2.html").data()); 178 ASSERT_TRUE(waitUntilTitleChangedTo(title2)); 183 179 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 184 180 … … 191 187 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_n_back_items_copy) 192 188 { 193 std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();194 httpServer->run(serverCallbackNavigation);195 196 WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1);197 ASSERT_TRUE(loadUrlSync(url1)); 198 ASSERT_STREQ(title1, ewk_view_title_get(webView()));199 200 WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);201 ASSERT_ TRUE(loadUrlSync(url2));202 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 203 204 ASSERT_TRUE( loadUrlSync(urlFromTitle(httpServer.get(), title3)));189 WKEinaSharedString url1 = environment->urlForResource("/Page1.html").data(); 190 ewk_view_url_set(webView(), url1); 191 ASSERT_TRUE(waitUntilTitleChangedTo(title1)); 192 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 193 194 WKEinaSharedString url2 = environment->urlForResource("/Page2.html").data(); 195 ewk_view_url_set(webView(), url2); 196 ASSERT_TRUE(waitUntilTitleChangedTo(title2)); 197 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 198 199 ewk_view_url_set(webView(), environment->urlForResource("/Page3.html").data()); 200 ASSERT_TRUE(waitUntilTitleChangedTo(title3)); 205 201 ASSERT_STREQ(title3, ewk_view_title_get(webView())); 206 202 … … 228 224 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_n_forward_items_copy) 229 225 { 230 std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();231 httpServer->run(serverCallbackNavigation);232 233 ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1))); 234 ASSERT_STREQ(title1, ewk_view_title_get(webView()));235 236 WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);237 ASSERT_ TRUE(loadUrlSync(url2));238 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 239 240 WKEinaSharedString url3 = urlFromTitle(httpServer.get(), title3);241 ASSERT_TRUE( loadUrlSync(url3));226 ewk_view_url_set(webView(), environment->urlForResource("/Page1.html").data()); 227 ASSERT_TRUE(waitUntilTitleChangedTo(title1)); 228 ASSERT_STREQ(title1, ewk_view_title_get(webView())); 229 230 WKEinaSharedString url2 = environment->urlForResource("/Page2.html").data(); 231 ewk_view_url_set(webView(), url2); 232 ASSERT_TRUE(waitUntilTitleChangedTo(title2)); 233 ASSERT_STREQ(title2, ewk_view_title_get(webView())); 234 235 WKEinaSharedString url3 = environment->urlForResource("/Page3.html").data(); 236 ewk_view_url_set(webView(), url3); 237 ASSERT_TRUE(waitUntilTitleChangedTo(title3)); 242 238 ASSERT_STREQ(title3, ewk_view_title_get(webView())); 243 239
Note: See TracChangeset
for help on using the changeset viewer.