Merge "DALi Version 1.0.28" into tizen accepted/tizen/common/20150209.122020 accepted/tizen/mobile/20150210.015343 accepted/tizen/mobile/20150306.082341 accepted/tizen/tv/20150210.013257 accepted/tizen/wearable/20150210.015027 dali_1.0.28 submit/tizen/20150206.152923 submit/tizen_mobile/20150213.000000 submit/tizen_mobile/20150223.000000 submit/tizen_mobile/20150306.011558
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 6 Feb 2015 13:54:04 +0000 (05:54 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 6 Feb 2015 13:54:04 +0000 (05:54 -0800)
54 files changed:
automated-tests/README.md
automated-tests/packaging/core-dali-toolkit-unmanaged-tests.spec [deleted file]
automated-tests/packaging/core-dali-unmanaged-tests.spec [deleted file]
automated-tests/src/dali-toolkit-unmanaged/CMakeLists.txt [deleted file]
automated-tests/src/dali-toolkit-unmanaged/tct-dali-toolkit-unmanaged-core.cpp [deleted file]
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp [deleted file]
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ControlImpl.cpp [deleted file]
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DefaultControls.cpp [deleted file]
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ItemView.cpp [deleted file]
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyboardFocusManager.cpp [deleted file]
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollViewEffect.cpp [deleted file]
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp [deleted file]
automated-tests/src/dali-toolkit/CMakeLists.txt
automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-BendyEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-BlindEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-BloomView.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Builder.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CarouselEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CheckBoxButton.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-Cluster.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Cluster.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-DefaultControls.cpp
automated-tests/src/dali-toolkit/utc-Dali-DepthLayout.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DepthLayout.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DisplacementEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DistanceFieldEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-GaussianBlurView.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-JsonParser.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyInputFocusManager.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationControl.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-NavigationLayout.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationLayout.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-OverlayEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-Page.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Page.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-PageTurnEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-PageTurnView.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-RollLayout.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RollLayout.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ShadowView.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ShearEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Slider.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-SoftButtonEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-SpiralLayout.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-SpiralLayout.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-SpotEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-SquareDissolveEffect.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-StyleManager.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-StyleManager.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TableView.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-TextInput.cpp
automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ToolBar.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-View.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp with 100% similarity]
automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp [moved from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-WaterEffect.cpp with 100% similarity]

