Revert "[3.0] Updated test cases for increased coverage" 01/83201/1
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 11:25:00 +0000 (20:25 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 11:25:14 +0000 (20:25 +0900)
This reverts commit c0508fc89ac338af75eaa11a8253ad1cf959ceb8.

Change-Id: I36d2ca38ec80489288641b19375f7e1db63f8db4

17 files changed:
automated-tests/execute.sh
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.h [new file with mode: 0644]
automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp
automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp

index bc108fa..64e27ee 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEMP=`getopt -o dhsSm --long debug,help,serial,tct,modules -n 'execute.sh' -- "$@"`
+TEMP=`getopt -o hsSm --long help,serial,tct,modules -n 'execute.sh' -- "$@"`
 
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 
@@ -9,9 +9,8 @@ eval set -- "$TEMP"
 
 function usage
 {
-    echo -e "Usage: execute.sh [-d][-s|-S|-r] [module|testcase]"
+    echo -e "Usage: execute.sh [-s|-S|-r] [module|testcase]"
     echo -e "       execute.sh\t\tExecute test cases from all modules in parallel"
-    echo -e "       execute.sh -d <testcase>\tDebug testcase"
     echo -e "       execute.sh [module]\tExecute test cases from the given module in parallel"
     echo -e "       execute.sh -s [module]\t\tExecute test cases in serial using Testkit-Lite"
     echo -e "       execute.sh -S [module]\t\tExecute test cases in serial"
@@ -22,11 +21,9 @@ function usage
 opt_tct=0
 opt_serial=""
 opt_modules=0
-opt_debug=0
 while true ; do
     case "$1" in
         -h|--help)     usage ;;
-        -d|--debug)    opt_debug=1 ; shift ;;
         -s|--tct)      opt_tct=1 ; shift ;;
         -S|--serial)   opt_serial="-s" ; shift ;;
         -m|--modules)  opt_modules=1 ; shift ;;
@@ -130,22 +127,16 @@ else
         summary_end
 
     else
-        # First argument is not an executable. Is it a test case name?
-        # Try executing each executable with the test case name until success/known failure
+       # First argument is not an executable. Is it a test case name?
+       # Try executing each executable with the test case name until success/known failure
         for mod in $modules
         do
             output=`build/src/$mod/tct-$mod-core $1`
             ret=$?
             if [ $ret -ne 6 ] ; then
-                if [ $opt_debug -ne 0 ] ; then
-                    if [ $ret -eq 0 ] ; then
-                        gdb --args build/src/$mod/tct-$mod-core $1
-                    fi
-                else
-                    echo $output
-                    if [ $ret -eq 0 ] ; then echo -e "\nPassed" ; fi
-                fi
-                exit $ret
+               echo $output
+               if [ $ret -eq 0 ] ; then echo -e "\nPassed" ; fi
+               exit $ret
             fi
         done
         echo $1 not found
index 1a3490b..873c8d2 100644 (file)
@@ -87,10 +87,8 @@ DummyControlImplOverride::DummyControlImplOverride()
 : DummyControlImpl(),
   initializeCalled(false),
   activatedCalled(false),
-  onAccTouchedCalled(false),
-  onAccValueChangeCalled(false),
-  themeChangeCalled(false),
-  fontChangeCalled(false),
+  themeChangeCalled( false ),
+  fontChangeCalled( false ),
   pinchCalled(false),
   panCalled(false),
   tapCalled(false),
@@ -115,12 +113,6 @@ DummyControlImplOverride::~DummyControlImplOverride() { }
 
 void DummyControlImplOverride::OnInitialize() { initializeCalled = true; }
 bool DummyControlImplOverride::OnAccessibilityActivated() { activatedCalled = true; return true; }
-bool DummyControlImplOverride::OnAccessibilityTouch(const TouchEvent& touchEvent) { onAccTouchedCalled = true; return true; }
-bool DummyControlImplOverride::OnAccessibilityValueChange( bool isIncrease )
-{
-  onAccValueChangeCalled = true; return true;
-}
-
 void DummyControlImplOverride::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
 {
   themeChangeCalled = change == StyleChange::THEME_CHANGE;
index 496786e..0538199 100644 (file)
@@ -103,9 +103,6 @@ private: // From Internal::Control
 
   virtual void OnInitialize();
   virtual bool OnAccessibilityActivated();
-  virtual bool OnAccessibilityTouch( const TouchEvent& touchEvent );
-  virtual bool OnAccessibilityValueChange( bool isIncrease );
-
   virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
   virtual void OnPinch(const PinchGesture& pinch);
   virtual void OnPan(const PanGesture& pan);
@@ -131,8 +128,6 @@ public:
 
   bool initializeCalled;
   bool activatedCalled;
-  bool onAccTouchedCalled;
-  bool onAccValueChangeCalled;
   bool themeChangeCalled;
   bool fontChangeCalled;
   bool pinchCalled;
index 286f733..5820806 100644 (file)
  *
  */
 
+#include "toolkit-accessibility-adaptor.h"
+
+#include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
-#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
 #include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
-#include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
 
 namespace Dali
 {
@@ -48,13 +48,6 @@ public:
 
   void MockSetReadPosition( Vector2& position );
 
-  void SetEnabled(bool enabled)
-  {
-    mIsEnabled = enabled;
-  }
-
-  void SendPanGesture( const Dali::Integration::PanGestureEvent& panEvent );
-
 public:
 
   bool IsEnabled() const;
@@ -63,17 +56,16 @@ public:
 
   Vector2 GetReadPosition() const;
 
-  bool HandleActionNextEvent(bool);
-  bool HandleActionPreviousEvent(bool);
+  bool HandleActionNextEvent();
+  bool HandleActionPreviousEvent();
   bool HandleActionActivateEvent();
   bool HandleActionReadEvent(unsigned int x, unsigned int y, bool allowReadAgain);
-  bool HandleActionReadNextEvent(bool);
-  bool HandleActionReadPreviousEvent(bool);
+  bool HandleActionReadNextEvent();
+  bool HandleActionReadPreviousEvent();
   bool HandleActionUpEvent();
   bool HandleActionDownEvent();
   bool HandleActionClearFocusEvent();
-  bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp);
-  bool HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp);
+  bool HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp);
   bool HandleActionBackEvent();
   bool HandleActionEnableEvent();
   bool HandleActionDisableEvent();
