X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Controller.cpp;h=cdb29f982d22a9e5c6242ed889f393ce28238a43;hp=f2e761f49359b32f7bb4a72e0bf78b14cd21dec4;hb=406208364fe0ee31f31f475ba7ee7709e56d3e27;hpb=f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
index f2e761f..cdb29f9 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
@@ -26,7 +26,6 @@
 #include <dali-toolkit/internal/text/text-controller.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
-#include <dali-toolkit/internal/text/text-scroller-data.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -403,122 +402,3 @@ int UtcDaliTextControllerSetGetAutoScrollEnabled(void)
   tet_result(TET_PASS);
   END_TEST;
 }
-
-int UtcDaliTextControllerSetGetAutoScrollSpeed(void)
-{
-  tet_infoline(" UtcDaliTextControllerSetGetAutoScrollSpeed");
-  ToolkitTestApplication application;
-
-  // Creates a text controller.
-  ControllerPtr controller = Controller::New();
-
-  DALI_TEST_CHECK( controller );
-
-  // Check the default value.
-  DALI_TEST_EQUALS( 0, controller->GetAutoScrollSpeed(), TEST_LOCATION );
-
-  // Set the auto scroll speed.
-  controller->SetAutoscrollSpeed( 10 );
-
-  DALI_TEST_EQUALS( 10, controller->GetAutoScrollSpeed(), TEST_LOCATION );
-
-  tet_result(TET_PASS);
-  END_TEST;
-}
-
-int UtcDaliTextControllerSetGetAutoScrollLoopCount(void)
-{
-  tet_infoline(" UtcDaliTextControllerSetGetAutoScrollLoopCount");
-  ToolkitTestApplication application;
-
-  // Creates a text controller.
-  ControllerPtr controller = Controller::New();
-
-  DALI_TEST_CHECK( controller );
-
-  // Check the default value.
-  DALI_TEST_EQUALS( 0, controller->GetAutoScrollLoopCount(), TEST_LOCATION );
-
-  // Set the auto scroll loop count.
-  controller->SetAutoScrollLoopCount( 5 );
-
-  DALI_TEST_EQUALS( 5, controller->GetAutoScrollLoopCount(), TEST_LOCATION );
-
-  tet_result(TET_PASS);
-  END_TEST;
-}
-
-int UtcDaliTextControllerSetGetAutoScrollWrapGap(void)
-{
-  tet_infoline(" UtcDaliTextControllerSetGetAutoScrollWrapGap");
-  ToolkitTestApplication application;
-
-  // Creates a text controller.
-  ControllerPtr controller = Controller::New();
-
-  DALI_TEST_CHECK( controller );
-
-  // Check the default value.
-  DALI_TEST_EQUALS( 0.f, controller->GetAutoScrollWrapGap(), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-
-  // Set the auto scroll loop count.
-  controller->SetAutoScrollWrapGap( 25.f );
-
-  DALI_TEST_EQUALS( 25.f, controller->GetAutoScrollWrapGap(), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-
-  tet_result(TET_PASS);
-  END_TEST;
-}
-
-int UtcDaliTextControllerGetAutoScrollData(void)
-{
-  tet_infoline(" UtcDaliTextControllerGetAutoScrollData");
-  ToolkitTestApplication application;
-
-  // Load some fonts to get the same metrics on different platforms.
-  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
-
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
-
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
-
-  // Creates a text controller.
-  ControllerPtr controller = Controller::New();
-
-  DALI_TEST_CHECK( controller );
-
-  DALI_TEST_CHECK( NULL == controller->GetAutoScrollData() );
-
-  // Set and check some values.
-  controller->SetAutoscrollSpeed( 10 );
-  controller->SetAutoScrollLoopCount( 5 );
-  controller->SetAutoScrollWrapGap( 25.f );
-
-  const ScrollerData* scrollerData = controller->GetAutoScrollData();
-  DALI_TEST_CHECK( NULL != controller->GetAutoScrollData() );
-
-  DALI_TEST_EQUALS( Size::ZERO, scrollerData->mControlSize, TEST_LOCATION );
-  DALI_TEST_EQUALS( Size::ZERO, scrollerData->mOffscreenSize, TEST_LOCATION );
-  DALI_TEST_EQUALS( 10, scrollerData->mScrollSpeed, TEST_LOCATION );
-  DALI_TEST_EQUALS( 5, scrollerData->mLoopCount, TEST_LOCATION );
-  DALI_TEST_EQUALS( 25.f, scrollerData->mWrapGap, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  DALI_TEST_EQUALS( 0.f, scrollerData->mAlignmentOffset, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  DALI_TEST_CHECK( !scrollerData->mAutoScrollDirectionRTL );
-
-  // Set some text and layout.
-  controller->SetMarkupProcessorEnabled( true );
-  controller->SetHorizontalAlignment( LayoutEngine::HORIZONTAL_ALIGN_END );
-  controller->SetText( "<font family='TizenSans' size='12'>Hello world</font>" );
-  controller->Relayout( Size( 100.f, 20.f ) );
-
-  scrollerData = controller->GetAutoScrollData();
-  DALI_TEST_EQUALS( Size( 100.f, 20.f ), scrollerData->mControlSize, TEST_LOCATION );
-  DALI_TEST_EQUALS( Size( 80.f, 20.f ), scrollerData->mOffscreenSize, TEST_LOCATION );
-  DALI_TEST_EQUALS( 20.f, scrollerData->mAlignmentOffset, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-
-  tet_result(TET_PASS);
-  END_TEST;
-}