index d582bf1..8db6f2c 100644 (file)
@@ -3,7 +3,7 @@ Testing environment   {#auto_testing}
 
 The new test environment from Tizen is the Web-TCT test suite. This was written for testing web components, but can easily be used for testing Dali.
 
-Each of the DALi repositories, **dali-core**, **dali-adaptor** and **dali-toolkit**, have their own test suites under the `automated-tests` folder. Within the src folder are a number of secondary folders - these correspond to 'managed' tests (for testing the frozen API for products), unmanaged tests (tests for other APIs) and internal (for desktop testing only)
+Each of the DALi repositories, **dali-core**, **dali-adaptor** and **dali-toolkit**, have their own test suites under the `automated-tests` folder. Within the src folder are a number of secondary folders - these correspond to 'API' tests  and internal (for desktop testing only)
 
 Installation
 ------------
@@ -62,11 +62,11 @@ Run the following commands:
     cd automated-tests
     ./build.sh
 
-This will build dali, dali-unmanaged and dali-internal test sets.
+This will build dali and dali-internal test sets.
 
 Test sets can be built individually:
 
-    ./build.sh dali-unmanaged
+    ./build.sh dali
 
 They can also be built without regenerating test case scripts (Useful for quicker rebuilds)
 
@@ -84,7 +84,7 @@ To execute tests, cd into automated-tests and run
 
     ./execute.sh
 
-This will execute dali, dali-unmanaged and dali-internal test sets. Note that the output summary for the first will be printed before running the second.
+This will execute dali and dali-internal test sets. Note that the output summary for the first will be printed before running the second.
 
 By default the tests execute in parallel, which is faster but does not produce a single output file (summary.xml).  Use this to execute the tests in series:
 
@@ -123,17 +123,14 @@ For core Dali cd into automated-tests, and use:
 
 sudo ./tcbuild build dali
 
-    sudo ./tcbuild build dali-unmanaged
+    sudo ./tcbuild build dali
     ./tcbuild install dali
-    ./tcbuild install dali-unmanaged
 
 For Dali Adaptor, cd into automated-tests, and use:
 
     sudo ./tcbuild build dali-adaptor
-    sudo ./tcbuild build dali-adaptor-unmanaged # < Currently failing as needs a ".spec" file.
     sudo ./tcbuild build dali-platform-abstraction
     ./tcbuild install dali-adaptor
-    ./tcbuild install dali-adaptor-unmanaged
     ./tcbuild install dali-platform-abstraction
 
 Ensure your handset's filesystem is writable:
@@ -144,7 +141,7 @@ To execute tests, cd into automated-tests and run
 
     tct-mgr
 
-This will bring up the java test suite program. You should see the Plan pane with a list of all tests in. Select the tct-dali-core-tests and tct-dali-unmanaged-tests. and you will be offered a dialog to choose a test plan: either create a new one or use temp.
+This will bring up the java test suite program. You should see the Plan pane with a list of all tests in. Select the tct-dali-core-tests. and you will be offered a dialog to choose a test plan: either create a new one or use temp.
 Select dali test suite, and click Run, then "Create a new plan", and call it "Dali-Core" or some such. It will now run the dali-test suite.
 
 You can find the output files under /opt/tct/manager/result/
@@ -158,11 +155,6 @@ To Managed API
 
 If you are adding test cases for new or existing managed API (CAPI), you need to add your changes to the src/dali mirror, and copy your change to the managed test suite in core-api. You need to inform HQ of your update.
 
-To Unmanaged API
-----------------
-
-If you are adding test cases for unmanaged API, you need to add your changes to the src/dali-unmanaged test suite.
-
 For internal API
 ----------------
 
@@ -201,9 +193,9 @@ On desktop, you can debug the tests by running gdb on the test program:
 
 replace `<TestCase>` with the name of the failing testcase.
 
-For example, using testcase UtcDaliNinePatch01 from the dali-core unmanaged test suite:
+For example, using testcase UtcDaliNinePatch01 from the dali-core test suite:
 
-    $ gdb build/src/dali-unmanaged/tct-dali-unmanaged-core
+    $ gdb build/src/dali/tct-dali-core
     gdb> r UtcDaliNinePatch01
 
 
@@ -226,4 +218,4 @@ If when running tct-mgr tests, if "Health-Check get" fails and leaves a white sc
 
 If the test results show that the test cases fail with "Undefined reference to XXX", it means you have probably failed to update the dali packages on target.
 
-If all the tests are failing then make sure that you have enabled the engineering mode on the target with the 'change-booting-mode.sh --update' command in sdb shell, as the tests may not have installed correctly.
+If all the tests are failing then make sure that you have enabled the engineering mode on the target with the 'change-booting-mode.sh --update' command in sdb shell, as the tests may not have installed correctly
diff --git a/automated-tests/packaging/core-dali-toolkit-unmanaged-tests.spec b/automated-tests/packaging/core-dali-toolkit-unmanaged-tests.spec
deleted file mode 100644 (file)
index 3499f22..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-%define MODULE_NAME dali-toolkit-unmanaged
-%define MODULE_LIBNAME dali-toolkit-unmanaged
-Name:       core-%{MODULE_NAME}-tests
-Summary:    Core API unit TC (%{name})
-Version:    0.1
-Release:    0
-Group:      Development/Tools
-License:    Apache License, Version 2.0, Samsung Properietary
-Source0:    %{name}-%{version}.tar.gz
-Requires:       dali
-Requires:       dali-adaptor
-Requires:       dali-toolkit
-BuildRequires:  dali-integration-devel
-BuildRequires:  pkgconfig(dali-core)
-BuildRequires:  pkgconfig(dali)
-BuildRequires:  pkgconfig(dali-toolkit)
-BuildRequires:  libxml2-devel
-BuildRequires:  cmake
-
-%description
-Core API unit TC (%{name})
-
-%prep
-%setup -q
-
-%build
-
-%define PREFIX "%{_libdir}/%{name}"
-
-export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
-cd automated-tests
-cmake . -DMODULE="%{MODULE_NAME}" -DCMAKE_INSTALL_PREFIX=%{_prefix}
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-cd automated-tests
-%make_install
-mkdir -p %{buildroot}/opt/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/opt/usr/share/license/%{name}
-mkdir -p %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/add_all_smack_rule.sh %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/all_smack.rule %{buildroot}/tmp/
-
-%post
-
-%postun
-
-
-%files
-/opt/usr/bin/*
-/opt/usr/share/license/%{name}
-/tmp/add_all_smack_rule.sh
-/tmp/all_smack.rule
diff --git a/automated-tests/packaging/core-dali-unmanaged-tests.spec b/automated-tests/packaging/core-dali-unmanaged-tests.spec
deleted file mode 100644 (file)
index dfb0ffb..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-%define MODULE_NAME dali-unmanaged
-%define MODULE_LIBNAME dali-unmanaged
-Name:       core-%{MODULE_NAME}-tests
-Summary:    Core API unit TC (%{name})
-Version:    0.1
-Release:    0
-Group:      Development/Tools
-License:    Apache License, Version 2.0, Samsung Properietary
-Source0:    %{name}-%{version}.tar.gz
-Requires: dali
-BuildRequires:  dali-devel
-BuildRequires:  dali-integration-devel
-BuildRequires:  pkgconfig(dali-core)
-BuildRequires:  pkgconfig(dali)
-BuildRequires:  libxml2-devel
-BuildRequires:  cmake
-
-%description
-Core API unit TC (%{name})
-
-%prep
-%setup -q
-
-%build
-
-%define PREFIX "%{_libdir}/%{name}"
-
-export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
-cd automated-tests
-cmake . -DMODULE="%{MODULE_NAME}" -DCMAKE_INSTALL_PREFIX=%{_prefix}
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-cd automated-tests
-%make_install
-mkdir -p %{buildroot}/opt/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/opt/usr/share/license/%{name}
-mkdir -p %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/add_all_smack_rule.sh %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/all_smack.rule %{buildroot}/tmp/
-
-%post
-
-%postun
-
-
-%files
-/opt/usr/bin/*
-/opt/usr/share/license/%{name}
-/tmp/add_all_smack_rule.sh
-/tmp/all_smack.rule
diff --git a/automated-tests/src/dali-toolkit-unmanaged/CMakeLists.txt b/automated-tests/src/dali-toolkit-unmanaged/CMakeLists.txt
deleted file mode 100644 (file)
index f62490f..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-SET(PKG_NAME "dali-toolkit-unmanaged")
-
-SET(EXEC_NAME "tct-${PKG_NAME}-core")
-SET(RPM_NAME "core-${PKG_NAME}-tests")
-
-SET(CAPI_LIB "dali-toolkit-unmanaged")
-
-# List of test case sources (Only these get parsed for test cases)
-SET(TC_SOURCES
- utc-Dali-BendyEffect.cpp
- utc-Dali-BlindEffect.cpp
- utc-Dali-BloomView.cpp
- utc-Dali-Builder.cpp
- utc-Dali-CarouselEffect.cpp
- utc-Dali-CheckBoxButton.cpp
- utc-Dali-Cluster.cpp
- utc-Dali-CubeTransitionEffect.cpp
- utc-Dali-DepthLayout.cpp
- utc-Dali-DisplacementEffect.cpp
- utc-Dali-DistanceFieldEffect.cpp
- utc-Dali-GaussianBlurView.cpp
- utc-Dali-JsonParser.cpp
- utc-Dali-KeyInputFocusManager.cpp
- utc-Dali-NavigationControl.cpp
- utc-Dali-NavigationLayout.cpp
- utc-Dali-OverlayEffect.cpp
- utc-Dali-Page.cpp
- utc-Dali-PageTurnEffect.cpp
- utc-Dali-PageTurnView.cpp
- utc-Dali-RollLayout.cpp
- utc-Dali-ScrollView.cpp
- utc-Dali-ShadowView.cpp
- utc-Dali-ShearEffect.cpp
- utc-Dali-Slider.cpp
- utc-Dali-SoftButtonEffect.cpp
- utc-Dali-SpiralLayout.cpp
- utc-Dali-SpotEffect.cpp
- utc-Dali-SquareDissolveEffect.cpp
- utc-Dali-TableView.cpp
- utc-Dali-ToolBar.cpp
- utc-Dali-View.cpp
- utc-Dali-WaterEffect.cpp
- utc-Dali-Button.cpp
- utc-Dali-ControlImpl.cpp
- utc-Dali-DefaultControls.cpp
- utc-Dali-ItemView.cpp
- utc-Dali-KeyboardFocusManager.cpp
- utc-Dali-ScrollViewEffect.cpp
- utc-Dali-TextInput.cpp
- utc-Dali-StyleManager.cpp
- utc-Dali-RadioButton.cpp
-)
-
-# Append list of test harness files (Won't get parsed for test cases)
-LIST(APPEND TC_SOURCES
-   ../dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/test-application.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
-)
-
-
-PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    dali-core
-    dali
-    dali-toolkit
-)
-
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type")
-
-FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
-    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
-ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
-
-INCLUDE_DIRECTORIES(
-    ${${CAPI_LIB}_INCLUDE_DIRS}
-    ../dali-toolkit/dali-toolkit-test-utils
-)
-
-ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
-TARGET_LINK_LIBRARIES(${EXEC_NAME}
-    ${${CAPI_LIB}_LIBRARIES}
-)
-
-INSTALL(PROGRAMS ${EXEC_NAME}
-    DESTINATION ${BIN_DIR}/${EXEC_NAME}
-)
diff --git a/automated-tests/src/dali-toolkit-unmanaged/tct-dali-toolkit-unmanaged-core.cpp b/automated-tests/src/dali-toolkit-unmanaged/tct-dali-toolkit-unmanaged-core.cpp
deleted file mode 100644 (file)
index c3f6586..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <string.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <test-harness.h>
-#include "tct-dali-toolkit-unmanaged-core.h"
-
-int main(int argc, char * const argv[])
-{
-  int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT;
-
-  const char* optString = "r";
-  bool optRerunFailed(false);
-
-  int nextOpt = 0;
-  do
-  {
-    nextOpt = getopt( argc, argv, optString );
-    switch(nextOpt)
-    {
-      case 'r':
-        optRerunFailed = true;
-        break;
-      case '?':
-        TestHarness::Usage(argv[0]);
-        exit(TestHarness::EXIT_STATUS_BAD_ARGUMENT);
-        break;
-    }
-  } while( nextOpt != -1 );
-
-  if( optind == argc ) // no testcase name in argument list
-  {
-    result = TestHarness::RunAllInParallel(argv[0], tc_array, optRerunFailed);
-  }
-  else
-  {
-    // optind is index of next argument - interpret as testcase name
-    result = TestHarness::FindAndRunTestCase(tc_array, argv[optind]);
-  }
-  return result;
-}
diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
deleted file mode 100644 (file)
index a3a3812..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-void dali_button_startup(void)
-{
-  test_return_value = TET_UNDEF;
-}
-
-void dali_button_cleanup(void)
-{
-  test_return_value = TET_PASS;
-}
-
-
-namespace
-{
-const Dali::TouchPoint pointDownInside( 0, TouchPoint::Down, 240, 400 );
-const Dali::TouchPoint pointUpInside( 0, TouchPoint::Up, 240, 400 );
-const Dali::TouchPoint pointLeave( 0, TouchPoint::Leave, 240, 400 );
-const Dali::TouchPoint pointEnter( 0, TouchPoint::Motion, 240, 400 );
-const Dali::TouchPoint pointDownOutside( 0, TouchPoint::Down, 10, 10 );
-const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10, 10 );
-
-static bool gObjectCreatedCallBackCalled;
-
-static void TestObjectCreatedCallback(BaseHandle handle)
-{
-  gObjectCreatedCallBackCalled = true;
-}
-
-} // namespace
-
-
-
-// Positive test case for a method
-int UtcDaliButtonNew(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonNew");
-
-  CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  DALI_TEST_CHECK( checkBoxButton );
-
-  CheckBoxButton checkBoxButton2( checkBoxButton );
-  DALI_TEST_CHECK( checkBoxButton2 );
-  checkBoxButton2.Reset();
-
-
-  //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
-
-  gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestObjectCreatedCallback );
-  {
-    CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
-
-  gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestObjectCreatedCallback );
-  {
-    PushButton pushButton = PushButton::New();
-  }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
-
-  // Test down cast
-  Handle handleButton = checkBoxButton;
-  Button downCastCheckBoxButton = Button::DownCast( handleButton );
-  DALI_TEST_CHECK( downCastCheckBoxButton );
-  CheckBoxButton downCastCheckBoxButton2 = CheckBoxButton::DownCast( handleButton );
-  DALI_TEST_CHECK( downCastCheckBoxButton2 );
-  END_TEST;
-}
-
-int UtcDaliButtonProperties(void)
-{
-  tet_infoline("UtcDaliButtonSetProperty: ");
-  ToolkitTestApplication application;
-
-  CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  PushButton pushButton = PushButton::New();
-
-  //Test various properties
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), false );
-  DALI_TEST_CHECK( false == checkBoxButton.IsDisabled() );
-
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), true );
-  DALI_TEST_CHECK( true == checkBoxButton.IsDisabled() );
-  END_TEST;
-}
-
-int UtcDaliButtonSetGetDimmed(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetGetDimmed");
-
-  CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  checkBoxButton.SetDisabled( true );
-
-  DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
-  checkBoxButton.SetDisabled( false );
-
-  DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
-  checkBoxButton.SetDisabled( true );
-
-  DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
-  checkBoxButton.SetDisabled( false );
-
-  DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ControlImpl.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ControlImpl.cpp
deleted file mode 100644 (file)
index e0d84e1..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-#include <dali/integration-api/events/key-event-integ.h>
-#include <dali/integration-api/events/mouse-wheel-event-integ.h>
-#include <dali/integration-api/events/long-press-gesture-event.h>
-#include <dali/integration-api/events/pinch-gesture-event.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
-#include <dali/integration-api/events/tap-gesture-event.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-
-#include "dummy-control.h"
-
-using namespace Dali;
-using namespace Dali::Toolkit;
-
-
-void control_impl_startup(void)
-{
-  test_return_value = TET_UNDEF;
-}
-
-void control_impl_cleanup(void)
-{
-  test_return_value = TET_PASS;
-}
-
-
-int UtcDaliControlImplTypeRegistry(void)
-{
-  ToolkitTestApplication application;
-
-  // Register Type
-  TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "Control" );
-  DALI_TEST_CHECK( type );
-  BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
-
-  // Check if it's a control
-  DALI_TEST_CHECK( Control::DownCast(handle) );
-  END_TEST;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-namespace
-{
-static bool MouseWheelEventCallback(Actor actor, const MouseWheelEvent& event)
-{
-  return false;
-}
-}
-
-int UtcDaliControlImplMouseWheelEvent(void)
-{
-  ToolkitTestApplication application;
-
-  {
-    DummyControl dummy = DummyControl::New( true );
-    DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
-
-    dummy.SetSize(100.0f, 100.0f);
-    dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-    Stage::GetCurrent().Add(dummy);
-
-    dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
-
-    application.Render();
-    application.SendNotification();
-    application.Render();
-    application.SendNotification();
-
-    DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, false, TEST_LOCATION );
-
-    // simulate a mouse wheel event
-    Vector2 screenCoordinates( 10.0f, 10.0f );
-    Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
-    application.ProcessEvent(event);
-    DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, true, TEST_LOCATION );
-
-    Stage::GetCurrent().Remove(dummy);
-  }
-
-  // Ensure full code coverage
-  {
-    DummyControl dummy = DummyControl::New();
-
-    dummy.SetSize(100.0f, 100.0f);
-    dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-    Stage::GetCurrent().Add(dummy);
-
-    dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
-
-    application.Render();
-    application.SendNotification();
-    application.Render();
-    application.SendNotification();
-
-    // simulate a mouse wheel event
-    Vector2 screenCoordinates( 20.0f, 20.0f );
-    Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
-    application.ProcessEvent(event);
-
-    Stage::GetCurrent().Remove(dummy);
-  }
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DefaultControls.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DefaultControls.cpp
deleted file mode 100644 (file)
index a084f79..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-void dali_default_controls_startup(void)
-{
-  test_return_value = TET_UNDEF;
-}
-
-void dali_default_controls_cleanup(void)
-{
-  test_return_value = TET_PASS;
-}
-
-
-
-int UtcDaliDefaultControlsCreateCheckBoxButton(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliDefaultControlsCreateCheckBoxButton");
-
-  const std::string imagePath( "Facke image path" );
-  const std::string voidImagePath( "" );
-
-  ImageActor image = CreateSolidColorActor( Color::RED );
-  ImageActor voidImage;
-
-  CheckBoxButton button0, button1, button2, button3, button4, button5;
-
-  try
-  {
-    button0 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, voidImagePath );
-    button1 = CreateCheckBoxButton( imagePath, voidImagePath, voidImagePath, voidImagePath );
-    button2 = CreateCheckBoxButton( voidImagePath, imagePath, voidImagePath, voidImagePath );
-    button3 = CreateCheckBoxButton( voidImagePath, voidImagePath, imagePath, voidImagePath );
-    button4 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, imagePath );
-    button5 = CreateCheckBoxButton( imagePath, imagePath, imagePath, imagePath );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-  DALI_TEST_CHECK( button2 );
-  DALI_TEST_CHECK( button3 );
-  DALI_TEST_CHECK( button4 );
-  DALI_TEST_CHECK( button5 );
-
-  try
-  {
-    button0 = CreateCheckBoxButton( voidImage, voidImage, voidImage, voidImage );
-    button1 = CreateCheckBoxButton( image, voidImage, voidImage, voidImage );
-    button2 = CreateCheckBoxButton( voidImage, image, voidImage, voidImage );
-    button3 = CreateCheckBoxButton( voidImage, voidImage, image, voidImage );
-    button4 = CreateCheckBoxButton( voidImage, voidImage, voidImage, image );
-    button5 = CreateCheckBoxButton( image, image, image, image );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-  DALI_TEST_CHECK( button2 );
-  DALI_TEST_CHECK( button3 );
-  DALI_TEST_CHECK( button4 );
-  DALI_TEST_CHECK( button5 );
-
-  try
-  {
-    button0 = CreateCheckBoxButton( voidImagePath, voidImagePath );
-    button1 = CreateCheckBoxButton( voidImagePath, imagePath );
-    button2 = CreateCheckBoxButton( imagePath, voidImagePath );
-    button3 = CreateCheckBoxButton( imagePath, imagePath );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-  DALI_TEST_CHECK( button2 );
-  DALI_TEST_CHECK( button3 );
-
-  try
-  {
-    button0 = CreateCheckBoxButton( voidImage, voidImage );
-    button2 = CreateCheckBoxButton( voidImage, image );
-    button3 = CreateCheckBoxButton( voidImage, image );
-    button4 = CreateCheckBoxButton( image, image );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-  DALI_TEST_CHECK( button2 );
-  DALI_TEST_CHECK( button3 );
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ItemView.cpp
deleted file mode 100644 (file)
index 67715f5..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <float.h>       // for FLT_MAX
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-namespace
-{
-const unsigned int TOTAL_ITEM_NUMBER = 100;
-const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg";
-
-
-// Implementation of ItemFactory for providing actors to ItemView
-class TestItemFactory : public ItemFactory
-{
-public:
-
-  /**
-   * Constructor
-   * @param application class, stored as reference
-   */
-  TestItemFactory()
-  {
-  }
-
-public: // From ItemFactory
-
-  /**
-   * Query the number of items available from the factory.
-   * The maximum available item has an ID of GetNumberOfItems() - 1.
-   */
-  virtual unsigned int GetNumberOfItems()
-  {
-    return TOTAL_ITEM_NUMBER;
-  }
-
-  /**
-   * Create an Actor to represent a visible item.
-   * @param itemId
-   * @return the created actor.
-   */
-  virtual Actor NewItem(unsigned int itemId)
-  {
-    // Create an image actor for this item
-    Image image = Image::New( TEST_IMAGE_FILE_NAME );
-    Actor actor = ImageActor::New(image);
-
-    return actor;
-  }
-};
-
-} // namespace
-
-
-
-int UtcDaliItemViewAddAndGetLayout(void)
-{
-  ToolkitTestApplication application;
-
-  // Create the ItemView actor
-  TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
-
-  // Create a grid layout and add it to ItemView
-  GridLayoutPtr gridLayout = GridLayout::New();
-  view.AddLayout(*gridLayout);
-
-  // As we have added one layout, check the number of layout is now 1
-  DALI_TEST_CHECK(view.GetLayoutCount() == 1);
-
-  // Create a depth layout and add it to ItemView
-  DepthLayoutPtr depthLayout = DepthLayout::New();
-  view.AddLayout(*depthLayout);
-
-  // As we have added another layout, check the number of layout is now 2
-  DALI_TEST_CHECK(view.GetLayoutCount() == 2);
-
-  // Create a spiral layout and add it to ItemView
-  SpiralLayoutPtr spiralLayout = SpiralLayout::New();
-  view.AddLayout(*spiralLayout);
-
-  // As we have added another layout, check the number of layout is now 3
-  DALI_TEST_CHECK(view.GetLayoutCount() == 3);
-
-  // Check we are getting the correct layout from ItemView
-  DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
-  DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
-  DALI_TEST_CHECK(view.GetLayout(2) == spiralLayout);
-  END_TEST;
-}
-
-int UtcDaliItemViewAddAndRemoveLayout(void)
-{
-  ToolkitTestApplication application;
-
-  // Create the ItemView actor
-  TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
-
-  // Create a grid layout and add it to ItemView
-  GridLayoutPtr gridLayout = GridLayout::New();
-  view.AddLayout(*gridLayout);
-
-  // As we have added one layout, check the number of layout is now 1
-  DALI_TEST_CHECK(view.GetLayoutCount() == 1);
-
-  // Create a depth layout and add it to ItemView
-  DepthLayoutPtr depthLayout = DepthLayout::New();
-  view.AddLayout(*depthLayout);
-
-  // As we have added another layout, check the number of layout is now 2
-  DALI_TEST_CHECK(view.GetLayoutCount() == 2);
-
-  // Check we are getting the correct layout from ItemView
-  DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
-  DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
-
-  // Remove the grid layout
-  view.RemoveLayout(0);
-
-  // As we have removed the grid layout, check the number of layout is now 1
-  DALI_TEST_CHECK(view.GetLayoutCount() == 1);
-
-  // Check we are getting the correct layout from ItemView
-  DALI_TEST_CHECK(view.GetLayout(0) == depthLayout);
-
-  // Remove the depth layout
-  view.RemoveLayout(0);
-
-  // As we also removed the depth layout, check the number of layout is now 0
-  DALI_TEST_CHECK(view.GetLayoutCount() == 0);
-  END_TEST;
-}
-
-int UtcDaliItemViewActivateLayoutAndGetActiveLayout(void)
-{
-  ToolkitTestApplication application;
-
-  // Create the ItemView actor
-  TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
-
-  // Create a grid layout and add it to ItemView
-  GridLayoutPtr gridLayout = GridLayout::New();
-  view.AddLayout(*gridLayout);
-
-  // Create a depth layout and add it to ItemView
-  DepthLayoutPtr depthLayout = DepthLayout::New();
-  view.AddLayout(*depthLayout);
-
-  // Create a spiral layout and add it to ItemView
-  SpiralLayoutPtr spiralLayout = SpiralLayout::New();
-  view.AddLayout(*spiralLayout);
-
-  // As we have added three layouts, check the number of layout is now 3
-  DALI_TEST_CHECK(view.GetLayoutCount() == 3);
-
-  // Check there is no active layout at the moment
-  DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
-
-  // Activate the depth layout
-  Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
-  view.ActivateLayout(1, stageSize, 0.5f);
-
-  // Check the current active layout is the depth layout
-  DALI_TEST_CHECK(view.GetActiveLayout() == depthLayout);
-
-  // Activate the grid layout
-  view.ActivateLayout(0, stageSize, 0.5f);
-
-  // Check the current active layout is the grid layout
-  DALI_TEST_CHECK(view.GetActiveLayout() == gridLayout);
-
-  // Activate the spiral layout
-  view.ActivateLayout(2, stageSize, 0.5f);
-
-  // Check the current active layout is the spiral layout
-  DALI_TEST_CHECK(view.GetActiveLayout() == spiralLayout);
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyboardFocusManager.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyboardFocusManager.cpp
deleted file mode 100644 (file)
index 86d0451..0000000
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/key-event-integ.h>
-
-
-using namespace Dali;
-using namespace Dali::Toolkit;
-
-void dali_keyboard_focus_manager_startup(void)
-{
-  test_return_value = TET_UNDEF;
-}
-
-void dali_keyboard_focus_manager_cleanup(void)
-{
-  test_return_value = TET_PASS;
-}
-
-
-namespace
-{
-
-// Functors to test whether PreFocusChange signal is emitted when the keyboard focus is about to change
-class PreFocusChangeCallback : public Dali::ConnectionTracker
-{
-public:
-  PreFocusChangeCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived),
-    mCurrentFocusedActor(),
-    mProposedActorToFocus(),
-    mDirection(Control::Left)
-  {
-  }
-
-  Actor Callback(Actor currentFocusedActor, Actor proposedActorToFocus, Control::KeyboardFocusNavigationDirection direction)
-  {
-    tet_infoline("Verifying PreFocusChangeCallback()");
-
-    mSignalVerified = true;
-
-    mCurrentFocusedActor = currentFocusedActor;
-    mProposedActorToFocus = proposedActorToFocus;
-    mDirection = direction;
-
-    return mProposedActorToFocus;
-  }
-
-  void Reset()
-  {
-    mSignalVerified = false;
-    mCurrentFocusedActor = Actor();
-    mProposedActorToFocus = Actor();
-    mDirection = Control::Left;
-  }
-
-  bool& mSignalVerified;
-  Actor mCurrentFocusedActor;
-  Actor mProposedActorToFocus;
-  Control::KeyboardFocusNavigationDirection mDirection;
-};
-
-// Functors to test whether focus changed signal is emitted when the keyboard focus is changed
-class FocusChangedCallback : public Dali::ConnectionTracker
-{
-public:
-  FocusChangedCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived),
-    mOriginalFocusedActor(),
-    mCurrentFocusedActor()
-  {
-  }
-
-  void Callback(Actor originalFocusedActor, Actor currentFocusedActor)
-  {
-    tet_infoline("Verifying FocusChangedCallback()");
-
-    if(originalFocusedActor == mCurrentFocusedActor)
-    {
-      mSignalVerified = true;
-    }
-
-    mOriginalFocusedActor = originalFocusedActor;
-    mCurrentFocusedActor = currentFocusedActor;
-  }
-
-  void Reset()
-  {
-    mSignalVerified = false;
-  }
-
-  bool& mSignalVerified;
-  Actor mOriginalFocusedActor;
-  Actor mCurrentFocusedActor;
-};
-
-// Functors to test whether focus group changed signal is emitted when the keyboard focus group is changed
-class FocusGroupChangedCallback : public Dali::ConnectionTracker
-{
-public:
-  FocusGroupChangedCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived),
-    mCurrentFocusedActor(),
-    mForward(true)
-  {
-  }
-
-  void Callback(Actor currentFocusedActor, bool forward)
-  {
-    tet_infoline("Verifying FocusGroupChangedCallback()");
-
-    mSignalVerified = true;
-
-    mCurrentFocusedActor = currentFocusedActor;
-    mForward = forward;
-  }
-
-  void Reset()
-  {
-    mSignalVerified = false;
-  }
-
-  bool& mSignalVerified;
-  Actor mCurrentFocusedActor;
-  bool mForward;
-};
-
-// Functors to test whether focused actor activated signal is emitted when the focused actor is activated
-class FocusedActorActivatedCallback : public Dali::ConnectionTracker
-{
-public:
-  FocusedActorActivatedCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived),
-    mActivatedActor()
-  {
-  }
-
-  void Callback(Actor activatedActor)
-  {
-    tet_infoline("Verifying FocusedActorActivatedCallback()");
-
-    mSignalVerified = true;
-
-    mActivatedActor = activatedActor;
-  }
-
-  void Reset()
-  {
-    mSignalVerified = false;
-  }
-
-  bool& mSignalVerified;
-  Actor mActivatedActor;
-};
-
-} // namespace
-
-
-
-int UtcDaliKeyboardFocusManagerGet(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliKeyboardKeyboardFocusManagerGet");
-
-  // Register Type
-  TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
-  BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
-
-  KeyboardFocusManager manager;
-
-  manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK(manager);
-
-  KeyboardFocusManager newManager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK(newManager);
-
-  // Check that focus manager is a singleton
-  DALI_TEST_CHECK(manager == newManager);
-  END_TEST;
-}
-
-
-
-int UtcDaliKeyboardFocusManagerMoveFocus(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliKeyboardFocusManagerMoveFocus");
-
-  // Register Type
-  TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
-  BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
-
-  KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK(manager);
-
-  bool preFocusChangeSignalVerified = false;
-  PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified);
-  manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
-
-  bool focusChangedSignalVerified = false;
-  FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
-
-  // Create the first actor and add it to the stage
-  Actor first = Actor::New();
-  first.SetKeyboardFocusable(true);
-  Stage::GetCurrent().Add(first);
-
-  // Create the second actor and add it to the stage
-  Actor second = Actor::New();
-  second.SetKeyboardFocusable(true);
-  Stage::GetCurrent().Add(second);
-
-  // Move the focus to the right
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == false);
-
-  // Because no layout control in the stage and no actor is focused, it should emit the PreFocusChange signal
-  DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
-  DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == Actor());
-  DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
-  DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Right);
-  preFocusChangeCallback.Reset();
-
-  // Check that the focus is set on the first actor
-  DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
-  focusChangedCallback.Reset();
-
-  // Move the focus towards right
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == false);
-
-  // Because no layout control in the stage and the first actor is focused, it should emit the PreFocusChange signal
-  DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
-  DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
-  DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
-  DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Right);
-  preFocusChangeCallback.Reset();
-
-  // Check that the focus is set on the second actor
-  DALI_TEST_CHECK(manager.SetCurrentFocusActor(second) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
-  focusChangedCallback.Reset();
-
-  // Move the focus towards up
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Up) == false);
-
-  // Because no layout control in the stage and no actor is focused, it should emit the PreFocusChange signal
-  DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
-  DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == second);
-  DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
-  DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Up);
-  preFocusChangeCallback.Reset();
-  DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
-
-  // Create a 2x2 table view and try to move focus inside it
-  TableView tableView = TableView::New( 2, 2 );
-  Stage::GetCurrent().Add(tableView);
-
-  // Create the third actor
-  Actor third = Actor::New();
-  third.SetKeyboardFocusable(true);
-
-  // Create the fourth actor
-  Actor fourth = Actor::New();
-  fourth.SetKeyboardFocusable(true);
-
-  // Add the four children to table view
-  tableView.AddChild(first, TableView::CellPosition(0, 0));
-  tableView.AddChild(second, TableView::CellPosition(0, 1));
-  tableView.AddChild(third, TableView::CellPosition(1, 0));
-  tableView.AddChild(fourth, TableView::CellPosition(1, 1));
-
-  // Set the focus to the first actor
-  DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
-  focusChangedCallback.Reset();
-
-  // Move the focus towards right
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
-  focusChangedCallback.Reset();
-
-  // Move the focus towards down
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Down) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
-  focusChangedCallback.Reset();
-
-  // Move the focus towards left
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == third);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == fourth);
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == third);
-  focusChangedCallback.Reset();
-
-  // Move the focus towards up
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Up) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == third);
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
-  focusChangedCallback.Reset();
-
-  // Move the focus towards left. The focus move will fail as no way to move it upwards
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == false);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
-  DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
-  DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
-  DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
-  DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Left);
-  preFocusChangeCallback.Reset();
-  DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
-
-  // Enable the loop
-  manager.SetFocusGroupLoop(true);
-  DALI_TEST_CHECK(manager.GetFocusGroupLoop() == true);
-
-  // Move the focus towards left again. The focus should move to the fourth actor.
-  DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
-  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
-  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
-  focusChangedCallback.Reset();
-  END_TEST;
-}
-
-
-int UtcDaliKeyboardFocusManagerSignalFocusGroupChanged(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliKeyboardFocusManagerSignalFocusGroupChanged");
-
-  // Register Type
-  TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
-  BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
-
-  KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK(manager);
-
-  bool focusGroupChangedSignalVerified = false;
-  FocusGroupChangedCallback focusGroupChangedCallback(focusGroupChangedSignalVerified);
-  manager.FocusGroupChangedSignal().Connect( &focusGroupChangedCallback, &FocusGroupChangedCallback::Callback );
-
-  Integration::KeyEvent tabEvent("Tab", "", 0, 0, 0, Integration::KeyEvent::Down);
-  Integration::KeyEvent shiftTabEvent("Tab", "", 0, 1, 0, Integration::KeyEvent::Down);
-
-  // Send the tab event to change focus group in the forward direction
-  application.ProcessEvent(tabEvent);
-  DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
-  DALI_TEST_CHECK(focusGroupChangedCallback.mForward == true);
-  focusGroupChangedCallback.Reset();
-
-  // Send the shift tab event to change focus group in the backward direction
-  application.ProcessEvent(shiftTabEvent);
-  DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
-  DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
-  DALI_TEST_CHECK(focusGroupChangedCallback.mForward == false);
-  focusGroupChangedCallback.Reset();
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollViewEffect.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollViewEffect.cpp
deleted file mode 100644 (file)
index 487e66c..0000000
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- *
- */
-
-#include <iostream>
-
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
-
-
-using namespace Dali;
-using namespace Toolkit;
-
-void dali_scroll_view_effect_startup(void)
-{
-  test_return_value = TET_UNDEF;
-}
-
-void dali_scroll_view_effect_cleanup(void)
-{
-  test_return_value = TET_PASS;
-}
-
-namespace
-{
-
-const int MILLISECONDS_PER_SECOND = 1000;
-const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
-const int RENDER_ANIMATION_TEST_DURATION_MS = 1000;             ///< 1000ms to test animation
-const int RENDER_DELAY_SCROLL = 1000;                           ///< duration to wait for any scroll to complete.
-
-/*
- * Simulate time passed by.
- *
- * @note this will always process at least 1 frame (1/60 sec)
- *
- * @param application Test application instance
- * @param duration Time to pass in milliseconds.
- * @return The actual time passed in milliseconds
- */
-int Wait(ToolkitTestApplication& application, int duration = 0)
-{
-  int time = 0;
-
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
-  {
-    application.SendNotification();
-    application.Render(RENDER_FRAME_INTERVAL);
-    time += RENDER_FRAME_INTERVAL;
-  }
-
-  return time;
-}
-
-/**
- * Creates a Ruler that snaps to a specified grid size.
- * If that grid size is 0.0 then this ruler does not
- * snap.
- *
- * @param[in] gridSize (optional) The grid size for the ruler,
- * (Default = 0.0 i.e. no snapping)
- * @return The ruler is returned.
- */
-RulerPtr CreateRuler(float gridSize = 0.0f)
-{
-  if(gridSize <= Math::MACHINE_EPSILON_0)
-  {
-      return new DefaultRuler();
-  }
-  return new FixedRuler(gridSize);
-}
-
-// Callback probes.
-
-static bool gOnScrollStartCalled;                       ///< Whether the OnScrollStart signal was invoked.
-static bool gOnScrollUpdateCalled;                      ///< Whether the OnScrollUpdate signal was invoked.
-static bool gOnScrollCompleteCalled;                    ///< Whether the OnScrollComplete signal was invoked.
-static Vector3 gConstraintResult;                       ///< Result from constraint.
-
-static ActorContainer gPages;                                ///< Keeps track of all the pages for applying effects.
-
-static void ResetScrollCallbackResults()
-{
-  gOnScrollStartCalled = false;
-  gOnScrollUpdateCalled = false;
-  gOnScrollCompleteCalled = false;
-}
-
-/**
- * Invoked when scrolling starts.
- *
- * @param[in] position The current scroll position.
- */
-static void OnScrollStart( const Vector3& position )
-{
-  gOnScrollStartCalled = true;
-}
-
-/**
- * Invoked when scrolling updates (via dragging)
- *
- * @param[in] position The current scroll position.
- */
-static void OnScrollUpdate( const Vector3& position )
-{
-  gOnScrollUpdateCalled = true;
-}
-
-/**
- * Invoked when scrolling finishes
- *
- * @param[in] position The current scroll position.
- */
-static void OnScrollComplete( const Vector3& position )
-{
-  gOnScrollCompleteCalled = true;
-}
-
-
-ScrollView SetupTestScrollView(int rows, int columns, Vector2 size)
-{
-  ScrollView scrollView = ScrollView::New();
-  scrollView.SetSize(size);
-  scrollView.SetAnchorPoint(AnchorPoint::CENTER);
-  scrollView.SetParentOrigin(ParentOrigin::CENTER);
-  scrollView.ApplyConstraint( Constraint::New<Dali::Vector3>( Dali::Actor::SIZE, Dali::ParentSource( Dali::Actor::SIZE ), Dali::EqualToConstraint() ) );
-  scrollView.SetWrapMode(false);
-  scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
-  scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
-  scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
-  Stage::GetCurrent().Add( scrollView );
-  RulerPtr rulerX = CreateRuler(size.width);
-  RulerPtr rulerY = CreateRuler(size.height);
-  if(columns > 1)
-  {
-    rulerX->SetDomain(RulerDomain(0.0f, size.width * columns));
-  }
-  else
-  {
-    rulerX->Disable();
-  }
-  if(rows > 1)
-  {
-    rulerY->SetDomain(RulerDomain(0.0f, size.width * rows));
-  }
-  else
-  {
-    rulerY->Disable();
-  }
-
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
-  Stage::GetCurrent().Add( scrollView );
-
-  Actor container = Actor::New();
-  container.SetParentOrigin(ParentOrigin::CENTER);
-  container.SetAnchorPoint(AnchorPoint::CENTER);
-  container.SetSize( size );
-  scrollView.Add( container );
-  container.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
-
-  gPages.clear();
-  for(int row = 0;row<rows;row++)
-  {
-    for(int column = 0;column<columns;column++)
-    {
-      Actor page = Actor::New();
-      page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
-      page.SetParentOrigin( ParentOrigin::CENTER );
-      page.SetAnchorPoint( AnchorPoint::CENTER );
-      page.SetPosition( column * size.x, row * size.y );
-      container.Add(page);
-
-      gPages.push_back(page);
-    }
-  }
-
-  ResetScrollCallbackResults();
-  return scrollView;
-}
-
-void CleanupTest()
-{
-  gPages.clear();
-  ResetScrollCallbackResults();
-}
-
-Actor AddActorToPage(Actor page, float x, float y, float cols, float rows)
-{
-  Stage stage = Stage::GetCurrent();
-  Vector2 stageSize = stage.GetSize();
-
-  const float margin = 10.0f;
-  const Vector2 actorSize((stageSize.x / cols) - margin, (stageSize.y / rows) - margin);
-
-  Actor actor = Actor::New();
-  actor.SetParentOrigin( ParentOrigin::CENTER );
-  actor.SetAnchorPoint( AnchorPoint::CENTER );
-
-  Vector3 position( margin * 0.5f + (actorSize.x + margin) * x - stageSize.width * 0.5f,
-                    margin * 0.5f + (actorSize.y + margin) * y - stageSize.height * 0.5f,
-                    0.0f);
-  Vector3 positionEnd( margin * 0.5f + (actorSize.x + margin) * (x + cols) - stageSize.width * 0.5f - margin,
-                       margin * 0.5f + (actorSize.y + margin) * (y + rows) - stageSize.height * 0.5f - margin,
-                       0.0f);
-  Vector3 size(positionEnd - position);
-  actor.SetPosition( position + size * 0.5f);
-  actor.SetSize( positionEnd - position );
-  page.Add(actor);
-  return actor;
-}
-
-} // unnamed namespace
-
-
-int UtcDaliScrollViewPageCubeEffectSetup(void)
-{
-  tet_infoline(" UtcDaliScrollViewPageCubeEffectSetup");
-
-  ScrollViewPageCubeEffect effect;
-
-  DALI_TEST_CHECK( !effect );
-
-  BaseHandle handle = ScrollViewPageCubeEffect::New();
-
-  DALI_TEST_CHECK( handle );
-
-  effect = ScrollViewPageCubeEffect::DownCast(handle);
-
-  DALI_TEST_CHECK( effect );
-  END_TEST;
-}
-
-
-int UtcDaliScrollViewPageCarouselEffectSetup(void)
-{
-  tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
-
-  ScrollViewPageCarouselEffect effect;
-
-  DALI_TEST_CHECK( !effect );
-
-  BaseHandle handle = ScrollViewPageCarouselEffect::New();
-
-  DALI_TEST_CHECK( handle );
-
-  effect = ScrollViewPageCarouselEffect::DownCast(handle);
-
-  DALI_TEST_CHECK( effect );
-  END_TEST;
-}
-
-int UtcDaliScrollViewCarouselEffectSetup(void)
-{
-  tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
-
-  ScrollViewCarouselEffect effect;
-
-  DALI_TEST_CHECK( !effect );
-
-  BaseHandle handle = ScrollViewCarouselEffect::New();
-
-  DALI_TEST_CHECK( handle );
-
-  effect = ScrollViewCarouselEffect::DownCast(handle);
-
-  DALI_TEST_CHECK( effect );
-  END_TEST;
-}
-
-int UtcDaliScrollViewDepthEffectSetup(void)
-{
-  tet_infoline(" UtcDaliScrollViewDepthEffectSetup");
-
-  ScrollViewDepthEffect effect;
-
-  DALI_TEST_CHECK( !effect );
-
-  BaseHandle handle = ScrollViewDepthEffect::New();
-
-  DALI_TEST_CHECK( handle );
-
-  effect = ScrollViewDepthEffect::DownCast(handle);
-
-  DALI_TEST_CHECK( effect );
-  END_TEST;
-}
-
-
-int UtcDaliScrollViewPageCubeEffectTest(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliScrollViewPageCubeEffectTest");
-
-  Vector2 size = Stage::GetCurrent().GetSize();
-
-  ScrollView scrollView = SetupTestScrollView(1, 3, size);
-  Actor testPage = gPages[1];
-  Wait(application, 500);
-
-  ScrollViewPageCubeEffect effect = ScrollViewPageCubeEffect::New();
-  scrollView.ApplyEffect(effect);
-
-  for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
-  {
-    Actor page = *pageIter;
-    page.RemoveConstraints();
-    page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
-    effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f));
-  }
-  Wait(application);
-
-  scrollView.ScrollTo(1);
-  while(!gOnScrollCompleteCalled)
-  {
-    Wait(application);
-  }
-  // test that the first page has reached centre of screen
-  Vector3 pagePos = testPage.GetCurrentPosition();
-  DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
-  CleanupTest();
-  END_TEST;
-}
-
-int UtcDaliScrollViewPageCarouselEffectTest(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliScrollViewPageCarouselEffectTest");
-
-  Vector2 size = Stage::GetCurrent().GetSize();
-
-  ScrollView scrollView = SetupTestScrollView(1, 3, size);
-  Actor testPage = gPages[1];
-  Wait(application, 500);
-
-  ScrollViewPageCarouselEffect effect = ScrollViewPageCarouselEffect::New();
-  scrollView.ApplyEffect(effect);
-
-  for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
-  {
-    Actor page = *pageIter;
-    page.RemoveConstraints();
-    page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
-    effect.ApplyToPage(page);
-  }
-  Wait(application);
-
-  scrollView.ScrollTo(1, 0.5f, DirectionBiasNone);
-  while(!gOnScrollCompleteCalled)
-  {
-    Wait(application);
-  }
-  // test that the first page has reached centre of screen
-  Vector3 pagePos = testPage.GetCurrentPosition();
-  DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
-  CleanupTest();
-  END_TEST;
-}
-
-int UtcDaliScrollViewCarouselEffectTest(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliScrollViewCarouselEffectTest");
-
-  Vector2 size = Stage::GetCurrent().GetSize();
-
-  ScrollView scrollView = SetupTestScrollView(1, 3, size);
-  Actor testPage = gPages[1];
-  Wait(application, 500);
-
-  ScrollViewCarouselEffect effect = ScrollViewCarouselEffect::New();
-  scrollView.ApplyEffect(effect);
-
-  Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
-  Wait(application);
-  Vector3 actorPrePosition = actor.GetCurrentPosition();
-
-  effect.ApplyToActor( actor, Vector2(1.2f, 1.2f) );
-
-  scrollView.ScrollTo(Vector3(size.x, 0.0f, 0.0f), 0.5f, DirectionBiasNone, DirectionBiasNone);
-  while(!gOnScrollCompleteCalled)
-  {
-    Wait(application);
-  }
-  // test that the first page has reached centre of screen
-  Vector3 actorPostPosition = actor.GetCurrentPosition();
-  // just check the actor has moved
-  DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
-  CleanupTest();
-  END_TEST;
-}
-
-int UtcDaliScrollViewDepthEffectTest(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliScrollViewDepthEffectTest");
-
-  Vector2 size = Stage::GetCurrent().GetSize();
-
-  ScrollView scrollView = SetupTestScrollView(1, 3, size);
-  Actor testPage = gPages[1];
-  Wait(application, 500);
-
-  ScrollViewDepthEffect effect = ScrollViewDepthEffect::New();
-  scrollView.ApplyEffect(effect);
-
-  Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
-  Wait(application);
-  Vector3 actorPrePosition = actor.GetCurrentPosition();
-
-  const Vector2 positionExtent(0.5f, 2.5f);
-  const Vector2 offsetExtent(1.0f, 1.0f);
-  const float positionScale(1.5f);
-  const float scaleExtent(0.5f);
-
-  effect.ApplyToActor( actor, positionExtent, offsetExtent, positionScale, scaleExtent );
-
-  scrollView.ScrollTo(1);
-  while(!gOnScrollCompleteCalled)
-  {
-    Wait(application);
-  }
-  // test that the first page has reached centre of screen
-  Vector3 actorPostPosition = actor.GetCurrentPosition();
-  // just check the actor has moved
-  DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
-  CleanupTest();
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp
deleted file mode 100644 (file)
index 52d91f4..0000000
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/key-event-integ.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-
-int UtcDaliTextInputSetActiveStyle(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline("Testing Setting of Style to newly added text");
-
-  TextInput textInput = TextInput::New();  // create empty TextInput
-
-  Stage::GetCurrent().Add(textInput);
-
-  const std::string styledString = "Test String<i>ab</i>" ;
-  const std::string plainString = "Test String";
-  textInput.SetInitialText( plainString );
-
-  application.SendNotification();
-  application.Render();
-
-  textInput.SetEditable(true);
-
-  std::string retreivedMarkupString = textInput.GetMarkupText();
-
-  tet_infoline("Confirm markup text is a plain string ");
-  DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
-
-  TextStyle style;
-  style.SetItalics( true );
-
-  tet_infoline("Apply style to TextInput");
-  textInput.SetActiveStyle( style );
-
-  Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
-  Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
-
-  application.SendNotification();
-  application.Render();
-
-  application.ProcessEvent(eventA);
-  application.SendNotification();
-  application.Render();
-
-  application.ProcessEvent(eventB);
-  application.SendNotification();
-  application.Render();
-
-  retreivedMarkupString = textInput.GetMarkupText();
-
-  DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
-  END_TEST;
-}
-
-int UtcDaliTextInputApplyStyleToSelectedText(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline("Testing application of style to selected text ");
-
-  TextInput textInput = TextInput::New();  // create empty TextInput
-
-  Stage::GetCurrent().Add(textInput);
-
-  const std::string styledString = "Test <i>String</i> to style";
-  const std::string plainString = "Test String to style";
-  textInput.SetInitialText( plainString );
-
-  application.SendNotification();
-  application.Render();
-
-  textInput.SetEditable(true);
-
-  std::string retreivedMarkupString = textInput.GetMarkupText();
-
-  tet_infoline("Confirm markup text is a plain string ");
-  DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
-
-  TextStyle style;
-  style.SetItalics( true );
-
-  textInput.SelectText( 5, 11 );
-
-  tet_infoline("Apply style to selected text");
-  textInput.ApplyStyle( style );
-
-  application.Render();
-
-  retreivedMarkupString = textInput.GetMarkupText();
-
-  DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
-  END_TEST;
-}
-
-int UtcDaliTextInputApplyStyleToAll(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline("Testing application of style to all text ");
-
-  TextInput textInput = TextInput::New();  // create empty TextInput
-
-  Stage::GetCurrent().Add(textInput);
-
-  const std::string styledString = "<i>Test String to style</i>";
-  const std::string plainString = "Test String to style";
-  textInput.SetInitialText( plainString );
-
-  application.SendNotification();
-  application.Render();
-
-  textInput.SetEditable(true);
-
-  std::string retreivedMarkupString = textInput.GetMarkupText();
-
-  tet_infoline("Confirm markup text is a plain string ");
-  DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
-
-  TextStyle style;
-  style.SetItalics( true );
-
-  tet_infoline("Apply style to all text");
-  textInput.ApplyStyleToAll( style );
-
-  application.Render();
-
-  retreivedMarkupString = textInput.GetMarkupText();
-
-  DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
-  END_TEST;
-}
-
-int UtcDaliTextInputGetStyleAtCursor(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline("Test getting style at cursor");
-
-  TextInput textInput = TextInput::New();  // create empty TextInput
-
-  Stage::GetCurrent().Add(textInput);
-
-  const std::string styledString = "Test Stringa<i>b</i>" ;
-  const std::string plainString = "Test String";
-  textInput.SetInitialText( plainString );
-
-  application.SendNotification();
-  application.Render();
-
-  textInput.SetEditable(true);
-
-  tet_infoline("Confirm style at cursor is default(plain)");
-  TextStyle style;
-  Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
-  application.ProcessEvent(eventA);
-  application.SendNotification();
-  application.Render();
-
-  TextStyle retreivedStyleAtCursor = textInput.GetStyleAtCursor();
-
-  DALI_TEST_CHECK( style == retreivedStyleAtCursor );
-  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsItalicsEnabled() );
-
-  tet_infoline("Set style before adding new character");
-  style.SetItalics( true );
-  textInput.SetActiveStyle( style );
-
-  Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
-  application.ProcessEvent(eventB);
-  application.SendNotification();
-  application.Render();
-
-  tet_infoline("Confirm style at cursor is correct style");
-  retreivedStyleAtCursor = textInput.GetStyleAtCursor();
-
-  DALI_TEST_CHECK( retreivedStyleAtCursor.IsItalicsEnabled() );
-
-  tet_infoline("Confirm style at cursor is not a style that was not set");
-  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsUnderlineEnabled() );
-
-  tet_infoline("Confirm markup text is correct");
-  DALI_TEST_EQUALS( styledString, textInput.GetMarkupText(), TEST_LOCATION);
-
-
-
-  END_TEST;
-}
-
-int UtcDaliTextInputSetAndGetTextAlignment(void)
-{
-  ToolkitTestApplication application;
-
-  TextInput textInput = TextInput::New();
-  textInput.SetTextAlignment(static_cast<Alignment::Type>( Alignment::HorizontalCenter) );
-
-  bool result = ( textInput.GetTextAlignment() & Alignment::HorizontalCenter ) ;
-
-  DALI_TEST_CHECK( result );
-
-  result = ( textInput.GetTextAlignment() & Alignment::HorizontalRight );
-
-  DALI_TEST_CHECK( !result );
-  END_TEST;
-}
-
-int UtcDaliTextInputSetAndGetMultilinePolicy(void)
-{
-  ToolkitTestApplication application;
-
-  const TextView::MultilinePolicy MULTILINE_POLICIES[] = { TextView::SplitByNewLineChar, TextView::SplitByWord, TextView::SplitByChar };
-  const unsigned int NUM_MULTILINE_POLICIES = sizeof( MULTILINE_POLICIES ) / sizeof( unsigned int );
-
-  TextInput textInput = TextInput::New();
-  Stage::GetCurrent().Add(textInput);
-  textInput.SetInitialText( "Hello world!" );
-
-  for( unsigned int epIndex = 0; epIndex < NUM_MULTILINE_POLICIES; ++epIndex )
-  {
-    textInput.SetMultilinePolicy( MULTILINE_POLICIES[epIndex] );
-
-    DALI_TEST_EQUALS( textInput.GetMultilinePolicy(), MULTILINE_POLICIES[epIndex], TEST_LOCATION );
-  }
-  END_TEST;
-}
-
-int UtcDaliTextInputSetAndGetExceedEnabled(void)
-{
-  ToolkitTestApplication application;
-
-  const TextView::ExceedPolicy EXCEED_POLICIES[] = { TextView::Original, TextView::Fade, TextView::Split, TextView::ShrinkToFit };
-  const unsigned int NUM_EXCEED_POLICIES = sizeof( EXCEED_POLICIES ) / sizeof( unsigned int );
-
-  TextInput textInput = TextInput::New();
-  Stage::GetCurrent().Add(textInput);
-  textInput.SetInitialText( "Hello world!" );
-
-  for( unsigned int epIndex = 0; epIndex < NUM_EXCEED_POLICIES; ++epIndex )
-  {
-    textInput.SetWidthExceedPolicy( EXCEED_POLICIES[epIndex] );
-
-    DALI_TEST_EQUALS( textInput.GetWidthExceedPolicy(), EXCEED_POLICIES[epIndex], TEST_LOCATION );
-  }
-  END_TEST;
-}
index 0ebd611..7709cda 100644 (file)
@@ -8,7 +8,40 @@ SET(CAPI_LIB "dali-toolkit")
 # List of test case sources (Only these get parsed for test cases)
 SET(TC_SOURCES
    utc-Dali-Alignment.cpp
+   utc-Dali-BendyEffect.cpp
+   utc-Dali-BlindEffect.cpp
+   utc-Dali-BloomView.cpp
    utc-Dali-BubbleEmitter.cpp
+   utc-Dali-Builder.cpp
+   utc-Dali-CarouselEffect.cpp
+   utc-Dali-CheckBoxButton.cpp
+   utc-Dali-Cluster.cpp
+   utc-Dali-CubeTransitionEffect.cpp
+   utc-Dali-DepthLayout.cpp
+   utc-Dali-DisplacementEffect.cpp
+   utc-Dali-DistanceFieldEffect.cpp
+   utc-Dali-GaussianBlurView.cpp
+   utc-Dali-JsonParser.cpp
+   utc-Dali-KeyInputFocusManager.cpp
+   utc-Dali-NavigationControl.cpp
+   utc-Dali-NavigationLayout.cpp
+   utc-Dali-OverlayEffect.cpp
+   utc-Dali-Page.cpp
+   utc-Dali-PageTurnEffect.cpp
+   utc-Dali-PageTurnView.cpp
+   utc-Dali-RollLayout.cpp
+   utc-Dali-ScrollView.cpp
+   utc-Dali-ShadowView.cpp
+   utc-Dali-ShearEffect.cpp
+   utc-Dali-Slider.cpp
+   utc-Dali-SoftButtonEffect.cpp
+   utc-Dali-SpiralLayout.cpp
+   utc-Dali-SpotEffect.cpp
+   utc-Dali-SquareDissolveEffect.cpp
+   utc-Dali-TableView.cpp
+   utc-Dali-ToolBar.cpp
+   utc-Dali-View.cpp
+   utc-Dali-WaterEffect.cpp
    utc-Dali-Button.cpp
    utc-Dali-Control.cpp
    utc-Dali-ControlImpl.cpp
@@ -25,9 +58,11 @@ SET(TC_SOURCES
    utc-Dali-NinePatchMaskEffect.cpp
    utc-Dali-Popup.cpp
    utc-Dali-PushButton.cpp
+   utc-Dali-RadioButton.cpp
    utc-Dali-Ripple2DEffect.cpp
    utc-Dali-RippleEffect.cpp
    utc-Dali-ScrollViewEffect.cpp
+   utc-Dali-StyleManager.cpp
    utc-Dali-SuperBlurView.cpp
    utc-Dali-SwirlEffect.cpp
    utc-Dali-TextInput.cpp
index 869f9a6..6965f35 100644 (file)
@@ -734,3 +734,84 @@ int UtcDaliControlImplKeyInputFocusLost(void)
   }
   END_TEST;
 }