@@ -92,6 +84,8 @@ public:
   bool HandleActionReadPauseResumeEvent();
   bool HandleActionStartStopEvent();
 
+public: // Signals
+
 private:
 
   bool mIsEnabled;
@@ -139,11 +133,6 @@ bool AccessibilityAdaptor::IsEnabled() const
   return mIsEnabled;
 }
 
-void AccessibilityAdaptor::SendPanGesture( const Integration::PanGestureEvent& panEvent )
-{
-  mGestureHandler->HandlePanGesture( panEvent );
-}
-
 void AccessibilityAdaptor::SetActionHandler(Dali::AccessibilityActionHandler& handler)
 {
   mActionHandler = &handler;
@@ -154,7 +143,7 @@ void AccessibilityAdaptor::SetGestureHandler(Dali::AccessibilityGestureHandler&
   mGestureHandler = &handler;
 }
 
-bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionNextEvent()
 {
   if( mActionHandler )
   {
@@ -163,7 +152,7 @@ bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback)
   return false;
 }
 
-bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionPreviousEvent()
 {
   if( mActionHandler )
   {
@@ -190,7 +179,7 @@ bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y,
   return false;
 }
 
-bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionReadNextEvent()
 {
   if( mActionHandler )
   {
@@ -199,7 +188,7 @@ bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback)
   return false;
 }
 
-bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionReadPreviousEvent()
 {
   if( mActionHandler )
   {
@@ -235,7 +224,7 @@ bool AccessibilityAdaptor::HandleActionClearFocusEvent()
   return false;
 }
 
-bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp)
 {
   if( mActionHandler )
   {
@@ -246,17 +235,6 @@ bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsi
   return false;
 }
 
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
-{
-  if( mActionHandler )
-  {
-    Dali::TouchEvent touchEvent;
-    touchEvent.points.push_back( point );
-    return mActionHandler->AccessibilityActionTouch( touchEvent );
-  }
-  return false;
-}
-
 bool AccessibilityAdaptor::HandleActionBackEvent()
 {
   if( mActionHandler )
@@ -441,6 +419,13 @@ AccessibilityAdaptor::~AccessibilityAdaptor()
 {
 }
 
+// Mock setup:
+
+void AccessibilityAdaptor::MockSetReadPosition( Vector2& position )
+{
+  Internal::Adaptor::GetImplementation(*this).MockSetReadPosition( position );
+}
+
 // Methods:
 
 Vector2 AccessibilityAdaptor::GetReadPosition() const
@@ -450,7 +435,8 @@ Vector2 AccessibilityAdaptor::GetReadPosition() const
 
 bool AccessibilityAdaptor::IsEnabled() const
 {
-  return Internal::Adaptor::GetImplementation(*this).IsEnabled();
+  //return Internal::Adaptor::GetImplementation(*this).IsEnabled();
+  return false;
 }
 
 void AccessibilityAdaptor::SetActionHandler(AccessibilityActionHandler& handler)
@@ -463,14 +449,14 @@ void AccessibilityAdaptor::SetGestureHandler(AccessibilityGestureHandler& handle
   Internal::Adaptor::GetImplementation(*this).SetGestureHandler(handler);
 }
 
-bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionNextEvent()
 {
-  return Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent(allowEndFeedback);
+  return Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent();
 }
 
-bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionPreviousEvent()
 {
-  return Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent(allowEndFeedback);
+  return Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent();
 }
 
 bool AccessibilityAdaptor::HandleActionActivateEvent()
@@ -483,14 +469,14 @@ bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y,
   return Internal::Adaptor::GetImplementation(*this).HandleActionReadEvent( x, y, allowReadAgain );
 }
 
-bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionReadNextEvent()
 {
-  return Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent(allowEndFeedback);
+  return Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent();
 }
 
-bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback)
+bool AccessibilityAdaptor::HandleActionReadPreviousEvent()
 {
-  return Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent(allowEndFeedback);
+  return Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent();
 }
 
 bool AccessibilityAdaptor::HandleActionUpEvent()
@@ -508,16 +494,11 @@ bool AccessibilityAdaptor::HandleActionClearFocusEvent()
   return Internal::Adaptor::GetImplementation(*this).HandleActionClearFocusEvent();
 }
 
-bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp)
 {
   return Internal::Adaptor::GetImplementation(*this).HandleActionScrollEvent(point, timeStamp);
 }
 
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
-{
-  return Internal::Adaptor::GetImplementation(*this).HandleActionTouchEvent(point, timeStamp);
-}
-
 bool AccessibilityAdaptor::HandleActionBackEvent()
 {
   return Internal::Adaptor::GetImplementation(*this).HandleActionBackEvent();
@@ -609,29 +590,3 @@ AccessibilityAdaptor::AccessibilityAdaptor( Internal::Adaptor::AccessibilityAdap
 }
 
 } // namespace Dali
-
-
-namespace Test
-{
-namespace AccessibilityAdaptor
-{
-
-// Mock setup:
-
-void MockSetReadPosition( Dali::AccessibilityAdaptor adaptor, Dali::Vector2& position )
-{
-  Dali::Internal::Adaptor::GetImplementation(adaptor).MockSetReadPosition( position );
-}
-
-void SetEnabled( Dali::AccessibilityAdaptor adaptor, bool enabled )
-{
-  Dali::Internal::Adaptor::GetImplementation(adaptor).SetEnabled(enabled);
-}
-
-void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::Integration::PanGestureEvent& panEvent )
-{
-  Dali::Internal::Adaptor::GetImplementation(adaptor).SendPanGesture( panEvent );
-}
-
-} // namespace AccessibilityAdaptor
-} // namespace Test
index 744f971..2975c33 100644 (file)
@@ -1,8 +1,11 @@
-#ifndef __DALI_TEST_TOOLKIT_ACCESSIBILITY_ADAPTOR_H__
-#define __DALI_TEST_TOOLKIT_ACCESSIBILITY_ADAPTOR_H__
+// Prevent normal accessibility adaptor declaration from loading
+#define __DALI_ACCESSIBILITY_ADAPTOR_H__
+
+#ifndef __DALI_TOOLKIT_ACCESSIBILITY_ADAPTOR_H__
+#define __DALI_TOOLKIT_ACCESSIBILITY_ADAPTOR_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
+#include <string>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/events/touch-point.h>
 
