Fix typo in function and variable names

Change-Id: I55cb92a1b44c0d2e136baf1caa897a4826346c7f
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/tests/src/test_util.cpp b/tests/src/test_util.cpp
index 08d46cd..44a7605 100644 (file)
--- a/tests/src/test_util.cpp
+++ b/tests/src/test_util.cpp
@@ -36,7 +36,7 @@ TtsTestUtility::TtsTestUtility()
        mScreenReaderOn = false;
        mUtteranceStarted = false;
        mUtteranceCompleted = false;
-       mErrorOccured = false;
+       mErrorOccurred = false;
        mUttId = -1;
 
        mPCMData = nullptr;
@@ -91,7 +91,7 @@ void TtsTestUtility::UtteranceCompletedCallback(tts_h tts, int utt_id, void *use
 void TtsTestUtility::ErrorCallback(tts_h tts, int utt_id, tts_error_e reason, void* user_data)
 {
        auto instance = reinterpret_cast<TtsTestUtility *>(user_data);
-       instance->mErrorOccured = true;
+       instance->mErrorOccurred = true;
 }
 
 void TtsTestUtility::TerminateCurrentEngine()
@@ -120,7 +120,7 @@ void TtsTestUtility::WaitUntilEngineTerminated(int duration)
                return !is_running;
        };
 
-       WaitCondtion(engineChcker, duration);
+       WaitCondition(engineChcker, duration);
 }
 
 bool TtsTestUtility::IsFeatureSupported()
@@ -195,7 +195,7 @@ bool TtsTestUtility::IsStateChanged(tts_state_e targetState, int duration)
                return target == instance->mCurrentState;
        }, this, targetState);
 
-       return WaitCondtion(stateChecker, duration);
+       return WaitCondition(stateChecker, duration);
 }
 
 bool TtsTestUtility::IsServiceStateChanged(tts_service_state_e targetState, int duration)
@@ -204,7 +204,7 @@ bool TtsTestUtility::IsServiceStateChanged(tts_service_state_e targetState, int
                return target == instance->mCurrentServiceState;
        }, this, targetState);
 
-       return WaitCondtion(stateChecker, duration);
+       return WaitCondition(stateChecker, duration);
 }
 
 bool TtsTestUtility::IsScreenReaderOn(int duration)
@@ -213,7 +213,7 @@ bool TtsTestUtility::IsScreenReaderOn(int duration)
                return instance->mScreenReaderOn;
        }, this);
 
-       return WaitCondtion(screenReaderChecker, duration);
+       return WaitCondition(screenReaderChecker, duration);
 }
 
 bool TtsTestUtility::IsUtteranceStarted(int duration)
@@ -222,7 +222,7 @@ bool TtsTestUtility::IsUtteranceStarted(int duration)
                return instance->mUtteranceStarted;
        }, this);
 
-       return WaitCondtion(utteranceChecker, duration);
+       return WaitCondition(utteranceChecker, duration);
 }
 
 bool TtsTestUtility::IsUtteranceCompleted(int duration)
@@ -231,16 +231,16 @@ bool TtsTestUtility::IsUtteranceCompleted(int duration)
                return instance->mUtteranceCompleted;
        }, this);
 
-       return WaitCondtion(utteranceChecker, duration);
+       return WaitCondition(utteranceChecker, duration);
 }
 
 bool TtsTestUtility::IsErrorOccurring(int duration)
 {
        auto errorChecker = std::bind([](TtsTestUtility *instance) {
-               return instance->mErrorOccured;
+               return instance->mErrorOccurred;
        }, this);
 
-       return WaitCondtion(errorChecker, duration);
+       return WaitCondition(errorChecker, duration);
 }
 
 bool TtsTestUtility::Prepare()
@@ -285,7 +285,7 @@ bool TtsTestUtility::Stop()
        return IsStateChanged(TTS_STATE_READY, 5);
 }
 
-bool TtsTestUtility::WaitCondtion(std::function<bool(void)> checker, int duration)
+bool TtsTestUtility::WaitCondition(std::function<bool(void)> checker, int duration)
 {
        auto mainLoopQuitTimer = ecore_timer_add(static_cast<double>(duration), [](void *data) -> Eina_Bool {
                ecore_main_loop_quit();
@@ -293,8 +293,8 @@ bool TtsTestUtility::WaitCondtion(std::function<bool(void)> checker, int duratio
        }, nullptr);
 
        auto checkerTimer = ecore_timer_add(0.0, [](void *data) -> Eina_Bool {
-               auto &checker = *reinterpret_cast<std::function<bool()> *>(data);
-               if (false == checker()) {
+               auto &IsConditionSatisfied = *reinterpret_cast<std::function<bool()> *>(data);
+               if (false == IsConditionSatisfied()) {
                        return EINA_TRUE;
                }
 

diff --git a/tests/src/test_util.h b/tests/src/test_util.h
index 41a5d91..6d73060 100644 (file)
--- a/tests/src/test_util.h
+++ b/tests/src/test_util.h
@@ -69,14 +69,14 @@ public:
        bool mScreenReaderOn;
        bool mUtteranceStarted;
        bool mUtteranceCompleted;
-       bool mErrorOccured;
+       bool mErrorOccurred;
        int mUttId;
 
        char* mPCMData;
        size_t mPCMSize;
 
 private:
-       static bool WaitCondtion(std::function<bool(void)> checker, int duration);
+       static bool WaitCondition(std::function<bool(void)> checker, int duration);
 };