+
+int UtcDaliControlImplTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  // Register Type
+  TypeInfo type;
+  type = TypeRegistry::Get().GetTypeInfo( "Control" );
+  DALI_TEST_CHECK( type );
+  BaseHandle handle = type.CreateInstance();
+  DALI_TEST_CHECK( handle );
+
+  // Check if it's a control
+  DALI_TEST_CHECK( Control::DownCast(handle) );
+  END_TEST;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+namespace
+{
+static bool MouseWheelEventCallback(Actor actor, const MouseWheelEvent& event)
+{
+  return false;
+}
+}
+
+int UtcDaliControlImplMouseWheelEvent(void)
+{
+  ToolkitTestApplication application;
+
+  {
+    DummyControl dummy = DummyControl::New( true );
+    DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
+
+    dummy.SetSize(100.0f, 100.0f);
+    dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+    Stage::GetCurrent().Add(dummy);
+
+    dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
+
+    application.Render();
+    application.SendNotification();
+    application.Render();
+    application.SendNotification();
+
+    DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, false, TEST_LOCATION );
+
+    // simulate a mouse wheel event
+    Vector2 screenCoordinates( 10.0f, 10.0f );
+    Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
+    application.ProcessEvent(event);
+    DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, true, TEST_LOCATION );
+
+    Stage::GetCurrent().Remove(dummy);
+  }
+
+  // Ensure full code coverage
+  {
+    DummyControl dummy = DummyControl::New();
+
+    dummy.SetSize(100.0f, 100.0f);
+    dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+    Stage::GetCurrent().Add(dummy);
+
+    dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
+
+    application.Render();
+    application.SendNotification();
+    application.Render();
+    application.SendNotification();
+
+    // simulate a mouse wheel event
+    Vector2 screenCoordinates( 20.0f, 20.0f );
+    Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
+    application.ProcessEvent(event);
+
+    Stage::GetCurrent().Remove(dummy);
+  }
+  END_TEST;
+}
index 947f530..7b1421d 100644 (file)
@@ -141,3 +141,95 @@ int UtcDaliDefaultControlsCreatePushButton(void)
   DALI_TEST_CHECK( button1 );
   END_TEST;
 }
