Merge "Changed 'virtual' function override declarations to 'override' in automated...

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

diff --git a/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp b/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp
index cb7de36..b02764a 100644 (file)
--- a/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp
@@ -20,10 +20,6 @@
 #include <dali/internal/system/linux/dali-ecore-x.h>
 #include <dali-test-suite-utils.h>
 
-namespace Dali
-{
-class DragAndDropDetector : public BaseHandle {}; // For UtcDaliWindowGetDragAndDropDetectorN
-}
 
 using namespace Dali;
 
@@ -142,54 +138,6 @@ int UtcDaliWindowNewN(void)
   END_TEST;
 }
 
-int UtcDaliWindowShowIndicatorN(void)
-{
-  Dali::Window window;
-  try
-  {
-    window.ShowIndicator(Dali::Window::VISIBLE);
-    DALI_TEST_CHECK( false ); // Should not reach here!
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliWindowSetIndicatorBgOpacityN(void)
-{
-  Dali::Window window;
-  try
-  {
-    window.SetIndicatorBgOpacity(Dali::Window::OPAQUE);
-    DALI_TEST_CHECK( false ); // Should not reach here!
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliWindowRotateIndicatorN(void)
-{
-  Dali::Window window;
-  try
-  {
-    window.RotateIndicator(Dali::Window::PORTRAIT);
-    DALI_TEST_CHECK( false ); // Should not reach here!
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
 int UtcDaliWindowSetClassN(void)
 {
   Dali::Window window;
@@ -318,22 +266,6 @@ int UtcDaliWindowGetPreferredOrientationN(void)
   END_TEST;
 }
 
-int UtcDaliWindowGetDragAndDropDetectorN(void)
-{
-  Dali::Window window;
-  try
-  {
-    DragAndDropDetector detector = window.GetDragAndDropDetector();
-    DALI_TEST_CHECK( !detector ); // Should not reach here!
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
 int UtcDaliWindowGetNativeHandleN(void)
 {
   Dali::Window window;
@@ -382,45 +314,12 @@ int UtcDaliWindowIsFocusAcceptableN(void)
   END_TEST;
 }
 
-int UtcDaliWindowIndicatorVisibilityChangedSignalN(void)
-{
-  Dali::Window window;
-  try
-  {
-    window.IndicatorVisibilityChangedSignal();
-    DALI_TEST_CHECK( false ); // Should not reach here!
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliWindowFocusChangedSignalN(void)
-{
-  Dali::Window window;
-  try
-  {
-    window.FocusChangedSignal();
-    DALI_TEST_CHECK( false ); // Should not reach here!
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliWindowPartialUpdate(void)
+int UtcDaliWindowFocusChangeSignalN(void)
 {
   Dali::Window window;
   try
   {
-    std::vector<Rect<int>> damagedAreas;
-    DevelWindow::SetDamagedAreas(window, damagedAreas);
+    window.FocusChangeSignal();
     DALI_TEST_CHECK( false ); // Should not reach here!
   }
   catch( ... )