Changeset 129111 in webkit


Ignore:
Timestamp:
Sep 20, 2012 3:27:23 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][WK2] Check timeout on waitUntilLoadFinished() and waitUntilTitleChangedTo().
​https://bugs.webkit.org/show_bug.cgi?id=97081

Patch by Byungwoo Lee <​bw80.lee@samsung.com> on 2012-09-20
Reviewed by Gyuyoung Kim.

Add assertion to check timeout on waitUntilLoadFinished() and
waitUntilTitleChangedTo().
Set the default timeout for the functions as 10 seconds.

  • UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h:

(EWK2UnitTestBase):

  • UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp:

(TEST_F):

  • UIProcess/API/efl/tests/test_ewk2_context.cpp:

(TEST_F):

  • UIProcess/API/efl/tests/test_ewk2_view.cpp:

(TEST_F):

Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r129101 r129111  
     12012-09-20  Byungwoo Lee  <bw80.lee@samsung.com>
     2
     3        [EFL][WK2] Check timeout on waitUntilLoadFinished() and waitUntilTitleChangedTo().
     4        https://bugs.webkit.org/show_bug.cgi?id=97081
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        Add assertion to check timeout on waitUntilLoadFinished() and
     9        waitUntilTitleChangedTo().
     10        Set the default timeout for the functions as 10 seconds.
     11
     12        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h:
     13        (EWK2UnitTestBase):
     14        * UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp:
     15        (TEST_F):
     16        * UIProcess/API/efl/tests/test_ewk2_context.cpp:
     17        (TEST_F):
     18        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
     19        (TEST_F):
     20
    1212012-09-20  Jinwoo Song  <jinwoo7.song@samsung.com>
    222

  • trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h

    r129099 r129111  
    4242
    4343    void loadUrlSync(const char* url);
    44     bool waitUntilLoadFinished(double timeoutSeconds = -1);
    45     bool waitUntilTitleChangedTo(const char* expectedTitle, double timeoutSeconds = -1);
    46     bool waitUntilURIChangedTo(const char* expectedURI, double timeoutSeconds = -1);
     44
     45    static const double defaultTimeoutSeconds = 10.0;
     46    bool waitUntilLoadFinished(double timeoutSeconds = defaultTimeoutSeconds);
     47    bool waitUntilTitleChangedTo(const char* expectedTitle, double timeoutSeconds = defaultTimeoutSeconds);
     48    bool waitUntilURIChangedTo(const char* expectedURI, double timeoutSeconds = defaultTimeoutSeconds);
     49
    4750    void mouseClick(int x, int y);
    4851

  • trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp

    r126571 r129111  
    137137    // Go back to Page1.
    138138    ewk_view_back(webView());
    139     waitUntilTitleChangedTo(title1);
     139    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
    140140
    141141    Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
    … …  
    246246    // Go back to Page1.
    247247    ewk_view_back(webView());
    248     waitUntilTitleChangedTo(title2);
     248    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
    249249    ewk_view_back(webView());
    250     waitUntilTitleChangedTo(title1);
     250    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
    251251
    252252    Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());

  • trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp

    r125893 r129111  
    139139    // Make sure we don't receive vibration event.
    140140    loadVibrationHTMLString(webView(), "[5000]", false, &data);
    141     waitUntilTitleChangedTo("Loaded");
     141    ASSERT_TRUE(waitUntilTitleChangedTo("Loaded"));
    142142    ASSERT_STREQ(ewk_view_title_get(webView()), "Loaded");
    143143    ASSERT_FALSE(data.didReceiveVibrateCallback);
    … …  
    145145    // Make sure we don't receive cancel vibration event.
    146146    loadVibrationHTMLString(webView(), "0", false, &data);
    147     waitUntilTitleChangedTo("Loaded");
     147    ASSERT_TRUE(waitUntilTitleChangedTo("Loaded"));
    148148    ASSERT_STREQ(ewk_view_title_get(webView()), "Loaded");
    149149    ASSERT_FALSE(data.didReceiveCancelVibrationCallback);

  • trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp

    r129099 r129111  
    7575{
    7676    ewk_view_html_string_load(webView(), "<html><head><title>Foo</title></head><body>Bar</body></html>", 0, 0);
    77     waitUntilTitleChangedTo("Foo");
     77    ASSERT_TRUE(waitUntilTitleChangedTo("Foo"));
    7878    ASSERT_STREQ(ewk_view_title_get(webView()), "Foo");
    7979    ewk_view_html_string_load(webView(), "<html><head><title>Bar</title></head><body>Foo</body></html>", 0, 0);
    80     waitUntilTitleChangedTo("Bar");
     80    ASSERT_TRUE(waitUntilTitleChangedTo("Bar"));
    8181    ASSERT_STREQ(ewk_view_title_get(webView()), "Bar");
    8282}
    … …  
    119119    // Go back to Page1
    120120    ewk_view_back(webView());
    121     waitUntilTitleChangedTo("Page1");
     121    ASSERT_TRUE(waitUntilTitleChangedTo("Page1"));
    122122    ASSERT_STREQ(ewk_view_title_get(webView()), "Page1");
    123123    ASSERT_FALSE(ewk_view_back_possible(webView()));
    … …  
    126126    // Go forward to Page2
    127127    ewk_view_forward(webView());
    128     waitUntilTitleChangedTo("Page2");
     128    ASSERT_TRUE(waitUntilTitleChangedTo("Page2"));
    129129    ASSERT_STREQ(ewk_view_title_get(webView()), "Page2");
    130130    ASSERT_TRUE(ewk_view_back_possible(webView()));
    … …  
    255255
    256256    ewk_view_html_string_load(webView(), selectHTML, "file:///", 0);
    257     waitUntilLoadFinished();
     257    ASSERT_TRUE(waitUntilLoadFinished());
    258258    mouseClick(30, 20);
    259     waitUntilTitleChangedTo("first");
     259    ASSERT_TRUE(waitUntilTitleChangedTo("first"));
    260260
    261261    EXPECT_TRUE(ewk_view_popup_menu_close(webView()));
    … …  
    277277
    278278    ewk_view_html_string_load(webView(), buttonHTML, "file:///", 0);
    279     waitUntilTitleChangedTo("30"); // button of default theme has 30px as padding (15 to -16)
     279    EXPECT_TRUE(waitUntilTitleChangedTo("30")); // button of default theme has 30px as padding (15 to -16)
    280280
    281281    ewk_view_theme_set(webView(), environment->pathForResource("it_does_not_exist.edj").data());
    282282    ewk_view_html_string_load(webView(), buttonHTML, "file:///", 0);
    283     waitUntilTitleChangedTo("30"); // the result should be same as default theme
     283    EXPECT_TRUE(waitUntilTitleChangedTo("30")); // the result should be same as default theme
    284284
    285285    ewk_view_theme_set(webView(), environment->pathForResource("empty_theme.edj").data());
    286286    ewk_view_html_string_load(webView(), buttonHTML, "file:///", 0);
    287     waitUntilTitleChangedTo("30"); // the result should be same as default theme
     287    EXPECT_TRUE(waitUntilTitleChangedTo("30")); // the result should be same as default theme
    288288
    289289    ewk_view_theme_set(webView(), environment->pathForResource("big_button_theme.edj").data());
    290290    ewk_view_html_string_load(webView(), buttonHTML, "file:///", 0);
    291     waitUntilTitleChangedTo("299"); // button of big button theme has 299px as padding (150 to -150)
     291    EXPECT_TRUE(waitUntilTitleChangedTo("299")); // button of big button theme has 299px as padding (150 to -150)
    292292}
    293293
    … …  
    335335
    336336    ewk_view_html_string_load(webView(), fullscreenHTML, "file:///", 0);
    337     waitUntilLoadFinished();
     337    ASSERT_TRUE(waitUntilLoadFinished());
    338338    mouseClick(50, 50);
    339     waitUntilTitleChangedTo("fullscreen entered");
     339    ASSERT_TRUE(waitUntilTitleChangedTo("fullscreen entered"));
    340340    ASSERT_TRUE(fullScreenCallbackCalled);
    341341    checkFullScreenProperty(webView(), true);
    … …  
    356356
    357357    ewk_view_html_string_load(webView(), fullscreenHTML, "file:///", 0);
    358     waitUntilLoadFinished();
     358    ASSERT_TRUE(waitUntilLoadFinished());
    359359    mouseClick(50, 50);
    360     waitUntilTitleChangedTo("fullscreen exited");
     360    ASSERT_TRUE(waitUntilTitleChangedTo("fullscreen exited"));
    361361    ASSERT_TRUE(fullScreenCallbackCalled);
    362362    checkFullScreenProperty(webView(), false);
    … …  
    371371    mouseClick(50, 50);
    372372    testUrl = testUrl + '#';
    373     ASSERT_TRUE(waitUntilURIChangedTo(testUrl.utf8().data(), 10));
     373    ASSERT_TRUE(waitUntilURIChangedTo(testUrl.utf8().data()));
    374374}
    375375
    … …  
    380380        "<body onload=\"document.title='Title after changed';\"></body>";
    381381    ewk_view_html_string_load(webView(), titleChangedHTML, 0, 0);
    382     waitUntilTitleChangedTo("Title after changed");
     382    EXPECT_TRUE(waitUntilTitleChangedTo("Title after changed"));
    383383    EXPECT_STREQ(ewk_view_title_get(webView()), "Title after changed");
    384384
    … …  
    387387        "<body onload=\"document.title='';\"></body>";
    388388    ewk_view_html_string_load(webView(), titleChangedHTML, 0, 0);
    389     waitUntilTitleChangedTo("");
     389    EXPECT_TRUE(waitUntilTitleChangedTo(""));
    390390    EXPECT_STREQ(ewk_view_title_get(webView()), "");
    391391
    … …  
    394394        "<body onload=\"document.title=null;\"></body>";
    395395    ewk_view_html_string_load(webView(), titleChangedHTML, 0, 0);
    396     waitUntilTitleChangedTo("");
     396    EXPECT_TRUE(waitUntilTitleChangedTo(""));
    397397    EXPECT_STREQ(ewk_view_title_get(webView()), "");
    398398}
    … …  
    430430    alertCallbackData.called = false;
    431431    ewk_view_html_string_load(webView(), alertHTML, 0, 0);
    432     waitUntilLoadFinished();
     432    EXPECT_TRUE(waitUntilLoadFinished());
    433433    EXPECT_EQ(alertCallbackData.called, true);
    434434
    … …  
    437437    alertCallbackData.called = false;
    438438    ewk_view_html_string_load(webView(), alertHTML, 0, 0);
    439     waitUntilLoadFinished();
     439    EXPECT_TRUE(waitUntilLoadFinished());
    440440    EXPECT_EQ(alertCallbackData.called, true);
    441441
    … …  
    444444    alertCallbackData.called = false;
    445445    ewk_view_html_string_load(webView(), alertHTML, 0, 0);
    446     waitUntilLoadFinished();
     446    EXPECT_TRUE(waitUntilLoadFinished());
    447447    EXPECT_EQ(alertCallbackData.called, true);
    448448
    … …  
    451451    alertCallbackData.called = false;
    452452    ewk_view_html_string_load(webView(), alertHTML, 0, 0);
    453     waitUntilLoadFinished();
     453    EXPECT_TRUE(waitUntilLoadFinished());
    454454    EXPECT_EQ(alertCallbackData.called, true);
    455455
    … …  
    458458    alertCallbackData.called = false;
    459459    ewk_view_html_string_load(webView(), alertHTML, 0, 0);
    460     waitUntilLoadFinished();
     460    EXPECT_TRUE(waitUntilLoadFinished());
    461461    EXPECT_EQ(alertCallbackData.called, false);
    462462}
    … …  
    478478    confirmCallbackData.called = false;
    479479    ewk_view_html_string_load(webView(), confirmHTML, 0, 0);
    480     waitUntilTitleChangedTo("true");
     480    EXPECT_TRUE(waitUntilTitleChangedTo("true"));
    481481    EXPECT_STREQ(ewk_view_title_get(webView()), "true");
    482482    EXPECT_EQ(confirmCallbackData.called, true);
    … …  
    486486    confirmCallbackData.called = false;
    487487    ewk_view_html_string_load(webView(), confirmHTML, 0, 0);
    488     waitUntilTitleChangedTo("false");
     488    EXPECT_TRUE(waitUntilTitleChangedTo("false"));
    489489    EXPECT_STREQ(ewk_view_title_get(webView()), "false");
    490490    EXPECT_EQ(confirmCallbackData.called, true);
    … …  
    495495    confirmCallbackData.called = false;
    496496    ewk_view_html_string_load(webView(), confirmHTML, 0, 0);
    497     waitUntilTitleChangedTo("true");
     497    EXPECT_TRUE(waitUntilTitleChangedTo("true"));
    498498    EXPECT_STREQ(ewk_view_title_get(webView()), "true");
    499499    EXPECT_EQ(confirmCallbackData.called, true);
    … …  
    504504    confirmCallbackData.called = false;
    505505    ewk_view_html_string_load(webView(), confirmHTML, 0, 0);
    506     waitUntilTitleChangedTo("true");
     506    EXPECT_TRUE(waitUntilTitleChangedTo("true"));
    507507    EXPECT_STREQ(ewk_view_title_get(webView()), "true");
    508508    EXPECT_EQ(confirmCallbackData.called, true);
    … …  
    513513    confirmCallbackData.called = false;
    514514    ewk_view_html_string_load(webView(), confirmHTML, 0, 0);
    515     waitUntilTitleChangedTo("true");
     515    EXPECT_TRUE(waitUntilTitleChangedTo("true"));
    516516    EXPECT_STREQ(ewk_view_title_get(webView()), "true");
    517517    EXPECT_EQ(confirmCallbackData.called, true);
    … …  
    521521    confirmCallbackData.called = false;
    522522    ewk_view_html_string_load(webView(), confirmHTML, 0, 0);
    523     waitUntilTitleChangedTo("false");
     523    EXPECT_TRUE(waitUntilTitleChangedTo("false"));
    524524    EXPECT_STREQ(ewk_view_title_get(webView()), "false");
    525525    EXPECT_EQ(confirmCallbackData.called, false);
    … …  
    551551    promptCallbackData.called = false;
    552552    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    553     waitUntilTitleChangedTo(promptResult);
     553    EXPECT_TRUE(waitUntilTitleChangedTo(promptResult));
    554554    EXPECT_STREQ(ewk_view_title_get(webView()), promptResult);
    555555    EXPECT_EQ(promptCallbackData.called, true);
    … …  
    561561    promptCallbackData.called = false;
    562562    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    563     waitUntilTitleChangedTo(promptResult);
     563    EXPECT_TRUE(waitUntilTitleChangedTo(promptResult));
    564564    EXPECT_STREQ(ewk_view_title_get(webView()), promptResult);
    565565    EXPECT_EQ(promptCallbackData.called, true);
    … …  
    571571    promptCallbackData.called = false;
    572572    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    573     waitUntilTitleChangedTo(promptResult);
     573    EXPECT_TRUE(waitUntilTitleChangedTo(promptResult));
    574574    EXPECT_STREQ(ewk_view_title_get(webView()), promptResult);
    575575    EXPECT_EQ(promptCallbackData.called, true);
    … …  
    581581    promptCallbackData.called = false;
    582582    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    583     waitUntilTitleChangedTo(promptResult);
     583    EXPECT_TRUE(waitUntilTitleChangedTo(promptResult));
    584584    EXPECT_STREQ(ewk_view_title_get(webView()), promptResult);
    585585    EXPECT_EQ(promptCallbackData.called, true);
    … …  
    591591    promptCallbackData.called = false;
    592592    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    593     waitUntilTitleChangedTo(promptResult);
     593    EXPECT_TRUE(waitUntilTitleChangedTo(promptResult));
    594594    EXPECT_STREQ(ewk_view_title_get(webView()), promptResult);
    595595    EXPECT_EQ(promptCallbackData.called, true);
    … …  
    604604    promptCallbackData.called = false;
    605605    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    606     waitUntilTitleChangedTo("");
     606    EXPECT_TRUE(waitUntilTitleChangedTo(""));
    607607    EXPECT_STREQ(ewk_view_title_get(webView()), "");
    608608    EXPECT_EQ(promptCallbackData.called, true);
    … …  
    613613    promptCallbackData.called = false;
    614614    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    615     waitUntilTitleChangedTo("null");
     615    EXPECT_TRUE(waitUntilTitleChangedTo("null"));
    616616    EXPECT_STREQ(ewk_view_title_get(webView()), "null");
    617617    EXPECT_EQ(promptCallbackData.called, true);
    … …  
    621621    promptCallbackData.called = false;
    622622    ewk_view_html_string_load(webView(), promptHTML, 0, 0);
    623     waitUntilTitleChangedTo("null");
     623    EXPECT_TRUE(waitUntilTitleChangedTo("null"));
    624624    EXPECT_STREQ(ewk_view_title_get(webView()), "null");
    625625    EXPECT_EQ(promptCallbackData.called, false);
Note: See TracChangeset for help on using the changeset viewer.