+
+int UtcDaliDefaultControlsCreateCheckBoxButton(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliDefaultControlsCreateCheckBoxButton");
+
+  const std::string imagePath( "Facke image path" );
+  const std::string voidImagePath( "" );
+
+  ImageActor image = CreateSolidColorActor( Color::RED );
+  ImageActor voidImage;
+
+  CheckBoxButton button0, button1, button2, button3, button4, button5;
+
+  try
+  {
+    button0 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, voidImagePath );
+    button1 = CreateCheckBoxButton( imagePath, voidImagePath, voidImagePath, voidImagePath );
+    button2 = CreateCheckBoxButton( voidImagePath, imagePath, voidImagePath, voidImagePath );
+    button3 = CreateCheckBoxButton( voidImagePath, voidImagePath, imagePath, voidImagePath );
+    button4 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, imagePath );
+    button5 = CreateCheckBoxButton( imagePath, imagePath, imagePath, imagePath );
+  }
+  catch( ... )
+  {
+    tet_result( TET_FAIL );
+  }
+
+  DALI_TEST_CHECK( button0 );
+  DALI_TEST_CHECK( button1 );
+  DALI_TEST_CHECK( button2 );
+  DALI_TEST_CHECK( button3 );
+  DALI_TEST_CHECK( button4 );
+  DALI_TEST_CHECK( button5 );
+
+  try
+  {
+    button0 = CreateCheckBoxButton( voidImage, voidImage, voidImage, voidImage );
+    button1 = CreateCheckBoxButton( image, voidImage, voidImage, voidImage );
+    button2 = CreateCheckBoxButton( voidImage, image, voidImage, voidImage );
+    button3 = CreateCheckBoxButton( voidImage, voidImage, image, voidImage );
+    button4 = CreateCheckBoxButton( voidImage, voidImage, voidImage, image );
+    button5 = CreateCheckBoxButton( image, image, image, image );
+  }
+  catch( ... )
+  {
+    tet_result( TET_FAIL );
+  }
+
+  DALI_TEST_CHECK( button0 );
+  DALI_TEST_CHECK( button1 );
+  DALI_TEST_CHECK( button2 );
+  DALI_TEST_CHECK( button3 );
+  DALI_TEST_CHECK( button4 );
+  DALI_TEST_CHECK( button5 );
+
+  try
+  {
+    button0 = CreateCheckBoxButton( voidImagePath, voidImagePath );
+    button1 = CreateCheckBoxButton( voidImagePath, imagePath );
+    button2 = CreateCheckBoxButton( imagePath, voidImagePath );
+    button3 = CreateCheckBoxButton( imagePath, imagePath );
+  }
+  catch( ... )
+  {
+    tet_result( TET_FAIL );
+  }
+
+  DALI_TEST_CHECK( button0 );
+  DALI_TEST_CHECK( button1 );
+  DALI_TEST_CHECK( button2 );
+  DALI_TEST_CHECK( button3 );
+
+  try
+  {
+    button0 = CreateCheckBoxButton( voidImage, voidImage );
+    button2 = CreateCheckBoxButton( voidImage, image );
+    button3 = CreateCheckBoxButton( voidImage, image );
+    button4 = CreateCheckBoxButton( image, image );
+  }
+  catch( ... )
+  {
+    tet_result( TET_FAIL );
+  }
+
+  DALI_TEST_CHECK( button0 );
+  DALI_TEST_CHECK( button1 );
+  DALI_TEST_CHECK( button2 );
+  DALI_TEST_CHECK( button3 );
+  END_TEST;
+}
index 6b8fdef..a565f6e 100644 (file)
@@ -149,9 +149,24 @@ int UtcDaliItemViewAddAndGetLayout(void)
   // As we have added one layout, check the number of layout is now 1
   DALI_TEST_CHECK(view.GetLayoutCount() == 1);
 
