From: Wonnam Jang Date: Wed, 10 Oct 2018 00:08:18 +0000 (+0900) Subject: [ITC/UTC][stt,tts,voice-control,multi-assistant][Non-ACR][Remove elemantary dependency] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faf5c9b47ce84e8395b01d5767b7132d35e896fb;p=test%2Ftct%2Fnative%2Fapi.git [ITC/UTC][stt,tts,voice-control,multi-assistant][Non-ACR][Remove elemantary dependency] Change-Id: I7f35051246bcbe30332519e484ffa3aab928167b Signed-off-by: Wonnam Jang --- diff --git a/packaging/utc/core-multi-assistant-tests.spec b/packaging/utc/core-multi-assistant-tests.spec index 3b40e2707..7a0a3b65b 100755 --- a/packaging/utc/core-multi-assistant-tests.spec +++ b/packaging/utc/core-multi-assistant-tests.spec @@ -9,7 +9,6 @@ License: Apache License, Version 2.0 Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(%{MODULE_LIBNAME}) BuildRequires: pkgconfig(ecore) -BuildRequires: pkgconfig(elementary) BuildRequires: cmake BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(dlog) diff --git a/src/itc/stt/ITs-stt.c b/src/itc/stt/ITs-stt.c index 9131e8f0f..3726bef49 100755 --- a/src/itc/stt/ITs-stt.c +++ b/src/itc/stt/ITs-stt.c @@ -15,7 +15,6 @@ // #include "ITs-stt-common.h" #include -#include /** @addtogroup itc-stt * @ingroup itc @@ -44,7 +43,6 @@ bool g_CallBackHit = false; */ void ITs_stt_startup(void) { - elm_init(0, NULL); struct stat stBuff; if ( stat(ERR_LOG, &stBuff) == 0 ) { @@ -135,7 +133,6 @@ void ITs_stt_cleanup(void) FPRINTF("[Line : %d][%s] Unable to destroy SST handle in postcondition, error returned = %s\\n", __LINE__, API_NAMESPACE, SttGetError(nRet)); } } - elm_shutdown(); return; } diff --git a/src/itc/stt/ITs-stte.c b/src/itc/stt/ITs-stte.c index 06e5ab4cd..812661901 100755 --- a/src/itc/stt/ITs-stte.c +++ b/src/itc/stt/ITs-stte.c @@ -15,7 +15,6 @@ // #include "ITs-stt-common.h" #include -#include /** @addtogroup itc-stte * @ingroup itc @@ -149,7 +148,6 @@ void ITs_stte_startup(void) #if DEBUG FPRINTF("[Line : %d][%s] TEST SUIT start-up: ITs_STTE_p\\n", __LINE__, API_NAMESPACE); #endif - elm_init(0, NULL); g_bFeatureSupported = true; g_bFeatureMismatch = false; g_bFeatureNotSupported = false; @@ -200,7 +198,6 @@ void ITs_stte_cleanup(void) FPRINTF("[Line : %d][%s] TEST SUIT clean-up: ITs_STTE_p\\n", __LINE__, API_NAMESPACE); #endif - elm_shutdown(); return; } //& purpose stte main function diff --git a/src/itc/tts/ITs-tts.c b/src/itc/tts/ITs-tts.c index 15d4666ff..2b236f367 100755 --- a/src/itc/tts/ITs-tts.c +++ b/src/itc/tts/ITs-tts.c @@ -15,7 +15,6 @@ // #include "ITs-tts-common.h" #include -#include /** @addtogroup itc-tts * @ingroup itc @@ -33,7 +32,6 @@ bool g_CallBackHit = false; */ void ITs_tts_startup(void) { - elm_init(0,NULL); g_bTtsCreation = false; struct stat stBuff; @@ -100,7 +98,6 @@ void ITs_tts_cleanup(void) } } - elm_shutdown(); sleep(SLEEP_TIME); return; } diff --git a/src/itc/tts/ITs-ttse.c b/src/itc/tts/ITs-ttse.c index c4ad9b5d2..b52d60b88 100755 --- a/src/itc/tts/ITs-ttse.c +++ b/src/itc/tts/ITs-ttse.c @@ -15,7 +15,6 @@ // #include "ITs-tts-common.h" #include -#include /** @addtogroup itc-tts * @ingroup itc @@ -128,7 +127,6 @@ void ITs_ttse_startup(void) #if DEBUG FPRINTF("[Line: %d][%s] TEST SUIT start-up: ITs_TTS_p\\n", __LINE__, API_NAMESPACE); #endif - elm_init(0,NULL); g_bFeatureSupported = true; g_bFeatureMismatch = false; g_bFeatureNotSupported = false; @@ -172,7 +170,6 @@ void ITs_ttse_cleanup(void) #if DEBUG FPRINTF("[Line: %d][%s] TEST SUIT clean-up: ITs_TTSE_p\\n", __LINE__, API_NAMESPACE); #endif - elm_shutdown(); return; } diff --git a/src/itc/voice-control/ITs-voice-control-common.h b/src/itc/voice-control/ITs-voice-control-common.h index a5aa328a6..b597ac60e 100755 --- a/src/itc/voice-control/ITs-voice-control-common.h +++ b/src/itc/voice-control/ITs-voice-control-common.h @@ -23,7 +23,6 @@ #include #include #include -#include /** @addtogroup itc-voice-control diff --git a/src/itc/voice-control/ITs-voice-control-engine.c b/src/itc/voice-control/ITs-voice-control-engine.c index 24c298f80..4a9d0b6de 100755 --- a/src/itc/voice-control/ITs-voice-control-engine.c +++ b/src/itc/voice-control/ITs-voice-control-engine.c @@ -19,7 +19,6 @@ #include #include #include -#include #include @@ -235,7 +234,6 @@ int VceStartMain() } } - elm_init(0, NULL); g_bIsVcFeatureSupported = TCTCheckSystemInfoFeatureSupported(MICROPHONEFEATURE, API_NAMESPACE) && TCTCheckSystemInfoFeatureSupported(SPEECHCONTROLFEATURE, API_NAMESPACE); transfer_arg(&nArgs, &pszArgv); @@ -277,7 +275,6 @@ int VceStartMain() */ void ITs_voice_control_engine_cleanup(void) { - elm_shutdown(); return; } diff --git a/src/itc/voice-control/ITs-voice-control.c b/src/itc/voice-control/ITs-voice-control.c index 09ec61175..08a16b871 100755 --- a/src/itc/voice-control/ITs-voice-control.c +++ b/src/itc/voice-control/ITs-voice-control.c @@ -181,7 +181,6 @@ void ITs_voice_control_startup(void) remove(ERR_LOG); } - elm_init(0, NULL); g_bVoiceControlStartup = false; g_bIsVcFeatureSupported = TCTCheckSystemInfoFeatureSupported(MICROPHONEFEATURE, API_NAMESPACE) && TCTCheckSystemInfoFeatureSupported(SPEECHCONTROLFEATURE, API_NAMESPACE); @@ -214,7 +213,6 @@ void ITs_voice_control_cleanup(void) vc_deinitialize(); } - elm_shutdown(); return; } diff --git a/src/utc/multi-assistant/utc-multi-assistant.c b/src/utc/multi-assistant/utc-multi-assistant.c index fa3dc7b38..f585102bc 100755 --- a/src/utc/multi-assistant/utc-multi-assistant.c +++ b/src/utc/multi-assistant/utc-multi-assistant.c @@ -16,9 +16,9 @@ #include "assert.h" #include #include -#include #include #include +#include static int g_ma_init = false; static ma_state_e g_ma_state = MA_STATE_NONE; @@ -61,7 +61,6 @@ void utc_multi_assistant_startup(void) } } // } - elm_init(0, NULL); g_ma_init = false; if (true == g_ma_supported) { @@ -89,7 +88,6 @@ void utc_multi_assistant_startup(void) void utc_multi_assistant_cleanup(void) { int ret = MA_ERROR_NONE; - elm_shutdown(); if (true == g_ma_supported) { ret = ma_unset_state_changed_cb(); diff --git a/src/utc/stt/utc-stt.c b/src/utc/stt/utc-stt.c index 4fc1f1fdb..dd4df79e2 100755 --- a/src/utc/stt/utc-stt.c +++ b/src/utc/stt/utc-stt.c @@ -18,8 +18,8 @@ #include #include #include -#include #include +#include #include "assert.h" @@ -42,7 +42,6 @@ void utc_stt_startup(void) int ret = -1; g_stt_supported = false; system_info_get_platform_bool("http://tizen.org/feature/speech.recognition", &g_stt_supported); - elm_init(0,NULL); g_current_state = 0; g_error = TIZEN_ERROR_NONE; @@ -71,7 +70,6 @@ void utc_stt_cleanup(void) } g_stt = NULL; - elm_shutdown(); } static bool __stt_supported_engine_cb(stt_h stt, const char* engine_id, const char* engine_name, void* user_data) diff --git a/src/utc/stt/utc-stte.c b/src/utc/stt/utc-stte.c index dcb9c3a00..be8eb5543 100755 --- a/src/utc/stt/utc-stte.c +++ b/src/utc/stt/utc-stte.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include "assert.h" @@ -150,7 +149,6 @@ void utc_stte_startup(void) { /* start of TC */ system_info_get_platform_bool("http://tizen.org/feature/speech.recognition", &g_is_supported); - elm_init(0,NULL); if (g_is_supported == false) return; @@ -185,7 +183,6 @@ void utc_stte_startup(void) void utc_stte_cleanup(void) { /* end of TC */ - elm_shutdown(); } /** diff --git a/src/utc/tts/utc-tts.c b/src/utc/tts/utc-tts.c index 3628ed8da..286390526 100755 --- a/src/utc/tts/utc-tts.c +++ b/src/utc/tts/utc-tts.c @@ -17,7 +17,6 @@ #include #include #include -#include //& set: TTS @@ -50,7 +49,6 @@ static char *g_text = "Speech Synthesis is the artificial production of human sp void utc_tts_startup(void) { system_info_get_platform_bool("http://tizen.org/feature/speech.synthesis",&g_supported); - elm_init(0,NULL); g_current_state = 0; /* start of TC */ int ret = TTS_ERROR_NONE; @@ -71,7 +69,6 @@ void utc_tts_startup(void) void utc_tts_cleanup(void) { /* end of TC */ - elm_shutdown(); free (g_language); g_language = NULL; diff --git a/src/utc/tts/utc-ttse.c b/src/utc/tts/utc-ttse.c index 67102b844..2d858d64e 100755 --- a/src/utc/tts/utc-ttse.c +++ b/src/utc/tts/utc-ttse.c @@ -17,7 +17,6 @@ #include #include #include -#include #include @@ -120,7 +119,6 @@ static int engine_get_private_data(const char* key, char** data) void utc_ttse_startup(void) { system_info_get_platform_bool("http://tizen.org/feature/speech.synthesis", &g_is_supported); - elm_init(0,NULL); /* start of TC */ if (g_is_supported == false) @@ -155,7 +153,6 @@ void utc_ttse_startup(void) void utc_ttse_cleanup(void) { /* end of TC */ - elm_shutdown(); } /** diff --git a/src/utc/voice-control/utc-voice-control-engine.c b/src/utc/voice-control/utc-voice-control-engine.c index f2943fabd..1840e861a 100644 --- a/src/utc/voice-control/utc-voice-control-engine.c +++ b/src/utc/voice-control/utc-voice-control-engine.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include "assert.h" @@ -182,7 +181,6 @@ void utc_vce_startup(void) } } } - elm_init(0, NULL); transfer_arg(&g_argc, &g_argv); @@ -216,7 +214,6 @@ void utc_vce_startup(void) void utc_vce_cleanup(void) { /* end of TC */ - elm_shutdown(); } /** diff --git a/src/utc/voice-control/utc-voice-control.c b/src/utc/voice-control/utc-voice-control.c index b125304c1..2e754c345 100755 --- a/src/utc/voice-control/utc-voice-control.c +++ b/src/utc/voice-control/utc-voice-control.c @@ -16,10 +16,10 @@ #include "assert.h" #include #include -#include #include #include #include +#include static int g_vc_init = false; static vc_state_e g_vc_state = VC_STATE_NONE; @@ -74,7 +74,6 @@ void utc_voice_control_startup(void) } } } - elm_init(0, NULL); g_vc_init = false; if (true == g_vc_supported) { @@ -102,7 +101,6 @@ void utc_voice_control_startup(void) void utc_voice_control_cleanup(void) { int ret = VC_ERROR_NONE; - elm_shutdown(); if (true == g_vc_supported) { ret = vc_unset_state_changed_cb();