Changeset 163779 in webkit

Timestamp:

Feb 10, 2014 5:04:58 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Spelling unit tests should use ecore_main_loop_iterate()
​https://bugs.webkit.org/show_bug.cgi?id=127427

Patch by Lukasz Bialek <​l.bialek@samsung.com> on 2014-02-10
Reviewed by Gyuyoung Kim.

r148670 gets rid of EFL's idlers in a favor of timers to load languages.
ecore_main_loop_iterate() can be used now.

Add function that loads spellchecking languages and waits for loading
to be finished:

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

(EWK2UnitTest::EWK2UnitTestBase::waitForLanguageLoading):

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

Apply added function to tests that should wait for languages to be loaded:

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

(EWK2TextCheckerTest::resetCallbacksExecutionStats):
(TEST_F):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp (modified) (1 diff)
• UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h (modified) (1 diff)
• UIProcess/API/efl/tests/test_ewk2_text_checker.cpp (modified) (7 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-10  Lukasz Bialek  <l.bialek@samsung.com>
+
+        [EFL] Spelling unit tests should use ecore_main_loop_iterate()
+        https://bugs.webkit.org/show_bug.cgi?id=127427
+
+        Reviewed by Gyuyoung Kim.
+
+        r148670 gets rid of EFL's idlers in a favor of timers to load languages.
+        ecore_main_loop_iterate() can be used now.
+
+        Add function that loads spellchecking languages and waits for loading
+        to be finished:
+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
+        (EWK2UnitTest::EWK2UnitTestBase::waitForLanguageLoading):
+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h:
+
+        Apply added function to tests that should wait for languages to be loaded:
+        * UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:
+        (EWK2TextCheckerTest::resetCallbacksExecutionStats):
+        (TEST_F):
+
 2014-02-09  Carlos Garnacho  <carlosg@gnome.org>
 

trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp

@@ -236 +236 @@
 }
 
+Eina_List* EWK2UnitTestBase::waitUntilSpellingLanguagesLoaded(unsigned expectedLanguageCount, double timeoutValue)
+{
+    // Keep waiting until all languages has been loaded or leave afqter timeout.
+    // Languages are being loaded in the timer, we have to wait for them.
+    Eina_List* loadedLanguages = nullptr;
+    void* actual = nullptr;
+
+    CallbackDataExpectedValue<bool> data(true, timeoutValue);
+    while ((eina_list_count(loadedLanguages) != expectedLanguageCount) && !data.isDone()) {
+        if (loadedLanguages) {
+            // List has to be freed before acquiring new one.
+            actual = nullptr;
+            EINA_LIST_FREE(loadedLanguages, actual)
+                eina_stringshare_del(static_cast<const char*>(actual));
+        }
+
+        loadedLanguages = ewk_text_checker_spell_checking_languages_get();
+        ecore_main_loop_iterate();
+    }
+
+    return loadedLanguages;
+}
+
 void EWK2UnitTestBase::mouseClick(int x, int y, int button)
 {

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

@@ -52 +52 @@
     bool waitUntilURLChangedTo(const char* expectedURL, double timeoutSeconds = defaultTimeoutSeconds);
     bool waitUntilTrue(bool &flag, double timeoutSeconds = defaultTimeoutSeconds);
+    Eina_List* waitUntilSpellingLanguagesLoaded(unsigned expectedLanguageCount, double timeoutValue = defaultTimeoutSeconds);
 
     void mouseClick(int x, int y, int button = 1 /*Left*/);

trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp

@@ -43 +43 @@
 static const Evas_Object* defaultView = 0;
 static bool isSettingEnabled = false;
-static Ecore_Timer* timeoutTimer = 0;
 static double defaultTimeoutInSeconds = 0.5;
 
@@ -77 +76 @@
         callbacksExecutionStats.wordLearn = false;
         callbacksExecutionStats.wordIgnore = false;
-    }
-
-    /**
-     * Handle the timeout, it may happen for the asynchronous tests.
-     *
-     * @internal
-     *
-     * @return the ECORE_CALLBACK_CANCEL flag to delete the timer automatically
-     */
-    static Eina_Bool onTimeout(void*)
-    {
-        ecore_main_loop_quit();
-        return ECORE_CALLBACK_CANCEL;
     }
 
@@ -506 +492 @@
 {
     ewk_text_checker_continuous_spell_checking_enabled_set(false);
-    // The language is being loaded on the idler, wait for it.
-    timeoutTimer = ecore_timer_add(defaultTimeoutInSeconds, onTimeout, 0);
-    ecore_main_loop_begin();
-
-    Eina_List* loadedLanguages = ewk_text_checker_spell_checking_languages_get();
+
+    Eina_List* loadedLanguages = waitUntilSpellingLanguagesLoaded(1, defaultTimeoutInSeconds);
     // No dictionary is available/installed.
     if (!loadedLanguages)
@@ -523 +506 @@
     // Repeat the checking when continuous spell checking setting is on.
     ewk_text_checker_continuous_spell_checking_enabled_set(true);
-    timeoutTimer = ecore_timer_add(defaultTimeoutInSeconds, onTimeout, 0);
-    ecore_main_loop_begin();
-
-    loadedLanguages = ewk_text_checker_spell_checking_languages_get();
+
+    loadedLanguages = waitUntilSpellingLanguagesLoaded(1, defaultTimeoutInSeconds);
     if (!loadedLanguages)
         return;
@@ -665 +646 @@
     ewk_text_checker_spell_checking_languages_set(languages.toString().utf8().data());
 
-    // Languages are being loaded on the idler, wait for them.
-    timeoutTimer = ecore_timer_add(defaultTimeoutInSeconds, onTimeout, 0);
-    ecore_main_loop_begin();
-
     // Get the languages in use.
-    Eina_List* loadedLanguages = ewk_text_checker_spell_checking_languages_get();
+    Eina_List* loadedLanguages = waitUntilSpellingLanguagesLoaded(eina_list_count(availableLanguages), defaultTimeoutInSeconds);
     ASSERT_EQ(eina_list_count(loadedLanguages), eina_list_count(availableLanguages));
 
@@ -699 +676 @@
     ewk_text_checker_spell_checking_languages_set(0);
 
-    // Languages are being loaded on the idler, wait for them.
-    timeoutTimer = ecore_timer_add(defaultTimeoutInSeconds, onTimeout, 0);
-    ecore_main_loop_begin();
-
-    Eina_List* loadedLanguages = ewk_text_checker_spell_checking_languages_get();
+    Eina_List* loadedLanguages = waitUntilSpellingLanguagesLoaded(1, defaultTimeoutInSeconds);
     // No dictionary is available/installed or the SPELLCHECK macro is disabled.
     if (!loadedLanguages)
@@ -735 +708 @@
     ewk_text_checker_spell_checking_languages_set(languages.toString().utf8().data());
 
-    timeoutTimer = ecore_timer_add(defaultTimeoutInSeconds, onTimeout, 0);
-    ecore_main_loop_begin();
-
-    loadedLanguages = ewk_text_checker_spell_checking_languages_get();
+    loadedLanguages = waitUntilSpellingLanguagesLoaded(2, defaultTimeoutInSeconds);
     ASSERT_EQ(2, eina_list_count(loadedLanguages));