+  // Create a depth layout and add it to ItemView
+  DepthLayoutPtr depthLayout = DepthLayout::New();
+  view.AddLayout(*depthLayout);
+
+  // As we have added another layout, check the number of layout is now 2
+  DALI_TEST_CHECK(view.GetLayoutCount() == 2);
+
+  // Create a spiral layout and add it to ItemView
+  SpiralLayoutPtr spiralLayout = SpiralLayout::New();
+  view.AddLayout(*spiralLayout);
+
+  // As we have added another layout, check the number of layout is now 3
+  DALI_TEST_CHECK(view.GetLayoutCount() == 3);
 
   // Check we are getting the correct layout from ItemView
   DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
+  DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
+  DALI_TEST_CHECK(view.GetLayout(2) == spiralLayout);
   END_TEST;
 }
 
@@ -170,15 +185,31 @@ int UtcDaliItemViewAddAndRemoveLayout(void)
   // As we have added one layout, check the number of layout is now 1
   DALI_TEST_CHECK(view.GetLayoutCount() == 1);
 
+  // Create a depth layout and add it to ItemView
+  DepthLayoutPtr depthLayout = DepthLayout::New();
+  view.AddLayout(*depthLayout);
+
+  // As we have added another layout, check the number of layout is now 2
+  DALI_TEST_CHECK(view.GetLayoutCount() == 2);
+
   // Check we are getting the correct layout from ItemView
   DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
