From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Thu, 13 Nov 2014 12:43:47 +0000 (-0800)
Subject: Merge "(AutomatedTests) Removed Zero Ruler test as it is no longer possible to create... 
X-Git-Tag: dali_1.0.18~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=16bb02a4fb038a2fb832226394a581fa2d933fd4;hp=d6cc8c146925e7b7f622c10274c0e56934b0df4e

Merge "(AutomatedTests) Removed Zero Ruler test as it is no longer possible to create one" into tizen
---

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
index 267e811..867abd8 100644
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
@@ -1039,27 +1039,16 @@ int UtcDaliRulerFixedRulerSpacing(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliRulerFixedRulerSpacing");
 
-  RulerPtr rulerZero = new FixedRuler( 0.0f );
-  rulerZero->SetDomain( RulerDomain(10.0f, 90.0f, true) );
-
   RulerPtr rulerNormal = new FixedRuler( 25.0f );
   rulerNormal->SetDomain( RulerDomain(10.0f, 90.0f, true) );
 
   unsigned int volume;
   float position;
 
-  position = rulerZero->GetPositionFromPage(1, volume, true);
-  DALI_TEST_EQUALS( position, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( volume, 1u, TEST_LOCATION );
-
   position = rulerNormal->GetPositionFromPage(1, volume, true);
   DALI_TEST_EQUALS( position, 35.0f, TEST_LOCATION );
   DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );
 
-  position = rulerZero->GetPositionFromPage(2, volume, true);
-  DALI_TEST_EQUALS( position, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( volume, 2u, TEST_LOCATION );
-
   position = rulerNormal->GetPositionFromPage(2, volume, true);
   DALI_TEST_EQUALS( position, 60.0f, TEST_LOCATION );
   DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );