From d80f5a5ed7e28b09bc21f9ebfd4f36d2c45359d6 Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Fri, 2 Jun 2017 16:20:31 +0900 Subject: [PATCH] [UTC][widget_viewer_dali][Non-ACR][Modified UTCs by considering 3.0 sync] Change-Id: I6b034a3433f6bb276821e0b72c6d3f2caf11d50d --- .../tct-widget_viewer_dali-core_mobile.h | 4 +- .../tct-widget_viewer_dali-core_wearable.h | 4 +- .../utc-widget_viewer_dali.cpp | 105 +++++++++--------- 3 files changed, 55 insertions(+), 58 deletions(-) diff --git a/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_mobile.h b/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_mobile.h index 73bf552d0..e87fb0d4d 100755 --- a/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_mobile.h +++ b/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_mobile.h @@ -37,7 +37,7 @@ extern int UtcWidgetViewerDaliWidgetViewPauseWidgetN(void); extern int UtcWidgetViewerDaliWidgetViewResumeWidgetN(void); extern int UtcWidgetViewerDaliWidgetViewCancelTouchEventN(void); extern int UtcWidgetViewerDaliWidgetViewActivateFaultedWidgetN(void); -extern int UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN(void); +extern int UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP(void); extern int UtcWidgetViewerDaliWidgetViewWidgetDeletedSignalN(void); extern int UtcWidgetViewerDaliWidgetViewWidgetCreationAbortedSignalN(void); extern int UtcWidgetViewerDaliWidgetViewWidgetContentUpdatedSignalN(void); @@ -60,7 +60,7 @@ testcase tc_array[] = { {"UtcWidgetViewerDaliWidgetViewResumeWidgetN",UtcWidgetViewerDaliWidgetViewResumeWidgetN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewCancelTouchEventN",UtcWidgetViewerDaliWidgetViewCancelTouchEventN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewActivateFaultedWidgetN",UtcWidgetViewerDaliWidgetViewActivateFaultedWidgetN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, - {"UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN",UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, + {"UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP",UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewWidgetDeletedSignalN",UtcWidgetViewerDaliWidgetViewWidgetDeletedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewWidgetCreationAbortedSignalN",UtcWidgetViewerDaliWidgetViewWidgetCreationAbortedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewWidgetContentUpdatedSignalN",UtcWidgetViewerDaliWidgetViewWidgetContentUpdatedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, diff --git a/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_wearable.h b/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_wearable.h index 73bf552d0..e87fb0d4d 100755 --- a/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_wearable.h +++ b/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core_wearable.h @@ -37,7 +37,7 @@ extern int UtcWidgetViewerDaliWidgetViewPauseWidgetN(void); extern int UtcWidgetViewerDaliWidgetViewResumeWidgetN(void); extern int UtcWidgetViewerDaliWidgetViewCancelTouchEventN(void); extern int UtcWidgetViewerDaliWidgetViewActivateFaultedWidgetN(void); -extern int UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN(void); +extern int UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP(void); extern int UtcWidgetViewerDaliWidgetViewWidgetDeletedSignalN(void); extern int UtcWidgetViewerDaliWidgetViewWidgetCreationAbortedSignalN(void); extern int UtcWidgetViewerDaliWidgetViewWidgetContentUpdatedSignalN(void); @@ -60,7 +60,7 @@ testcase tc_array[] = { {"UtcWidgetViewerDaliWidgetViewResumeWidgetN",UtcWidgetViewerDaliWidgetViewResumeWidgetN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewCancelTouchEventN",UtcWidgetViewerDaliWidgetViewCancelTouchEventN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewActivateFaultedWidgetN",UtcWidgetViewerDaliWidgetViewActivateFaultedWidgetN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, - {"UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN",UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, + {"UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP",UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewWidgetDeletedSignalN",UtcWidgetViewerDaliWidgetViewWidgetDeletedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewWidgetCreationAbortedSignalN",UtcWidgetViewerDaliWidgetViewWidgetCreationAbortedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, {"UtcWidgetViewerDaliWidgetViewWidgetContentUpdatedSignalN",UtcWidgetViewerDaliWidgetViewWidgetContentUpdatedSignalN,utc_widget_viewer_dali_startup,utc_widget_viewer_dali_cleanup}, diff --git a/src/utc/widget_viewer_dali/utc-widget_viewer_dali.cpp b/src/utc/widget_viewer_dali/utc-widget_viewer_dali.cpp index 8423e156c..ad8b2c0bb 100755 --- a/src/utc/widget_viewer_dali/utc-widget_viewer_dali.cpp +++ b/src/utc/widget_viewer_dali/utc-widget_viewer_dali.cpp @@ -66,7 +66,7 @@ const std::string content = ""; WIDGET_VIEW_RESUME_WIDGET_N, WIDGET_VIEW_CANCEL_TOUCH_EVENT_N, WIDGET_VIEW_ACTIVATE_FAULTED_WIDGET_N, - WIDGET_VIEW_WIDGET_ADDED_SIGNAL_N, + WIDGET_VIEW_WIDGET_ADDED_SIGNAL_P, WIDGET_VIEW_WIDGET_DELETED_SIGNAL_N, WIDGET_VIEW_WIDGET_CREATION_ABORTED_SIGNAL_N, WIDGET_VIEW_WIDGET_CONTENT_UPDATED_SIGNAL_N, @@ -87,6 +87,10 @@ const std::string content = ""; ~TestApp() { + if( mWidgetView ) + { + mWidgetView.SetProperty( mWidgetView.GetPropertyIndex( "terminateWidget" ), true ); + } } void OnInit(Application& app) @@ -96,17 +100,18 @@ const std::string content = ""; ExcuteTest(); - if( mTestCase =! WIDGET_VIEW_WIDGET_ADDED_SIGNAL_N ) + if( mTestCase == WIDGET_VIEW_WIDGET_ADDED_SIGNAL_P ) { - mTimer = Timer::New( INTERVAL ); - mTimer.TickSignal().Connect( this, &TestApp::Tick ); - mTimer.Start(); + return; } + + mTimer = Timer::New( INTERVAL ); + mTimer.TickSignal().Connect( this, &TestApp::Tick ); + mTimer.Start(); } bool Tick() { - mTimer.Stop(); ValidateTest(); if( mAppId != NULL ) @@ -114,6 +119,7 @@ const std::string content = ""; free( mAppId ); } + mTimer.Stop(); mApplication.Quit(); return true; } @@ -167,8 +173,8 @@ const std::string content = ""; case WIDGET_VIEW_ACTIVATE_FAULTED_WIDGET_N: WidgetViewActivateFaultedWidgetN(); break; - case WIDGET_VIEW_WIDGET_ADDED_SIGNAL_N: - WidgetViewAddedSignalN(); + case WIDGET_VIEW_WIDGET_ADDED_SIGNAL_P: + WidgetViewAddedSignalP(); break; case WIDGET_VIEW_WIDGET_DELETED_SIGNAL_N: WidgetViewDeletedSignalN(); @@ -193,8 +199,6 @@ const std::string content = ""; switch ( mTestCase ) { case WIDGET_VIEW_ACTIVATE_FAULTED_WIDGET_N: - ValidateActivateFaultedWidget(); - break; case WIDGET_VIEW_WIDGET_DELETED_SIGNAL_N: case WIDGET_VIEW_WIDGET_CREATION_ABORTED_SIGNAL_N: case WIDGET_VIEW_WIDGET_CONTENT_UPDATED_SIGNAL_N: @@ -207,8 +211,6 @@ const std::string content = ""; void OnCallback( WidgetView::WidgetView widgetView ) { -LOG_E( "DALI WidgetView OnCallback====================\n" ); - mCallback = true; DaliLog::PrintPass(); mApplication.Quit(); @@ -271,33 +273,42 @@ LOG_E( "DALI WidgetView OnCallback====================\n" ); DALI_CHECK_FAIL( !mWidgetViewManager , "WidgetViewManager handle can be created."); // In near furture, NULL parameter will cause error, but not now - mWidgetView = mWidgetViewManager.AddWidget( widgetId, "", 0, 0, 0 ); - DALI_CHECK_FAIL( !mWidgetView , "WidgetView handle can be created."); + mWidgetView = mWidgetViewManager.AddWidget( widgetId, "", 10, 10, 0 ); + DALI_CHECK_FAIL( !mWidgetView , "WidgetView handle should be created."); DaliLog::PrintPass(); } - void WidgetViewNewP() + void AddWidget() { mWidgetViewManager = WidgetView::WidgetViewManager::New( mApplication, mAppId ); - DALI_CHECK_FAIL( !mWidgetViewManager , "WidgetViewManager handle can be created."); + DALI_CHECK_FAIL( !mWidgetViewManager , "WidgetViewManager handle should be created."); // AddWidget calls WidgetView::New internally. - mWidgetView = mWidgetViewManager.AddWidget( widgetId, "", 100, 0, 0 ); - DALI_CHECK_FAIL( !mWidgetView , "WidgetView handle can be created."); + mWidgetView = mWidgetViewManager.AddWidget( widgetId, "", 10, 10, 0 ); + DALI_CHECK_FAIL( !mWidgetView , "WidgetView handle should be created."); mWidgetView.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT ); mWidgetView.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT ); mWidgetView.SetBackgroundColor( Vector4(0.0f, 0.0f, 1.0f, 0.5f) ); Stage::GetCurrent().Add( mWidgetView ); + } + + void WidgetViewNewP() + { + // Widget service have to be initialized. WidgetViewManager::New() do it. + mWidgetViewManager = WidgetView::WidgetViewManager::New( mApplication, mAppId ); + + mWidgetView = Dali::WidgetView::WidgetView::New( widgetId, "", 10, 10, 0 ); + DALI_CHECK_FAIL( !mWidgetView , "WidgetView handle should be created."); DaliLog::PrintPass(); } void WidgetViewDownCastP() { - WidgetViewNewP(); + AddWidget(); BaseHandle handle( mWidgetView ); WidgetView::WidgetView view = WidgetView::WidgetView::DownCast( handle ); @@ -315,7 +326,7 @@ LOG_E( "DALI WidgetView OnCallback====================\n" ); void WidgetViewCopyConstructorP() { - WidgetViewNewP(); + AddWidget(); WidgetView::WidgetView view( mWidgetView ); DALI_CHECK_FAIL( !view , "WidgetView handle can be copied."); @@ -325,7 +336,7 @@ LOG_E( "DALI WidgetView OnCallback====================\n" ); void WidgetViewAssignmentP() { - WidgetViewNewP(); + AddWidget(); WidgetView::WidgetView view = mWidgetView; DALI_CHECK_FAIL( !view , "WidgetView handle can be copied."); @@ -380,76 +391,62 @@ LOG_E( "DALI WidgetView OnCallback====================\n" ); void WidgetViewActivateFaultedWidgetN() { - WidgetViewNewP(); - - bool check = false; - Property::Value value = mWidgetView.GetProperty( Dali::WidgetView::WidgetView::Property::WIDGET_STATE_FAULTED ); - DALI_CHECK_FAIL( !value.Get( check ) , "WIDGET_STATE_FAULTED error" ); - DALI_CHECK_FAIL( check , "Widget should be faulted" ); + AddWidget(); + mWidgetView.WidgetCreationAbortedSignal().Connect( this, &TestApp::OnCallback ); mWidgetView.ActivateFaultedWidget(); } - void ValidateActivateFaultedWidget() - { - bool check = false; - Property::Value value = mWidgetView.GetProperty( Dali::WidgetView::WidgetView::Property::WIDGET_STATE_FAULTED ); - DALI_CHECK_FAIL( !value.Get( check ) , "WIDGET_STATE_FAULTED error" ); - DALI_CHECK_FAIL( check , "ActivateFaultedWidget should not work" ); - DaliLog::PrintPass(); - } - - void WidgetViewAddedSignalN() + void WidgetViewAddedSignalP() { mWidgetViewManager = WidgetView::WidgetViewManager::New( mApplication, mAppId ); DALI_CHECK_FAIL( !mWidgetViewManager , "WidgetViewManager handle can be created."); // AddWidget calls WidgetView::New internally. mWidgetView = mWidgetViewManager.AddWidget( widgetId, "", 10, 10, 0 ); - DALI_CHECK_FAIL( !mWidgetView , "WidgetView handle can be created."); + DALI_CHECK_FAIL( !mWidgetView , "WidgetView handle can be created." ); - mWidgetView.WidgetAddedSignal().Connect(this, &TestApp::OnCallback); + mWidgetView.WidgetAddedSignal().Connect( this, &TestApp::OnCallback ); } void WidgetViewDeletedSignalN() { - WidgetViewNewP(); + AddWidget(); - mWidgetView.WidgetDeletedSignal().Connect(this, &TestApp::OnCallback); + mWidgetView.WidgetDeletedSignal().Connect( this, &TestApp::OnCallback ); } void WidgetViewCreationAbortedSignalN() { - WidgetViewNewP(); - mWidgetView.ActivateFaultedWidget(); + AddWidget(); - mWidgetView.WidgetCreationAbortedSignal().Connect(this, &TestApp::OnCallback); + mWidgetView.WidgetCreationAbortedSignal().Connect( this, &TestApp::OnCallback ); } void WidgetViewContentUpdatedSignalN() { - WidgetViewNewP(); + AddWidget(); - mWidgetView.WidgetContentUpdatedSignal().Connect(this, &TestApp::OnCallback); + mWidgetView.WidgetContentUpdatedSignal().Connect( this, &TestApp::OnCallback ); } void WidgetViewUpdatePeriodChangedSignalN() { - WidgetViewNewP(); + AddWidget(); - mWidgetView.WidgetUpdatePeriodChangedSignal().Connect(this, &TestApp::OnCallback); + mWidgetView.WidgetUpdatePeriodChangedSignal().Connect( this, &TestApp::OnCallback ); } void WidgetViewFaultedSignalN() { - WidgetViewNewP(); + AddWidget(); - mWidgetView.WidgetFaultedSignal().Connect(this, &TestApp::OnCallback); + mWidgetView.WidgetFaultedSignal().Connect( this, &TestApp::OnCallback ); } void ValidateSignalN() { - DALI_CHECK_FAIL( mCallback , "Signal error"); + DALI_CHECK_FAIL( mCallback , "Signal should not be emitted"); DaliLog::PrintPass(); } @@ -736,18 +733,18 @@ int UtcWidgetViewerDaliWidgetViewActivateFaultedWidgetN(void) } /** - * @testcase UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN + * @testcase UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP * @since_tizen 3.0 * @description checks for WidgetView::WidgetAddedSignal() functionality */ -int UtcWidgetViewerDaliWidgetViewWidgetAddedSignalN(void) +int UtcWidgetViewerDaliWidgetViewWidgetAddedSignalP(void) { DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); Application application = Application::New( &gArgc, &gArgv ); CHECK_GL; - TestApp testApp( application, WIDGET_VIEW_WIDGET_ADDED_SIGNAL_N); + TestApp testApp( application, WIDGET_VIEW_WIDGET_ADDED_SIGNAL_P); application.MainLoop(); return test_return_value; -- 2.34.1