-namespace Test
+namespace Dali
+{
+namespace Internal
+{
+namespace Adaptor
 {
-namespace AccessibilityAdaptor
+class AccessibilityAdaptor;
+}
+}
+class AccessibilityActionHandler;
+class AccessibilityGestureHandler;
+class TouchPoint;
+
+/**
+ * This creates a stubbed AccessibilityAdaptor so that internal Toolkit Adaptor calls work.
+ */
+class AccessibilityAdaptor : public BaseHandle
 {
+public: // Construction & Destruction
+  AccessibilityAdaptor();
+  ~AccessibilityAdaptor();
+
+public: // Mock object setup.
+
+  void MockSetReadPosition( Vector2& position );
+
+public: // Getters
+
+  static AccessibilityAdaptor Get();
+
+  Vector2 GetReadPosition() const;
+  bool IsEnabled() const;
+  void SetActionHandler(AccessibilityActionHandler& handler);
+  void SetGestureHandler(AccessibilityGestureHandler& handler);
+
+  bool HandleActionNextEvent();
+  bool HandleActionPreviousEvent();
+  bool HandleActionActivateEvent();
+  bool HandleActionReadEvent(unsigned int x, unsigned int y, bool allowReadAgain);
+  bool HandleActionReadNextEvent();
+  bool HandleActionReadPreviousEvent();
+  bool HandleActionUpEvent();
+  bool HandleActionDownEvent();
+  bool HandleActionClearFocusEvent();
+  bool HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp);
+  bool HandleActionBackEvent();
+  void HandleActionEnableEvent();
+  void HandleActionDisableEvent();
+  bool HandleActionScrollUpEvent();
+  bool HandleActionScrollDownEvent();
+  bool HandleActionPageLeftEvent();
+  bool HandleActionPageRightEvent();
+  bool HandleActionPageUpEvent();
+  bool HandleActionPageDownEvent();
+  bool HandleActionMoveToFirstEvent();
+  bool HandleActionMoveToLastEvent();
+  bool HandleActionReadFromTopEvent();
+  bool HandleActionReadFromNextEvent();
+  bool HandleActionZoomEvent();
+  bool HandleActionReadIndicatorInformationEvent();
+  bool HandleActionReadPauseResumeEvent();
+  bool HandleActionStartStopEvent();
 
-void MockSetReadPosition( Dali::AccessibilityAdaptor adaptor, Dali::Vector2& position );
-void SetEnabled( Dali::AccessibilityAdaptor adaptor, bool enabled);
-void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::Integration::PanGestureEvent& panEvent );
+  AccessibilityAdaptor( Internal::Adaptor::AccessibilityAdaptor* adaptor );
+};
 
-} // namespace AccessibilityAdaptor
-} // namespace Test
+} // namespace Dali
 
