Merge "Script UTC test cases" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 25 Jun 2015 15:31:14 +0000 (08:31 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 25 Jun 2015 15:31:15 +0000 (08:31 -0700)
1  2 
automated-tests/src/dali-toolkit/CMakeLists.txt

@@@ -25,6 -25,7 +25,7 @@@ SET(TC_SOURCE
     utc-Dali-OverlayEffect.cpp
     utc-Dali-PageTurnEffect.cpp
     utc-Dali-PageTurnView.cpp
+    utc-Dali-Script.cpp
     utc-Dali-ScrollBar.cpp
     utc-Dali-ScrollView.cpp
     utc-Dali-ShadowView.cpp
@@@ -44,7 -45,7 +45,7 @@@
     utc-Dali-ControlImpl.cpp
     utc-Dali-DefaultControls.cpp
     utc-Dali-DissolveEffect.cpp
 -   utc-Dali-AccessibilityFocusManager.cpp
 +   utc-Dali-AccessibilityManager.cpp
     utc-Dali-IrisEffect.cpp
     utc-Dali-ItemLayout.cpp
     utc-Dali-ItemView.cpp
@@@ -66,7 -67,7 +67,7 @@@
  # Append list of test harness files (Won't get parsed for test cases)
  LIST(APPEND TC_SOURCES
     dali-toolkit-test-utils/test-harness.cpp
 -   dali-toolkit-test-utils/toolkit-accessibility-manager.cpp
 +   dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp
     dali-toolkit-test-utils/toolkit-application.cpp
     dali-toolkit-test-utils/toolkit-clipboard.cpp
     dali-toolkit-test-utils/toolkit-imf-manager.cpp
@@@ -75,7 -76,6 +76,7 @@@
     dali-toolkit-test-utils/toolkit-singleton-service.cpp
     dali-toolkit-test-utils/toolkit-timer.cpp
     dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
 +   dali-toolkit-test-utils/toolkit-tts-player.cpp
     dali-toolkit-test-utils/dummy-control.cpp
     dali-toolkit-test-utils/dali-test-suite-utils.cpp
     dali-toolkit-test-utils/test-application.cpp