X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-adaptor-internal%2Futc-Dali-FontClient.cpp;h=1774a04eea78cd4639c95fb8924f69c3c4fa336f;hb=afe08dc50446f00bb0f78439960be465bcb2e7aa;hp=fdb1df5b407c2abc43ca9f847dd6f2bbcd95b121;hpb=41be0a3b9e3f216215bfdc5eed5fc74c05695b62;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp
index fdb1df5..1774a04 100644
--- a/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp
+++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp
@@ -17,52 +17,71 @@
 
 #include <iostream>
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <dali/dali.h>
 #include <dali-test-suite-utils.h>
-#include <dali/internal/text-abstraction/font-client-helper.h>
+#include <dali/dali.h>
+#include <dali/internal/text/text-abstraction/font-client-helper.h>
+#include <stdint.h>
+#include <stdlib.h>
 
 using namespace Dali;
 
 int UtcDaliFontClient(void)
 {
-  const int ORDERED_VALUES[] = { 50, 63, 75, 87, 100, 113, 125, 150, 200 };
+  const int ORDERED_VALUES[] = {-1, 50, 63, 75, 87, 100, 113, 125, 150, 200};
 
-  const unsigned int NUM_OF_ORDERED_VALUES = sizeof( ORDERED_VALUES ) / sizeof( int );
+  const unsigned int NUM_OF_ORDERED_VALUES = sizeof(ORDERED_VALUES) / sizeof(int);
 
   TestApplication application;
-  int preciseIndex = 0;
-  int result=0;
+  int             result = 0;
 
-  tet_infoline("UtcDaliFontClient center range");
-  preciseIndex = 4;
-  result = TextAbstraction::Internal::ValueToIndex( ORDERED_VALUES[preciseIndex], ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u );
-  DALI_TEST_EQUALS( preciseIndex, result, TEST_LOCATION );
+  tet_infoline("UtcDaliFontClient No table");
+  result = TextAbstraction::Internal::ValueToIndex(100, NULL, 0u);
+  DALI_TEST_EQUALS(-1, result, TEST_LOCATION);
 
-  tet_infoline("UtcDaliFontClient start of range");
-  preciseIndex = 0;
-  result = TextAbstraction::Internal::ValueToIndex( ORDERED_VALUES[preciseIndex], ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u );
-  DALI_TEST_EQUALS( preciseIndex, result, TEST_LOCATION );
+  tet_infoline("UtcDaliFontClient Non defined values");
+  result = TextAbstraction::Internal::ValueToIndex(-1, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(0, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(-3, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(0, result, TEST_LOCATION);
 
-  tet_infoline("UtcDaliFontClient end of range");
-  preciseIndex = 8;
-  result = TextAbstraction::Internal::ValueToIndex( ORDERED_VALUES[preciseIndex], ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u );
-  DALI_TEST_EQUALS( preciseIndex, result, TEST_LOCATION );
+  tet_infoline("UtcDaliFontClient Between non defined and first of range.");
+  result = TextAbstraction::Internal::ValueToIndex(0, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(1, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(30, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(1, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(49, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(1, result, TEST_LOCATION);
 
-  tet_infoline("UtcDaliFontClient below of range");
-  result = TextAbstraction::Internal::ValueToIndex( 30, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u );
-  DALI_TEST_EQUALS( 0, result, TEST_LOCATION );
+  tet_infoline("UtcDaliFontClient Defined in range");
+  for(unsigned int index = 1u; index < NUM_OF_ORDERED_VALUES; ++index)
+  {
+    result = TextAbstraction::Internal::ValueToIndex(ORDERED_VALUES[index], ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+    DALI_TEST_EQUALS(index, result, TEST_LOCATION);
+  }
 
-  tet_infoline("UtcDaliFontClient below of range");
-  result = TextAbstraction::Internal::ValueToIndex( 220, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u );
-  DALI_TEST_EQUALS( 8, result, TEST_LOCATION );
+  tet_infoline("UtcDaliFontClient Non defined in range");
+  result = TextAbstraction::Internal::ValueToIndex(51, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(1, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(55, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(1, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(62, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(2, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(64, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(2, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(151, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(8, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(175, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(9, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(176, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(9, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(199, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(9, result, TEST_LOCATION);
 
-  tet_infoline("UtcDaliFontClient zero ");
-  result = TextAbstraction::Internal::ValueToIndex( 0, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u );
-  DALI_TEST_EQUALS( 0, result, TEST_LOCATION );
+  tet_infoline("UtcDaliFontClient above of range");
+  result = TextAbstraction::Internal::ValueToIndex(220, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(9, result, TEST_LOCATION);
+  result = TextAbstraction::Internal::ValueToIndex(500, ORDERED_VALUES, NUM_OF_ORDERED_VALUES - 1u);
+  DALI_TEST_EQUALS(9, result, TEST_LOCATION);
 
   END_TEST;
 }
-
-