+  DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
 
   // Remove the grid layout
   view.RemoveLayout(0);
 
-  // As we have removed the grid layout, check the number of layout is now 0
-  DALI_TEST_CHECK(view.GetLayoutCount() == 0);
+  // As we have removed the grid layout, check the number of layout is now 1
+  DALI_TEST_CHECK(view.GetLayoutCount() == 1);
+
+  // Check we are getting the correct layout from ItemView
+  DALI_TEST_CHECK(view.GetLayout(0) == depthLayout);
+
+  // Remove the depth layout
+  view.RemoveLayout(0);
 
+  // As we also removed the depth layout, check the number of layout is now 0
+  DALI_TEST_CHECK(view.GetLayoutCount() == 0);
   END_TEST;
 }
 
@@ -194,18 +225,38 @@ int UtcDaliItemViewActivateLayoutAndGetActiveLayout(void)
   GridLayoutPtr gridLayout = GridLayout::New();
   view.AddLayout(*gridLayout);
 
-  DALI_TEST_CHECK(view.GetLayoutCount() == 1);
+  // Create a depth layout and add it to ItemView
+  DepthLayoutPtr depthLayout = DepthLayout::New();
+  view.AddLayout(*depthLayout);
+
+  // Create a spiral layout and add it to ItemView
+  SpiralLayoutPtr spiralLayout = SpiralLayout::New();
+  view.AddLayout(*spiralLayout);
+
+  // As we have added three layouts, check the number of layout is now 3
+  DALI_TEST_CHECK(view.GetLayoutCount() == 3);
 
   // Check there is no active layout at the moment
   DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
 
