Merge "Fix crash issue when we decode some bmp" into devel/master

[platform/core/uifw/dali-adaptor.git] / automated-tests / src / dali-adaptor-internal / utc-Dali-Lifecycle-Controller.cpp

diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-Lifecycle-Controller.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-Lifecycle-Controller.cpp
index 3a2c8d2..87fc6a5 100644 (file)
--- a/automated-tests/src/dali-adaptor-internal/utc-Dali-Lifecycle-Controller.cpp
+++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-Lifecycle-Controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <stdlib.h>
-#include <iostream>
-#include <dali.h>
 #include <dali-test-suite-utils.h>
+#include <dali.h>
 #include <dali/devel-api/adaptor-framework/lifecycle-controller.h>
+#include <stdlib.h>
+#include <iostream>
 
 #include <dali/internal/adaptor/common/lifecycle-controller-impl.h>
 
@@ -38,13 +38,11 @@ void utc_dali_lifecycle_controller_cleanup(void)
 
 namespace
 {
-
-bool g_OnInitCalled = false;
-bool g_OnTerminateCalled = false;
-bool g_OnPauseCalled = false;
-bool g_OnResumeCalled = false;
-bool g_OnResetCalled = false;
-bool g_OnResizeCalled = false;
+bool g_OnInitCalled            = false;
+bool g_OnTerminateCalled       = false;
+bool g_OnPauseCalled           = false;
+bool g_OnResumeCalled          = false;
+bool g_OnResetCalled           = false;
 bool g_OnLanguageChangedCalled = false;
 
 void OnInit()
@@ -72,11 +70,6 @@ void OnReset()
   g_OnResetCalled = true;
 }
 