-#endif //
+#endif // __DALI_TOOLKIT_ACCESSIBILITY_ADAPTOR_H__
index 7200f0f..6da3d47 100644 (file)
@@ -1,3 +1,5 @@
+#include "toolkit-tts-player.h"
+
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
@@ -16,8 +18,8 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/dali.h>
-
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
 {
@@ -26,76 +28,11 @@ TtsPlayer::TtsPlayer()
 {
 }
 
-namespace Internal
-{
-namespace Adaptor
-{
-
-class TtsPlayer : public BaseObject
-{
-public:
-  TtsPlayer()
-  {
-  }
-
-  void Play(const std::string& text)
-  {
-  }
-
-  void Stop()
-  {
-  }
-
-  void Pause()
-  {
-  }
-
-  void Resume()
-  {
-  }
-
-  Dali::TtsPlayer::State GetState()
-  {
-    return Dali::TtsPlayer::READY;
-  }
-
-  Dali::TtsPlayer::StateChangedSignalType& StateChangedSignal()
-  {
-    return mStateChangedSignal;
-  }
-private:
-  Dali::TtsPlayer::StateChangedSignalType mStateChangedSignal;
-};
-
-
-inline TtsPlayer& GetImplementation(Dali::TtsPlayer& player)
-{
-  DALI_ASSERT_ALWAYS( player && "TtsPlayer handle is empty" );
-  BaseObject& handle = player.GetBaseObject();
-  return static_cast<Internal::Adaptor::TtsPlayer&>(handle);
-}
-
-inline const TtsPlayer& GetImplementation(const Dali::TtsPlayer& player)
-{
-  DALI_ASSERT_ALWAYS( player && "TtsPlayer handle is empty" );
-  const BaseObject& handle = player.GetBaseObject();
-  return static_cast<const Internal::Adaptor::TtsPlayer&>(handle);
-}
-
-} // Adaptor
-} // Internal
-
-static IntrusivePtr<Internal::Adaptor::TtsPlayer> ttsSingleton = NULL;
-
 TtsPlayer TtsPlayer::Get(Dali::TtsPlayer::Mode mode)
 {
-  if( ! ttsSingleton )
-  {
-    ttsSingleton.Reset( new Dali::Internal::Adaptor::TtsPlayer() );
-  }
-  TtsPlayer playerHandle(ttsSingleton.Get());
+  TtsPlayer ttsPlayer;
 
-  return playerHandle;
+  return ttsPlayer;
 }
 
 TtsPlayer::~TtsPlayer()
@@ -140,12 +77,7 @@ TtsPlayer::State TtsPlayer::GetState()
 
 TtsPlayer::StateChangedSignalType& TtsPlayer::StateChangedSignal()
 {
-  return Internal::Adaptor::GetImplementation(*this).StateChangedSignal();
-}
-
-TtsPlayer::TtsPlayer( Internal::Adaptor::TtsPlayer* player )
-: BaseHandle( player )
-{
+  return mStateChangedSignal; // GetImplementation(*this).StateChangedSignal();
 }
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.h
new file mode 100644 (file)
index 0000000..269039e
--- /dev/null
@@ -0,0 +1,82 @@
+#ifndef __DALI_TOOLKIT_TTS_PLAYER_H__
+#define __DALI_TOOLKIT_TTS_PLAYER_H__
+
+/*
+ * Copyright (c) 2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/dali-signal.h>
+
+namespace Dali
+{
+
+namespace Internal DALI_INTERNAL
+{
+namespace Adaptor
+{
+class TtsPlayer;
+}
+}
+
+class DALI_IMPORT_API TtsPlayer : public BaseHandle
+{
+public:
+
+  enum Mode
+  {
+    DEFAULT = 0,        ///< Default mode for normal application
+    NOTIFICATION,       ///< Notification mode
+    SCREEN_READER,      ///< Screen reader mode
+    MODE_NUM
+  };
+
+  enum State
+  {
+    UNAVAILABLE = 0,    ///< Player is not available
+    READY,              ///< Player is ready to play
+    PLAYING,            ///< Player is playing
+    PAUSED              ///< Player is paused
+  };
+
+  typedef Signal< void ( const Dali::TtsPlayer::State, const Dali::TtsPlayer::State ) > StateChangedSignalType;
+
+  TtsPlayer();
+  static TtsPlayer Get(Dali::TtsPlayer::Mode mode = Dali::TtsPlayer::DEFAULT);
+  ~TtsPlayer();
+
+  TtsPlayer(const TtsPlayer& handle);
+  TtsPlayer& operator=(const TtsPlayer& rhs);
+  void Play(const std::string& text);
+  void Stop();
+  void Pause();
+  void Resume();
+  State GetState();
+  Dali::TtsPlayer::StateChangedSignalType& StateChangedSignal();
+
+public:
+
+  // explicit DALI_INTERNAL TtsPlayer( Internal::Adaptor::TtsPlayer* ttsPlayer );
+
+private:
+
+  StateChangedSignalType mStateChangedSignal;
+};
+
+} // namespace Dali
+
+#endif // __DALI_TOOLKIT_TTS_PLAYER_H__
index 238f67f..a066d8f 100644 (file)
 #include <iostream>
 #include <stdlib.h>
 
-#include <dali-toolkit/dali-toolkit.h>
-
+// Need to override adaptor classes for toolkit test harness, so include
+// test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-accessibility-adaptor.h>
-#include <dummy-control.h>
+
+#include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -222,10 +223,6 @@ int UtcDaliAccessibilityManagerSetAndGetFocusOrder(void)
   // make sure the change of focus order doesn't affect the actor's description
   DALI_TEST_CHECK(manager.GetAccessibilityAttribute(second, AccessibilityManager::ACCESSIBILITY_LABEL) == "second");
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   // Set the focus order and description for the third actor
   Actor third = Actor::New();
   manager.SetFocusOrder(third, 1);
@@ -312,10 +309,6 @@ int UtcDaliAccessibilityManagerGetActorByFocusOrder(void)
   DALI_TEST_CHECK(manager.GetActorByFocusOrder(2) == second);
   DALI_TEST_CHECK(manager.GetActorByFocusOrder(3) == third);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   // Change the focus order of the third actor to 1
   manager.SetFocusOrder(third, 1);
 
@@ -338,10 +331,6 @@ int UtcDaliAccessibilityManagerSetAndGetCurrentFocusActor(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
   manager.SetFocusOrder(first, 1);
@@ -433,10 +422,6 @@ int UtcDaliAccessibilityManagerGetCurrentFocusGroup(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   // Create an actor with two child actors and add it to the stage
   Actor parent = Actor::New();
   Actor firstChild = Actor::New();
@@ -504,10 +489,6 @@ int UtcDaliAccessibilityManagerGetCurrentFocusOrder(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   Actor first = Actor::New();
   Stage::GetCurrent().Add(first);
 
@@ -565,10 +546,6 @@ int UtcDaliAccessibilityManagerMoveFocusForward(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   Actor first = Actor::New();
   Stage::GetCurrent().Add(first);
 
@@ -682,10 +659,6 @@ int UtcDaliAccessibilityManagerMoveFocusBackward(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   Actor first = Actor::New();
   Stage::GetCurrent().Add(first);
 
@@ -799,10 +772,6 @@ int UtcDaliAccessibilityManagerClearFocus(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
   manager.SetFocusOrder(first, 1);
@@ -881,10 +850,6 @@ int UtcDaliAccessibilityManagerFocusGroup(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   // Create an actor with two child actors and add it to the stage
   Actor parent = Actor::New();
   Actor firstChild = Actor::New();
@@ -1047,10 +1012,6 @@ int UtcDaliAccessibilityManagerSignalFocusOvershot(void)
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK(manager);
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   bool signalVerified = false;
   FocusOvershotCallback callback(signalVerified);
   manager.FocusOvershotSignal().Connect(&callback, &FocusOvershotCallback::Callback);
@@ -1315,10 +1276,6 @@ int UtcDaliAccessibilityManagerActionReadSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1339,10 +1296,6 @@ int UtcDaliAccessibilityManagerActionReadSignalN(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1359,10 +1312,6 @@ int UtcDaliAccessibilityManagerActionOverSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1384,10 +1333,6 @@ int UtcDaliAccessibilityManagerActionOverSignalN(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1476,21 +1421,12 @@ int UtcDaliAccessibilityManagerActionUpSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accessibilityAdaptor, true );
-  accessibilityAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
   manager.ActionUpSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
 
-  DummyControl dummyControl = DummyControl::New(true);
-  dummyControl.SetSize(480, 800);
-  manager.SetFocusOrder( dummyControl, 1 );
-  Stage::GetCurrent().Add( dummyControl );
-  manager.SetCurrentFocusActor( dummyControl );
-
+  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
   accessibilityAdaptor.HandleActionUpEvent();
 
   DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION );
@@ -1521,21 +1457,12 @@ int UtcDaliAccessibilityManagerActionDownSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accessibilityAdaptor, true );
-  accessibilityAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
   manager.ActionDownSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
 
-  DummyControl dummyControl = DummyControl::New(true);
-  dummyControl.SetSize(480, 800);
-  manager.SetFocusOrder( dummyControl, 1 );
-  Stage::GetCurrent().Add( dummyControl );
-  manager.SetCurrentFocusActor( dummyControl );
-
+  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
   accessibilityAdaptor.HandleActionDownEvent();
 
   DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION );
@@ -1566,10 +1493,6 @@ int UtcDaliAccessibilityManagerActionClearFocusSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1606,10 +1529,6 @@ int UtcDaliAccessibilityManagerActionBackSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1646,10 +1565,6 @@ int UtcDaliAccessibilityManagerActionScrollUpSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1686,10 +1601,6 @@ int UtcDaliAccessibilityManagerActionScrollDownSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1726,10 +1637,6 @@ int UtcDaliAccessibilityManagerActionPageLeftSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1766,10 +1673,6 @@ int UtcDaliAccessibilityManagerActionPageRightSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1806,10 +1709,6 @@ int UtcDaliAccessibilityManagerActionPageUpSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1830,10 +1729,6 @@ int UtcDaliAccessibilityManagerActionPageUpSignalN(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1850,10 +1745,6 @@ int UtcDaliAccessibilityManagerActionPageDownSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1890,10 +1781,6 @@ int UtcDaliAccessibilityManagerActionMoveToFirstSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1914,10 +1801,6 @@ int UtcDaliAccessibilityManagerActionMoveToFirstSignalN(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1934,10 +1817,6 @@ int UtcDaliAccessibilityManagerActionMoveToLastSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -1974,10 +1853,6 @@ int UtcDaliAccessibilityManagerActionReadFromTopSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -2014,10 +1889,6 @@ int UtcDaliAccessibilityManagerActionReadFromNextSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -2054,10 +1925,6 @@ int UtcDaliAccessibilityManagerActionZoomSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -2094,10 +1961,6 @@ int UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -2134,10 +1997,6 @@ int UtcDaliAccessibilityManagerActionReadPauseResumeSignalP(void)
 
   AccessibilityManagerSignalHandler callback;
 
-  Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
-  Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
-  accAdaptor.HandleActionEnableEvent();
-
   AccessibilityManager manager = AccessibilityManager::Get();
   DALI_TEST_CHECK( manager );
 
@@ -2282,72 +2141,3 @@ int UtcDaliAccessibilityManagerActionScrollSignalN(void)
 
   END_TEST;
 }
-
-int UtcDaliAccessibilityManagerActionTouch(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( " UtcDaliAccessibilityManagerActionTouch" );
-
-  AccessibilityManager manager = AccessibilityManager::Get();
-  DALI_TEST_CHECK( manager );
-
-  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-
-  DummyControl dummyControl = DummyControl::New(true);
-  DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummyControl.GetImplementation());
-  dummyControl.SetSize(480, 800);
-  manager.SetFocusOrder( dummyControl, 1 );
-  Stage::GetCurrent().Add( dummyControl );
-  manager.SetCurrentFocusActor( dummyControl );
-
-  TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
-  accessibilityAdaptor.HandleActionTouchEvent( point, 0u );
-
-  DALI_TEST_CHECK( dummyImpl.onAccTouchedCalled );
-
-  END_TEST;
-}
-
-
-int UtcDaliAccessibilityManagerHandlePanGesture(void)
-{
-  // Pan gesture sent from adaptor to manager via AccessibilityGestureHandler
-  // Adaptor.SetGestureHandler is called in Initialize (check it's the toolkit version)
-  ToolkitTestApplication application;
-  tet_infoline( " UtcDaliAccessibilityManagerHandlePanGesture" );
-
-  AccessibilityManager manager = AccessibilityManager::Get();
-  DALI_TEST_CHECK( manager );
-
-  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-  DummyControl dummyControl = DummyControl::New(true);
-  dummyControl.SetSize(480, 800);
-  Stage::GetCurrent().Add( dummyControl );
-
-  Dali::Integration::PanGestureEvent panGestureEvent(Gesture::Started);
-  panGestureEvent.previousPosition = Vector2(0.f, 0.f);
-  panGestureEvent.currentPosition = Vector2(100.f, 0.f);
-  panGestureEvent.timeDelta = 16;
-  panGestureEvent.numberOfTouches = 1;
-
-  Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent );
-
-  panGestureEvent.state = Gesture::Continuing;
-  panGestureEvent.previousPosition = Vector2(100.f, 0.f);
-  panGestureEvent.currentPosition = Vector2(200.f, 0.f);
-  Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent );
-
-  panGestureEvent.state = Gesture::Finished;
-  panGestureEvent.previousPosition = Vector2(200.f, 0.f);
-  panGestureEvent.currentPosition = Vector2(300.f, 0.f);
-  Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent );
-
-
-  END_TEST;
-}
-
-// Methods missing coverage:
-// IsActorFocusableFunction
-// DoActivate
-// SetFocusable
-// TtsStateChanged
index 80a8f70..07e2b14 100644 (file)
@@ -50,21 +50,6 @@ static bool ButtonCallback( Button button )
   return false;
 }
 
-struct CallbackFunctor
-{
-  CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
-  {
-  }
-
-  void operator()()
-  {
-    *mCallbackFlag = true;
-  }
-  bool* mCallbackFlag;
-};
-
-
 Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
 {
   BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
@@ -452,13 +437,8 @@ int UtcDaliButtonPressedSignalP(void)
   application.Render();
 
   // connect to its touch signal
-  ConnectionTracker* testTracker = new ConnectionTracker();
   button.PressedSignal().Connect( &ButtonCallback );
   button.ReleasedSignal().Connect( &ButtonCallback );
-  bool pressedSignal = false;
-  bool releasedSignal = false;
-  button.ConnectSignal( testTracker, "pressed",   CallbackFunctor(&pressedSignal) );
-  button.ConnectSignal( testTracker, "released",  CallbackFunctor(&releasedSignal) );
 
   Dali::Integration::TouchEvent event;
 
@@ -470,7 +450,6 @@ int UtcDaliButtonPressedSignalP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( pressedSignal );
 
   gIsCalledButtonCallback = false;
   event = Dali::Integration::TouchEvent();
@@ -478,19 +457,15 @@ int UtcDaliButtonPressedSignalP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( releasedSignal );
 
   // Test2. Touch point down and up outside the button.
 
-  pressedSignal = false;
-  releasedSignal = false;
   gIsCalledButtonCallback = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( GetPointDownOutside() );
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !pressedSignal );
 
   gIsCalledButtonCallback = false;
   event = Dali::Integration::TouchEvent();
@@ -498,7 +473,6 @@ int UtcDaliButtonPressedSignalP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !releasedSignal );
 
   // Test3. Touch point down inside and up outside the button.
 
@@ -560,9 +534,6 @@ int UtcDaliButtonClickedSignalP(void)
 
   // connect to its touch signal
   button.ClickedSignal().Connect( &ButtonCallback );
-  bool clickedSignal = false;
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  button.ConnectSignal( testTracker, "clicked",   CallbackFunctor(&clickedSignal) );
 
   Dali::Integration::TouchEvent event;
 
@@ -578,12 +549,10 @@ int UtcDaliButtonClickedSignalP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( clickedSignal );
 
   // Test2. Touch point down and up outside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( GetPointDownOutside() );
   application.ProcessEvent( event );
@@ -593,12 +562,10 @@ int UtcDaliButtonClickedSignalP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
 
   // Test3. Touch point down inside and up outside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( GetPointDownInside() );
   application.ProcessEvent( event );
@@ -612,12 +579,10 @@ int UtcDaliButtonClickedSignalP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
 
   // Test4. Touch point down outside and up inside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( GetPointDownOutside() );
   application.ProcessEvent( event );
@@ -631,7 +596,6 @@ int UtcDaliButtonClickedSignalP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
   END_TEST;
 }
 
@@ -650,23 +614,16 @@ int UtcDaliButtonStateChangedSignalP(void)
 
   // connect to its signal
   button.StateChangedSignal().Connect( &ButtonCallback );
-  bool stateChangedSignal = false;
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  button.ConnectSignal( testTracker, "stateChanged",   CallbackFunctor(&stateChangedSignal) );
 
   gIsCalledButtonCallback = false;
   button.SetSelected( true );
 
   DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( stateChangedSignal );
 
   gIsCalledButtonCallback = false;
-  stateChangedSignal = false;
-
   button.SetSelected( false );
 
   DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( stateChangedSignal );
   END_TEST;
 }
 
index 12ce913..f30007f 100644 (file)
@@ -762,6 +762,7 @@ int UtcDaliControlImplKeyInputFocusLost(void)
 
     DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
 
+    dummyImpl.OnAccessibilityValueChange( true );
     dummyImpl.IsKeyboardNavigationSupported();
     dummyImpl.IsKeyboardFocusGroup();
 
index e6ff510..89bc1a1 100644 (file)
@@ -31,7 +31,7 @@ namespace
 typedef NinePatchImage::StretchRanges StretchRanges;
 
 const char* TEST_IMAGE_FILE_NAME =  "gallery_image_01.jpg";
-const char* TEST_NPATCH_FILE_NAME =  "gallery_image_01.9.png";
+const char* TEST_NPATCH_FILE_NAME =  "gallery_image_01.9.jpg";
 
 const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg";
 
@@ -163,8 +163,7 @@ Integration::ResourcePointer CustomizeNinePatch( TestApplication& application,
 
   tet_infoline("Getting resource");
   Integration::ResourcePointer resourcePtr(bitmap);
-  //platform.SetResourceLoaded( 0, Dali::Integration::ResourceBitmap, resourcePtr );
-  platform.SetSynchronouslyLoadedResource( resourcePtr);
+  platform.SetResourceLoaded( 0, Dali::Integration::ResourceBitmap, resourcePtr );
 
   return resourcePtr;
 }
index 15799d9..7ec6acf 100644 (file)
@@ -178,187 +178,3 @@ int UtcDaliSliderSignals(void)
   DALI_TEST_CHECK(gSliderMarkCallBackCalled);
   END_TEST;
 }
-
-namespace
-{
-bool gSliderSignal=false;
-struct SliderSignalFunctor
-{
-  SliderSignalFunctor()
-  {
-  }
-
-  void operator()()
-  {
-    gSliderSignal = true;
-  }
-};
-} // anonymous
-
-
-
-int UtcDaliSliderSignals2(void)
-{
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline(" UtcDaliSliderSignals1");
-
-  // Create the Popup actor
-  Slider slider = Slider::New();
-  Stage::GetCurrent().Add( slider );
-  slider.SetParentOrigin(ParentOrigin::TOP_LEFT);
-  slider.SetAnchorPoint(ParentOrigin::TOP_LEFT);
-  slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
-  slider.SetPosition( 0.0f, 0.0f );
-
-  const float MIN_BOUND = 0.0f;
-  const float MAX_BOUND = 1.0f;
-  const int NUM_MARKS = 5;
-  Property::Array marks;
-  for( int i = 0; i < NUM_MARKS; ++i )
-  {
-    marks.PushBack( MIN_BOUND + ( static_cast<float>(i) / ( NUM_MARKS - 1) ) * ( MAX_BOUND - MIN_BOUND ) );
-  }
-  slider.SetProperty( Slider::Property::MARKS, marks );
-  slider.SetProperty( Slider::Property::MARK_TOLERANCE, 0.1f );
-
-  gSliderSignal = false;
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  slider.ConnectSignal( testTracker, "valueChanged",   SliderSignalFunctor() );
-
-  application.SendNotification();
-  application.Render();
-
-  gSliderValueChangedCallBackCalled = false;
-  gSliderMarkCallBackCalled = false;
-
-  Dali::Integration::TouchEvent event;
-
-  event = Dali::Integration::TouchEvent();
-
-  Integration::Point pointDown;
-  pointDown.SetState( PointState::DOWN );
-  pointDown.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  event.AddPoint( pointDown );
-
-  for( int i = 0; i < 5; ++i )
-  {
-    Integration::Point pointMotion;
-    pointMotion.SetState( PointState::MOTION );
-    pointMotion.SetScreenPosition( Vector2( 10.0f + i * 10.0f, 10.0f ) );
-    event.AddPoint( pointMotion );
-  }
-
-  Integration::Point pointUp;
-  pointUp.SetState( PointState::UP );
-  pointUp.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  event.AddPoint( pointUp );
-
-  application.ProcessEvent( event );
-
-  application.SendNotification();
-  application.Render();
-
-  DALI_TEST_CHECK(gSliderSignal);
-  END_TEST;
-}
-
-int UtcDaliSetPropertyP(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( "UtcDaliSetPropertyP" );
-
-  Slider slider = Slider::New();
-  slider.SetParentOrigin(ParentOrigin::TOP_LEFT);
-  slider.SetAnchorPoint(ParentOrigin::TOP_LEFT);
-  slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
-  slider.SetPosition( 0.0f, 0.0f );
-
-  Stage::GetCurrent().Add(slider);
-  application.SendNotification();
-  application.Render();
-
-  slider.SetProperty(Slider::Property::LOWER_BOUND,        1.0f);
-  slider.SetProperty(Slider::Property::UPPER_BOUND,        5.0f);
-  slider.SetProperty(Slider::Property::VALUE,              3.0f);
-  slider.SetProperty(Slider::Property::DISABLED_COLOR,     Color::BLACK);
-  slider.SetProperty(Slider::Property::VALUE_PRECISION,    4);
-  slider.SetProperty(Slider::Property::SHOW_POPUP,         true);
-  slider.SetProperty(Slider::Property::SHOW_VALUE,         true);
-  slider.SetProperty(Slider::Property::MARKS,              false);
-  slider.SetProperty(Slider::Property::SNAP_TO_MARKS,      false);
-  slider.SetProperty(Slider::Property::MARK_TOLERANCE,     0.5f);
-
-  float lb = slider.GetProperty<float>(Slider::Property::LOWER_BOUND);
-  DALI_TEST_EQUALS(lb, 1.0f, TEST_LOCATION);
-  float ub = slider.GetProperty<float>(Slider::Property::UPPER_BOUND);
-  DALI_TEST_EQUALS(ub, 5.0f, TEST_LOCATION);
-  float val = slider.GetProperty<float>(Slider::Property::VALUE);
-  DALI_TEST_EQUALS(val, 3.0f, TEST_LOCATION);
-  Vector4 color = slider.GetProperty<Vector4>(Slider::Property::DISABLED_COLOR);
-  DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
-  int precision = slider.GetProperty<int>(Slider::Property::VALUE_PRECISION);
-  DALI_TEST_EQUALS( precision, 4, TEST_LOCATION);
-  bool showPopup = slider.GetProperty<bool>(Slider::Property::SHOW_POPUP);
-  DALI_TEST_EQUALS( showPopup, true , TEST_LOCATION);
-  bool showValue = slider.GetProperty<bool>(Slider::Property::SHOW_VALUE);
-  DALI_TEST_EQUALS( showValue, true, TEST_LOCATION );
-  bool marks = slider.GetProperty<bool>(Slider::Property::MARKS);
-  DALI_TEST_EQUALS( marks, false, TEST_LOCATION );
-  bool snapToMarks = slider.GetProperty<bool>(Slider::Property::SNAP_TO_MARKS);
-  DALI_TEST_EQUALS( snapToMarks, false, TEST_LOCATION );
-  float tolerance = slider.GetProperty<float>(Slider::Property::MARK_TOLERANCE);
-  DALI_TEST_EQUALS( tolerance, 0.5f, TEST_LOCATION );
-
-  {
-    Property::Map map;
-    map["rendererType"] = "image";
-    map["size"] = Vector2(200, 200);
-    map["url"] = "track2.png";
-    slider.SetProperty(Slider::Property::TRACK_VISUAL,       map);
-    map["url"] = "handle2.png";
-    slider.SetProperty(Slider::Property::HANDLE_VISUAL,      map);
-    map["url"] = "progress2.png";
-    slider.SetProperty(Slider::Property::PROGRESS_VISUAL,    map);
-    map["url"] = "popup2.png";
-    slider.SetProperty(Slider::Property::POPUP_VISUAL,       map);
-    map["url"] = "popupArrow2.png";
-    slider.SetProperty(Slider::Property::POPUP_ARROW_VISUAL, map);
-
-    Property::Value value = slider.GetProperty(Slider::Property::TRACK_VISUAL);
-    Property::Map* resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
-    Property::Value* url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "track2.png", TEST_LOCATION );
-
-    value = slider.GetProperty(Slider::Property::HANDLE_VISUAL);
-    resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
-    url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "handle2.png", TEST_LOCATION );
-
-    value = slider.GetProperty(Slider::Property::PROGRESS_VISUAL);
-    resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
-    url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "progress2.png", TEST_LOCATION );
-
-    value = slider.GetProperty(Slider::Property::POPUP_VISUAL);
-    resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
-    url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "popup2.png", TEST_LOCATION );
-
-    value = slider.GetProperty(Slider::Property::POPUP_ARROW_VISUAL);
-    resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
-    url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "popupArrow2.png", TEST_LOCATION );
-  }
-
-  END_TEST;
-}
index 3c121c0..e0b5c9c 100644 (file)
@@ -44,7 +44,7 @@ namespace
 {
 const int BLUR_LEVELS = 3;
 const int RENDER_FRAME_INTERVAL = 16;
-const char* TEST_IMAGE_FILE_NAME("image.png");
+
 static bool gObjectCreatedCallBackCalled;
 static void TestCallback(BaseHandle handle)
 {
@@ -99,43 +99,6 @@ Image CreateSolidColorImage( ToolkitTestApplication& application, const Vector4&
 
   return imageData;
 }
-
-void LoadBitmapResource(TestPlatformAbstraction& platform, int width, int height)
-{
-  Integration::ResourceRequest* request = platform.GetRequest();
-  Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
-  Integration::ResourcePointer resource(bitmap);
-  bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, width, height, width, height);
-
-  if(request)
-  {
-    platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
-  }
-}
-
-class SignalHandler : public Dali::ConnectionTracker
-{
-public:
-  SignalHandler() :
-    mCalls( 0 )
-  {
-  }
-
-  void Callback( SuperBlurView handle )
-  {
-    mCalls++;
-    tet_infoline( "Signal called" );
-  }
-
-  unsigned int GetCalls() const
-  {
-    return mCalls;
-  }
-
-private:
-  unsigned int mCalls;  ///< Keeps track of how many times the signal has been called.
-};
-
 }//namespace
 
 
@@ -176,33 +139,6 @@ int UtcDaliSuperBlurViewNew(void)
   END_TEST;
 }
 
-int UtcDaliSuperBlurViewCreate(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliSuperBlurViewNew ");
-
-  // Test default constructor.
-  SuperBlurView blurView;
-  DALI_TEST_CHECK( !blurView );
-
-  // Test object creation
-  TypeInfo type = TypeRegistry::Get().GetTypeInfo("SuperBlurView");
-  if( type )
-  {
-    Dali::BaseHandle handle = type.CreateInstance();
-    if( handle )
-    {
-      blurView = Dali::Toolkit::SuperBlurView::DownCast( handle );
-    }
-  }
-
-  DALI_TEST_CHECK( blurView );
-
-  END_TEST;
-}
-
-
 int UtcDaliSuperBlurViewSetImage(void)
 {
   ToolkitTestApplication application;
@@ -217,93 +153,13 @@ int UtcDaliSuperBlurViewSetImage(void)
   // start multiple guassian blur call, each guassian blur creates two render tasks
   DALI_TEST_CHECK( Stage::GetCurrent().GetRenderTaskList().GetTaskCount() == 1+BLUR_LEVELS*2);
 
-  {
-    // create image renderers for the original image and each blurred image
-    Stage::GetCurrent().Add( blurView );
-    Wait(application);
-    DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS+1, TEST_LOCATION );
-
-    application.SendNotification();
-    application.Render();
-    Stage::GetCurrent().Remove( blurView );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliSuperBlurViewSetProperty(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliSuperBlurViewSetProperty ");
-
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
   // create image renderers for the original image and each blurred image
   Stage::GetCurrent().Add( blurView );
-  blurView.SetSize( 100.f, 100.f );
-
-  tet_infoline(" Set property map. Set height and width large enough to avoid atlassing");
-  int width(512);
-  int height(513);
-  LoadBitmapResource( application.GetPlatform(), width, height );
-
-  Property::Map propertyMap;
-  propertyMap["filename"] = TEST_IMAGE_FILE_NAME ;
-  propertyMap["width"] = width;
-  propertyMap["height"] = height;
-
-  // Will create ResourceImage
-  blurView.SetProperty(SuperBlurView::Property::IMAGE, propertyMap);
-  Wait(application);
-
-  // start multiple guassian blur call, each guassian blur creates two render tasks
-  DALI_TEST_CHECK( Stage::GetCurrent().GetRenderTaskList().GetTaskCount() == 1+BLUR_LEVELS*2);
-
   Wait(application);
-
-  END_TEST;
-}
-
-
-int UtcDaliSuperBlurViewGetProperty(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliSuperBlurViewSetProperty ");
-
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  blurView.SetSize( 100.f, 100.f );
-
-  tet_infoline(" Set property map.");
-  int width(512);
-  int height(513); // Value large enough to avoid future atlassing
-  LoadBitmapResource( application.GetPlatform(), width, height );
-
-  Property::Map propertyMap;
-  propertyMap["filename"] = TEST_IMAGE_FILE_NAME ;
-  propertyMap["width"] = width;
-  propertyMap["height"] = height;
-
-  // Will create ResourceImage
-  blurView.SetProperty(SuperBlurView::Property::IMAGE, propertyMap);
-  Wait(application);
-
-  // create image renderers for the original image and each blurred image
-  Stage::GetCurrent().Add( blurView );
-
-  Property::Value imageProperty = blurView.GetProperty(SuperBlurView::Property::IMAGE);
-  Property::Map* map = imageProperty.GetMap();
-  DALI_TEST_CHECK( map != NULL );
-  if( map )
-  {
-    Property::Map& mapRef = *map;
-    DALI_TEST_EQUALS( mapRef["filename"], TEST_IMAGE_FILE_NAME, TEST_LOCATION );
-  }
-
+  DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS+1, TEST_LOCATION );
   END_TEST;
 }
 
-
 int UtcDaliSuperBlurViewSetGetBlurStrength(void)
 {
   ToolkitTestApplication application;
@@ -364,30 +220,3 @@ int UtcDaliSuperBlurViewGetBlurredImage(void)
 
   END_TEST;
 }
-
-int UtcDaliSuperBlurViewBlurSignal(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliSuperBlurViewSignal ");
-
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  blurView.SetSize( 100.f, 100.f );
-
-  Image inputImage = CreateSolidColorImage( application, Color::GREEN, 50, 50 );
-  blurView.SetImage( inputImage );
-  // start multiple guassian blur call, each guassian blur creates two render tasks
-  DALI_TEST_CHECK( Stage::GetCurrent().GetRenderTaskList().GetTaskCount() == 1+BLUR_LEVELS*2);
-
-  SignalHandler signalHandler;
-  blurView.BlurFinishedSignal().Connect(&signalHandler, &SignalHandler::Callback);
-
-  // create image renderers for the original image and each blurred image
-  Stage::GetCurrent().Add( blurView );
-  Wait(application, 1000);
-
-  DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS+1, TEST_LOCATION );
-  //DALI_TEST_EQUALS(signalHandler.GetCalls(), 1, TEST_LOCATION);
-
-  END_TEST;
-}
index b6c4e3b..0212161 100644 (file)
@@ -1390,6 +1390,35 @@ Toolkit::AccessibilityManager::FocusedActorActivatedSignalType& AccessibilityMan
   return mFocusedActorActivatedSignal;
 }
 
+bool AccessibilityManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+{
+  bool connected( true );
+  AccessibilityManager* manager = dynamic_cast<AccessibilityManager*>( object );
+
+  if( manager )
+  {
+    if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUS_CHANGED ) )
+    {
+      manager->FocusChangedSignal().Connect( tracker, functor );
+    }
+    else if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUS_OVERSHOT ) )
+    {
+      manager->FocusOvershotSignal().Connect( tracker, functor );
+    }
+    else if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUSED_ACTOR_ACTIVATED ) )
+    {
+      manager->FocusedActorActivatedSignal().Connect( tracker, functor );
+    }
+    else
+    {
+      // signalName does not match any signal
+      connected = false;
+    }
+  }
+
+  return connected;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
index bb2b275..1603a02 100644 (file)
@@ -220,6 +220,17 @@ public:
    */
   Toolkit::AccessibilityManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
 
+  /**
+   * Connects a callback function with the object's signals.
+   * @param[in] object The object providing the signal.
+   * @param[in] tracker Used to disconnect the signal.
+   * @param[in] signalName The signal to connect to.
+   * @param[in] functor A newly allocated FunctorDelegate.
+   * @return True if the signal was connected.
+   * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
+   */
+  static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
+
 public:  // Signals
 
   /**
index 2a4979b..c987ea3 100644 (file)
@@ -382,7 +382,7 @@ Property::Value SuperBlurView::GetProperty( BaseObject* object, Property::Index
     {
       Property::Map map;
       Image inputImage = superBlurViewImpl.GetImage();
-      if( inputImage )
+      if( !inputImage )
       {
         Scripting::CreatePropertyMap( inputImage, map );
       }
index 2a52cff..4605cd7 100644 (file)
@@ -78,9 +78,9 @@ BaseHandle Create()
 
 DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::KeyboardFocusManager, Dali::BaseHandle, Create, true )
 
-DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboardPreFocusChange",           SIGNAL_PRE_FOCUS_CHANGE )
-DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboardFocusChanged",             SIGNAL_FOCUS_CHANGED )
-DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboardFocusGroupChanged",        SIGNAL_FOCUS_GROUP_CHANGED )
+DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboardPreFocusChange",           SIGNAL_PRE_FOCUS_CHANGE        )
+DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboardFocusChanged",             SIGNAL_FOCUS_CHANGED           )
+DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboardFocusGroupChanged",        SIGNAL_FOCUS_GROUP_CHANGED     )
 DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboardFocusedActorEnterKey",     SIGNAL_FOCUSED_ACTOR_ENTER_KEY )
 
 DALI_TYPE_REGISTRATION_END()