-  // Activate the grid layout
+  // Activate the depth layout
   Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+  view.ActivateLayout(1, stageSize, 0.5f);
+
+  // Check the current active layout is the depth layout
+  DALI_TEST_CHECK(view.GetActiveLayout() == depthLayout);
+
+  // Activate the grid layout
   view.ActivateLayout(0, stageSize, 0.5f);
 
   // Check the current active layout is the grid layout
   DALI_TEST_CHECK(view.GetActiveLayout() == gridLayout);
 
+  // Activate the spiral layout
+  view.ActivateLayout(2, stageSize, 0.5f);
+
+  // Check the current active layout is the spiral layout
+  DALI_TEST_CHECK(view.GetActiveLayout() == spiralLayout);
   END_TEST;
 }
 
index 66f6ab9..2c866dc 100644 (file)
@@ -183,6 +183,13 @@ int UtcDaliKeyboardFocusManagerGet(void)
 
   tet_infoline(" UtcDaliKeyboardKeyboardFocusManagerGet");
 
+  // Register Type
+  TypeInfo type;
+  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
+  DALI_TEST_CHECK( type );
+  BaseHandle handle = type.CreateInstance();
+  DALI_TEST_CHECK( handle );
+
   KeyboardFocusManager manager;
 
   manager = KeyboardFocusManager::Get();
@@ -258,6 +265,13 @@ int UtcDaliKeyboardFocusManagerMoveFocus(void)
 
   tet_infoline(" UtcDaliKeyboardFocusManagerMoveFocus");
 
+  // Register Type
+  TypeInfo type;
+  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
+  DALI_TEST_CHECK( type );
+  BaseHandle handle = type.CreateInstance();
+  DALI_TEST_CHECK( handle );
+
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
@@ -326,6 +340,85 @@ int UtcDaliKeyboardFocusManagerMoveFocus(void)
   preFocusChangeCallback.Reset();
   DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
 
+  // Create a 2x2 table view and try to move focus inside it
+  TableView tableView = TableView::New( 2, 2 );
+  Stage::GetCurrent().Add(tableView);
+
+  // Create the third actor
+  Actor third = Actor::New();
+  third.SetKeyboardFocusable(true);
+
+  // Create the fourth actor
+  Actor fourth = Actor::New();
+  fourth.SetKeyboardFocusable(true);
+
+  // Add the four children to table view
+  tableView.AddChild(first, TableView::CellPosition(0, 0));
+  tableView.AddChild(second, TableView::CellPosition(0, 1));
+  tableView.AddChild(third, TableView::CellPosition(1, 0));
+  tableView.AddChild(fourth, TableView::CellPosition(1, 1));
+
+  // Set the focus to the first actor
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
+  focusChangedCallback.Reset();
+
+  // Move the focus towards right
+  DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
+  focusChangedCallback.Reset();
+
+  // Move the focus towards down
+  DALI_TEST_CHECK(manager.MoveFocus(Control::Down) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
+  focusChangedCallback.Reset();
+
+  // Move the focus towards left
+  DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == third);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == fourth);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == third);
+  focusChangedCallback.Reset();
+
+  // Move the focus towards up
+  DALI_TEST_CHECK(manager.MoveFocus(Control::Up) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == third);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
+  focusChangedCallback.Reset();
+
+  // Move the focus towards left. The focus move will fail as no way to move it upwards
+  DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == false);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+  DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
+  DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
+  DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
+  DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Left);
+  preFocusChangeCallback.Reset();
+  DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
+
+  // Enable the loop
+  manager.SetFocusGroupLoop(true);
+  DALI_TEST_CHECK(manager.GetFocusGroupLoop() == true);
+
+  // Move the focus towards left again. The focus should move to the fourth actor.
+  DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
+  focusChangedCallback.Reset();
   END_TEST;
 }
 
@@ -535,3 +628,42 @@ int UtcDaliKeyboardFocusManagerSignalFocusedActorActivated(void)
   focusedActorActivatedCallback.Reset();
   END_TEST;
 }
+
+int UtcDaliKeyboardFocusManagerSignalFocusGroupChanged(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliKeyboardFocusManagerSignalFocusGroupChanged");
+
+  // Register Type
+  TypeInfo type;
+  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
+  DALI_TEST_CHECK( type );
+  BaseHandle handle = type.CreateInstance();
+  DALI_TEST_CHECK( handle );
+
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+
+  bool focusGroupChangedSignalVerified = false;
+  FocusGroupChangedCallback focusGroupChangedCallback(focusGroupChangedSignalVerified);
+  manager.FocusGroupChangedSignal().Connect( &focusGroupChangedCallback, &FocusGroupChangedCallback::Callback );
+
+  Integration::KeyEvent tabEvent("Tab", "", 0, 0, 0, Integration::KeyEvent::Down);
+  Integration::KeyEvent shiftTabEvent("Tab", "", 0, 1, 0, Integration::KeyEvent::Down);
+
+  // Send the tab event to change focus group in the forward direction
+  application.ProcessEvent(tabEvent);
+  DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
+  DALI_TEST_CHECK(focusGroupChangedCallback.mForward == true);
+  focusGroupChangedCallback.Reset();
+
+  // Send the shift tab event to change focus group in the backward direction
+  application.ProcessEvent(shiftTabEvent);
+  DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
+  DALI_TEST_CHECK(focusGroupChangedCallback.mForward == false);
+  focusGroupChangedCallback.Reset();
+  END_TEST;
+}
index b7a08fd..108a3cd 100644 (file)
@@ -339,3 +339,217 @@ int UtcDaliScrollViewSpiralEffectTest(void)
   END_TEST;
 }
 