-void OnResize()
-{
-  g_OnResizeCalled = true;
-}
-
 void OnLanguageChanged()
 {
   g_OnLanguageChangedCalled = true;
@@ -89,131 +82,121 @@ int UtcDaliLifecycleControllerGet(void)
   // Attempt to retrieve LifecycleController before creating application
   LifecycleController lifecycleController;
   lifecycleController = LifecycleController::Get();
-  DALI_TEST_CHECK( !lifecycleController );
+  DALI_TEST_CHECK(!lifecycleController);
 
-  Application application = Application::New();
+  TestApplication app;
+  Application     application = Application::New();
 
   lifecycleController = LifecycleController::Get();
-  DALI_TEST_CHECK( lifecycleController );
+  DALI_TEST_CHECK(lifecycleController);
 
   END_TEST;
 }
 
 int UtcDaliLifecycleControllerSignalInit(void)
 {
-  Application application = Application::New();
+  TestApplication app;
+  Application     application = Application::New();
 
-  DALI_TEST_CHECK( !g_OnInitCalled );
+  DALI_TEST_CHECK(!g_OnInitCalled);
 
   LifecycleController lifecycleController = LifecycleController::Get();
 
-  lifecycleController.InitSignal().Connect( &OnInit );
+  lifecycleController.InitSignal().Connect(&OnInit);
 
-  GetImplementation( lifecycleController ).OnInit( application );
+  GetImplementation(lifecycleController).OnInit(application);
 
-  DALI_TEST_CHECK( g_OnInitCalled );
+  DALI_TEST_CHECK(g_OnInitCalled);
 
   END_TEST;
 }
 
 int UtcDaliLifecycleControllerSignalTerminate(void)
 {
-  Application application = Application::New();
+  TestApplication app;
+  Application     application = Application::New();
 
-  DALI_TEST_CHECK( !g_OnTerminateCalled );
+  DALI_TEST_CHECK(!g_OnTerminateCalled);
 
   LifecycleController lifecycleController = LifecycleController::Get();
 
-  lifecycleController.TerminateSignal().Connect( &OnTerminate );
+  lifecycleController.TerminateSignal().Connect(&OnTerminate);
 
-  GetImplementation( lifecycleController ).OnTerminate( application );
+  GetImplementation(lifecycleController).OnTerminate(application);
 
-  DALI_TEST_CHECK( g_OnTerminateCalled );
+  DALI_TEST_CHECK(g_OnTerminateCalled);
 
   END_TEST;
 }
 
 int UtcDaliLifecycleControllerSignalPause(void)
 {
-  Application application = Application::New();
+  TestApplication app;
+  Application     application = Application::New();
 
-  DALI_TEST_CHECK( !g_OnPauseCalled );
+  DALI_TEST_CHECK(!g_OnPauseCalled);
 
   LifecycleController lifecycleController = LifecycleController::Get();
 
-  lifecycleController.PauseSignal().Connect( &OnPause );
+  lifecycleController.PauseSignal().Connect(&OnPause);
 
-  GetImplementation( lifecycleController ).OnPause( application );
+  GetImplementation(lifecycleController).OnPause(application);
 
-  DALI_TEST_CHECK( g_OnPauseCalled );
+  DALI_TEST_CHECK(g_OnPauseCalled);
 
   END_TEST;
 }
 
 int UtcDaliLifecycleControllerSignalResume(void)
 {
-  Application application = Application::New();
+  TestApplication app;
+  Application     application = Application::New();
 
-  DALI_TEST_CHECK( !g_OnResumeCalled );
+  DALI_TEST_CHECK(!g_OnResumeCalled);
 
   LifecycleController lifecycleController = LifecycleController::Get();
 
-  lifecycleController.ResumeSignal().Connect( &OnResume );
+  lifecycleController.ResumeSignal().Connect(&OnResume);
 
-  GetImplementation( lifecycleController ).OnResume( application );
+  GetImplementation(lifecycleController).OnResume(application);
 
-  DALI_TEST_CHECK( g_OnResumeCalled );
+  DALI_TEST_CHECK(g_OnResumeCalled);
 
   END_TEST;
 }
 
 int UtcDaliLifecycleControllerSignalReset(void)
 {
-  Application application = Application::New();
-
-  DALI_TEST_CHECK( !g_OnResetCalled );
-
-  LifecycleController lifecycleController = LifecycleController::Get();
-
-  lifecycleController.ResetSignal().Connect( &OnReset );
-
-  GetImplementation( lifecycleController ).OnReset( application );
-
-  DALI_TEST_CHECK( g_OnResetCalled );
-
-  END_TEST;
-}
-
-int UtcDaliLifecycleControllerSignalResize(void)
-{
-  Application application = Application::New();
+  TestApplication app;
+  Application     application = Application::New();
 
-  DALI_TEST_CHECK( !g_OnResizeCalled );
+  DALI_TEST_CHECK(!g_OnResetCalled);
 
   LifecycleController lifecycleController = LifecycleController::Get();
 
-  lifecycleController.ResizeSignal().Connect( &OnResize );
+  lifecycleController.ResetSignal().Connect(&OnReset);
 
-  GetImplementation( lifecycleController ).OnResize( application );
+  GetImplementation(lifecycleController).OnReset(application);
 
-  DALI_TEST_CHECK( g_OnResizeCalled );
+  DALI_TEST_CHECK(g_OnResetCalled);
 
   END_TEST;
 }
 
 int UtcDaliLifecycleControllerSignalLanguageChanged(void)
 {
-  Application application = Application::New();
+  TestApplication app;
+  Application     application = Application::New();
 
-  DALI_TEST_CHECK( !g_OnLanguageChangedCalled );
+  DALI_TEST_CHECK(!g_OnLanguageChangedCalled);
 
   LifecycleController lifecycleController = LifecycleController::Get();
 
-  lifecycleController.LanguageChangedSignal().Connect( &OnLanguageChanged );
+  lifecycleController.LanguageChangedSignal().Connect(&OnLanguageChanged);
 
-  GetImplementation( lifecycleController ).OnLanguageChanged( application );
+  GetImplementation(lifecycleController).OnLanguageChanged(application);
 
-  DALI_TEST_CHECK( g_OnLanguageChangedCalled );
+  DALI_TEST_CHECK(g_OnLanguageChangedCalled);
 
   END_TEST;
 }