+int UtcDaliScrollViewPageCubeEffectSetup(void)
+{
+  tet_infoline(" UtcDaliScrollViewPageCubeEffectSetup");
+
+  ScrollViewPageCubeEffect effect;
+
+  DALI_TEST_CHECK( !effect );
+
+  BaseHandle handle = ScrollViewPageCubeEffect::New();
+
+  DALI_TEST_CHECK( handle );
+
+  effect = ScrollViewPageCubeEffect::DownCast(handle);
+
+  DALI_TEST_CHECK( effect );
+  END_TEST;
+}
+
+
+int UtcDaliScrollViewPageCarouselEffectSetup(void)
+{
+  tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
+
+  ScrollViewPageCarouselEffect effect;
+
+  DALI_TEST_CHECK( !effect );
+
+  BaseHandle handle = ScrollViewPageCarouselEffect::New();
+
+  DALI_TEST_CHECK( handle );
+
+  effect = ScrollViewPageCarouselEffect::DownCast(handle);
+
+  DALI_TEST_CHECK( effect );
+  END_TEST;
+}
+
+int UtcDaliScrollViewCarouselEffectSetup(void)
+{
+  tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
+
+  ScrollViewCarouselEffect effect;
+
+  DALI_TEST_CHECK( !effect );
+
+  BaseHandle handle = ScrollViewCarouselEffect::New();
+
+  DALI_TEST_CHECK( handle );
+
+  effect = ScrollViewCarouselEffect::DownCast(handle);
+
+  DALI_TEST_CHECK( effect );
+  END_TEST;
+}
+
+int UtcDaliScrollViewDepthEffectSetup(void)
+{
+  tet_infoline(" UtcDaliScrollViewDepthEffectSetup");
+
+  ScrollViewDepthEffect effect;
+
+  DALI_TEST_CHECK( !effect );
+
+  BaseHandle handle = ScrollViewDepthEffect::New();
+
+  DALI_TEST_CHECK( handle );
+
+  effect = ScrollViewDepthEffect::DownCast(handle);
+
+  DALI_TEST_CHECK( effect );
+  END_TEST;
+}
+
+
+int UtcDaliScrollViewPageCubeEffectTest(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliScrollViewPageCubeEffectTest");
+
+  Vector2 size = Stage::GetCurrent().GetSize();
+
+  ScrollView scrollView = SetupTestScrollView(1, 3, size);
+  Actor testPage = gPages[1];
+  Wait(application, 500);
+
+  ScrollViewPageCubeEffect effect = ScrollViewPageCubeEffect::New();
+  scrollView.ApplyEffect(effect);
+
+  for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
+  {
+    Actor page = *pageIter;
+    page.RemoveConstraints();
+    page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+    effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f));
+  }
+  Wait(application);
+
+  scrollView.ScrollTo(1);
+  while(!gOnScrollCompleteCalled)
+  {
+    Wait(application);
+  }
+  // test that the first page has reached centre of screen
+  Vector3 pagePos = testPage.GetCurrentPosition();
+  DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+  CleanupTest();
+  END_TEST;
+}
+
+int UtcDaliScrollViewPageCarouselEffectTest(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliScrollViewPageCarouselEffectTest");
+
+  Vector2 size = Stage::GetCurrent().GetSize();
+
+  ScrollView scrollView = SetupTestScrollView(1, 3, size);
+  Actor testPage = gPages[1];
+  Wait(application, 500);
+
+  ScrollViewPageCarouselEffect effect = ScrollViewPageCarouselEffect::New();
+  scrollView.ApplyEffect(effect);
+
+  for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
+  {
+    Actor page = *pageIter;
+    page.RemoveConstraints();
+    page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+    effect.ApplyToPage(page);
+  }
+  Wait(application);
+
+  scrollView.ScrollTo(1, 0.5f, DirectionBiasNone);
+  while(!gOnScrollCompleteCalled)
+  {
+    Wait(application);
+  }
+  // test that the first page has reached centre of screen
+  Vector3 pagePos = testPage.GetCurrentPosition();
+  DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+  CleanupTest();
+  END_TEST;
+}
+
+int UtcDaliScrollViewCarouselEffectTest(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliScrollViewCarouselEffectTest");
+
+  Vector2 size = Stage::GetCurrent().GetSize();
+
+  ScrollView scrollView = SetupTestScrollView(1, 3, size);
+  Actor testPage = gPages[1];
+  Wait(application, 500);
+
+  ScrollViewCarouselEffect effect = ScrollViewCarouselEffect::New();
+  scrollView.ApplyEffect(effect);
+
+  Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
+  Wait(application);
+  Vector3 actorPrePosition = actor.GetCurrentPosition();
+
+  effect.ApplyToActor( actor, Vector2(1.2f, 1.2f) );
+
+  scrollView.ScrollTo(Vector3(size.x, 0.0f, 0.0f), 0.5f, DirectionBiasNone, DirectionBiasNone);
+  while(!gOnScrollCompleteCalled)
+  {
+    Wait(application);
+  }
+  // test that the first page has reached centre of screen
+  Vector3 actorPostPosition = actor.GetCurrentPosition();
+  // just check the actor has moved
+  DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
+  CleanupTest();
+  END_TEST;
+}
+
+int UtcDaliScrollViewDepthEffectTest(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliScrollViewDepthEffectTest");
+
+  Vector2 size = Stage::GetCurrent().GetSize();
+
+  ScrollView scrollView = SetupTestScrollView(1, 3, size);
+  Actor testPage = gPages[1];
+  Wait(application, 500);
+
+  ScrollViewDepthEffect effect = ScrollViewDepthEffect::New();
+  scrollView.ApplyEffect(effect);
+
+  Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
+  Wait(application);
+  Vector3 actorPrePosition = actor.GetCurrentPosition();
+
+  const Vector2 positionExtent(0.5f, 2.5f);
+  const Vector2 offsetExtent(1.0f, 1.0f);
+  const float positionScale(1.5f);
+  const float scaleExtent(0.5f);
+
+  effect.ApplyToActor( actor, positionExtent, offsetExtent, positionScale, scaleExtent );
+
+  scrollView.ScrollTo(1);
+  while(!gOnScrollCompleteCalled)
+  {
+    Wait(application);
+  }
+  // test that the first page has reached centre of screen
+  Vector3 actorPostPosition = actor.GetCurrentPosition();
+  // just check the actor has moved
+  DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
+  CleanupTest();
+  END_TEST;
+}
index 5b56cec..9f8905e 100644 (file)
@@ -473,7 +473,7 @@ int UtcDaliTextInputSetAndGetBoundingRectangle(void)
 }
 
 
-int UtcDaliTextInputSetAndGetTextAlignment(void)
+int UtcDaliTextInputSetAndGetTextAlignment01(void)
 {
   ToolkitTestApplication application;
 
@@ -490,6 +490,22 @@ int UtcDaliTextInputSetAndGetTextAlignment(void)
   END_TEST;
 }
 
+int UtcDaliTextInputSetAndGetTextAlignment02(void)
+{
+  ToolkitTestApplication application;
+
+  TextInput textInput = TextInput::New();
+  textInput.SetTextAlignment(static_cast<Alignment::Type>( Alignment::HorizontalCenter) );
+
+  bool result = ( textInput.GetTextAlignment() & Alignment::HorizontalCenter ) ;
+
+  DALI_TEST_CHECK( result );
+
+  result = ( textInput.GetTextAlignment() & Alignment::HorizontalRight );
+
+  DALI_TEST_CHECK( !result );
+  END_TEST;
+}
 
 int UtcDaliTextInputSetSortModifier(void)
 {
@@ -726,3 +742,227 @@ int UtcDaliTextInputScroll(void)
   DALI_TEST_EQUALS( scrollPosition, Vector2( 149.153656f, 0.f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   END_TEST;
 }
+
+int UtcDaliTextInputSetActiveStyle(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("Testing Setting of Style to newly added text");
+
+  TextInput textInput = TextInput::New();  // create empty TextInput
+
+  Stage::GetCurrent().Add(textInput);
+
+  const std::string styledString = "Test String<i>ab</i>" ;
+  const std::string plainString = "Test String";
+  textInput.SetInitialText( plainString );
+
+  application.SendNotification();
+  application.Render();
+
+  textInput.SetEditable(true);
+
+  std::string retreivedMarkupString = textInput.GetMarkupText();
+
+  tet_infoline("Confirm markup text is a plain string ");
+  DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
+
+  TextStyle style;
+  style.SetItalics( true );
+
+  tet_infoline("Apply style to TextInput");
+  textInput.SetActiveStyle( style );
+
+  Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
+  Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
+
+  application.SendNotification();
+  application.Render();
+
+  application.ProcessEvent(eventA);
+  application.SendNotification();
+  application.Render();
+
+  application.ProcessEvent(eventB);
+  application.SendNotification();
+  application.Render();
+
+  retreivedMarkupString = textInput.GetMarkupText();
+
+  DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliTextInputApplyStyleToSelectedText(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("Testing application of style to selected text ");
+
+  TextInput textInput = TextInput::New();  // create empty TextInput
+
+  Stage::GetCurrent().Add(textInput);
+
+  const std::string styledString = "Test <i>String</i> to style";
+  const std::string plainString = "Test String to style";
+  textInput.SetInitialText( plainString );
+
+  application.SendNotification();
+  application.Render();
+
+  textInput.SetEditable(true);
+
+  std::string retreivedMarkupString = textInput.GetMarkupText();
+
+  tet_infoline("Confirm markup text is a plain string ");
+  DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
+
+  TextStyle style;
+  style.SetItalics( true );
+
+  textInput.SelectText( 5, 11 );
+
+  tet_infoline("Apply style to selected text");
+  textInput.ApplyStyle( style );
+
+  application.Render();
+
+  retreivedMarkupString = textInput.GetMarkupText();
+
+  DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliTextInputApplyStyleToAll(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("Testing application of style to all text ");
+
+  TextInput textInput = TextInput::New();  // create empty TextInput
+
+  Stage::GetCurrent().Add(textInput);
+
+  const std::string styledString = "<i>Test String to style</i>";
+  const std::string plainString = "Test String to style";
+  textInput.SetInitialText( plainString );
+
+  application.SendNotification();
+  application.Render();
+
+  textInput.SetEditable(true);
+
+  std::string retreivedMarkupString = textInput.GetMarkupText();
+
+  tet_infoline("Confirm markup text is a plain string ");
+  DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
+
+  TextStyle style;
+  style.SetItalics( true );
+
+  tet_infoline("Apply style to all text");
+  textInput.ApplyStyleToAll( style );
+
+  application.Render();
+
+  retreivedMarkupString = textInput.GetMarkupText();
+
+  DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliTextInputGetStyleAtCursor(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("Test getting style at cursor");
+
+  TextInput textInput = TextInput::New();  // create empty TextInput
+
+  Stage::GetCurrent().Add(textInput);
+
+  const std::string styledString = "Test Stringa<i>b</i>" ;
+  const std::string plainString = "Test String";
+  textInput.SetInitialText( plainString );
+
+  application.SendNotification();
+  application.Render();
+
+  textInput.SetEditable(true);
+
+  tet_infoline("Confirm style at cursor is default(plain)");
+  TextStyle style;
+  Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
+  application.ProcessEvent(eventA);
+  application.SendNotification();
+  application.Render();
+
+  TextStyle retreivedStyleAtCursor = textInput.GetStyleAtCursor();
+
+  DALI_TEST_CHECK( style == retreivedStyleAtCursor );
+  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsItalicsEnabled() );
+
+  tet_infoline("Set style before adding new character");
+  style.SetItalics( true );
+  textInput.SetActiveStyle( style );
+
+  Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
+  application.ProcessEvent(eventB);
+  application.SendNotification();
+  application.Render();
+
+  tet_infoline("Confirm style at cursor is correct style");
+  retreivedStyleAtCursor = textInput.GetStyleAtCursor();
+
+  DALI_TEST_CHECK( retreivedStyleAtCursor.IsItalicsEnabled() );
+
+  tet_infoline("Confirm style at cursor is not a style that was not set");
+  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsUnderlineEnabled() );
+
+  tet_infoline("Confirm markup text is correct");
+  DALI_TEST_EQUALS( styledString, textInput.GetMarkupText(), TEST_LOCATION);
+
+
+
+  END_TEST;
+}
+
+int UtcDaliTextInputSetAndGetMultilinePolicy(void)
+{
+  ToolkitTestApplication application;
+
+  const TextView::MultilinePolicy MULTILINE_POLICIES[] = { TextView::SplitByNewLineChar, TextView::SplitByWord, TextView::SplitByChar };
+  const unsigned int NUM_MULTILINE_POLICIES = sizeof( MULTILINE_POLICIES ) / sizeof( unsigned int );
+
+  TextInput textInput = TextInput::New();
+  Stage::GetCurrent().Add(textInput);
+  textInput.SetInitialText( "Hello world!" );
+
+  for( unsigned int epIndex = 0; epIndex < NUM_MULTILINE_POLICIES; ++epIndex )
+  {
+    textInput.SetMultilinePolicy( MULTILINE_POLICIES[epIndex] );
+
+    DALI_TEST_EQUALS( textInput.GetMultilinePolicy(), MULTILINE_POLICIES[epIndex], TEST_LOCATION );
+  }
+  END_TEST;
+}
+
+int UtcDaliTextInputSetAndGetExceedEnabled(void)
+{
+  ToolkitTestApplication application;
+
+  const TextView::ExceedPolicy EXCEED_POLICIES[] = { TextView::Original, TextView::Fade, TextView::Split, TextView::ShrinkToFit };
+  const unsigned int NUM_EXCEED_POLICIES = sizeof( EXCEED_POLICIES ) / sizeof( unsigned int );
+
+  TextInput textInput = TextInput::New();
+  Stage::GetCurrent().Add(textInput);
+  textInput.SetInitialText( "Hello world!" );
+
+  for( unsigned int epIndex = 0; epIndex < NUM_EXCEED_POLICIES; ++epIndex )
+  {
+    textInput.SetWidthExceedPolicy( EXCEED_POLICIES[epIndex] );
+
+    DALI_TEST_EQUALS( textInput.GetWidthExceedPolicy(), EXCEED_POLICIES[epIndex], TEST_LOCATION );
+  }
+  END_TEST;
+}