From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 7 Jan 2015 10:12:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: new_text_0.1~64
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=24b3e26d147f772b0396937442484ff75b327aa7;hp=-c

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Relayout-Utilities.cpp
	automated-tests/src/dali-toolkit-internal/utc-Dali-TextView.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextView.cpp

Change-Id: I03204cfe486d6b861d970676b9db41749c6236eb
---

24b3e26d147f772b0396937442484ff75b327aa7
diff --combined automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationControl.cpp
index 459f990,a2c7d54..b3cb881
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationControl.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationControl.cpp
@@@ -272,8 -272,8 +272,8 @@@ int UtcDaliNavigationControlSetBackgrou
    }
    catch (Dali::DaliException& e)
    {
-     tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
-     DALI_TEST_EQUALS(e.mCondition, "segmentIndex+1 < mKnots.size() && segmentIndex < mKnots.size()", TEST_LOCATION);
+     DALI_TEST_PRINT_ASSERT( e );
+     DALI_TEST_EQUALS(e.condition, "segmentIndex+1 < mKnots.size() && segmentIndex < mKnots.size()", TEST_LOCATION);
      tet_result(TET_FAIL);
    }
  
@@@ -327,11 -327,15 +327,11 @@@ int UtcDaliNavigationControlCreateNavig
    tet_infoline( "UtcDaliNavigationControlCreateNavigationTitleBar" );
  
    ImageActor background = CreateSolidColorActor( Color::RED );
 -  TextStyle textStyle;
    Stage stage = Stage::GetCurrent();
  
    NavigationControl naviControl = NavigationControl::New();
    stage.Add( naviControl );
  
 -  Toolkit::NaviTitleBarStyle titleBarStyle( background, textStyle, textStyle, 720, 111, 68, 48, 34, 16, 11, 45, 63, 26, 14, 22 );
 -  naviControl.CreateNavigationTitleBar( titleBarStyle, titleBarStyle );
 -
    Page naviItem = Page::New();
  
    PushButton firstControl = PushButton::New();
diff --combined automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
index 43034ac,473a029..0cfce20
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
@@@ -296,6 -296,41 +296,6 @@@ void DALI_TEST_EQUALS( const std::strin
  void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* location);
  
  /**
 - * Test whether two UTF32 strings are equal.
 - * @param[in] str1 The first string
 - * @param[in] str2 The second string
 - * @param[in] location The TEST_LOCATION macro should be used here
 - */
 -template<>
 -inline void DALI_TEST_EQUALS<const Integration::TextArray&>( const Integration::TextArray& str1, const Integration::TextArray& str2, const char* location)
 -{
 -  if( !std::equal( str1.Begin(), str1.End(), str2.Begin() ) )
 -  {
 -    fprintf(stderr, "%s, checking '", location);
 -
 -    for( unsigned int i = 0; i < str1.Count(); ++i )
 -    {
 -      fprintf(stderr, "%c", str1[i]);
 -    }
 -
 -    fprintf(stderr, "' == '");
 -
 -    for( unsigned int i = 0; i < str2.Count(); ++i )
 -    {
 -      fprintf(stderr, "%c", str2[i]);
 -    }
 -
 -    fprintf(stderr, "'\n");
 -
 -    tet_result(TET_FAIL);
 -  }
 -  else
 -  {
 -    tet_result(TET_PASS);
 -  }
 -}
 -
 -/**
   * Test whether one unsigned integer value is greater than another.
   * Test succeeds if value1 > value2
   * @param[in] value1 The first value
@@@ -315,25 -350,22 +315,22 @@@ void DALI_TEST_GREATER( float value1, f
  
  /**
   * Test whether the assertion condition that failed and thus triggered the
-  * exception \b e contained a given substring at the start of its literal text.
-  * @param[in] e The exception that we expect was fired by a runtime assertion
-  *              failure.
+  * exception \b e contained a given substring.
+  * @param[in] e The exception that we expect was fired by a runtime assertion failure.
   * @param[in] conditionSubString The text that we expect to be present in an
   *                               assertion which triggered the exception.
   * @param[in] location The TEST_LOCATION macro should be used here.
-  *
-  * @remark **Side-effects:** The result of the tet test is set to TET_PASS if
-  *         the substring is at the start of the exception's condition and
-  *         TET_FAIL if it isn't. Note, if the result of a test is set multiple
-  *         times, a TET_FAIL will override any number of TET_PASSes.
   */
  void DALI_TEST_ASSERT( DaliException& e, std::string conditionSubString, const char* location );
  
- /** Self-documenting wrapper for DALI_TEST_ASSERT.
-  * @copydoc DALI_TEST_ASSERT()
+ /**
+  * Print the assert
+  * @param[in] e The exception that we expect was fired by a runtime assertion failure.
   */
- void DALI_TEST_ASSERT_CONDITION_STARTS_WITH_SUBSTRING( DaliException& exceptionFromAssertion, std::string conditionSubString, const char* location );
- 
+ inline void DALI_TEST_PRINT_ASSERT( DaliException& e )
+ {
+   tet_printf("Assertion %s failed at %s\n", e.condition, e.location );
+ }
  
  // Functor to test whether an Applied signal is emitted
  struct ConstraintAppliedCheck
diff --combined automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 6e48d4d,aeef8a9..f059594
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@@ -251,8 -251,8 +251,8 @@@ int UtcDaliPushButtonSetGetAutorepeatin
    }
    catch( Dali::DaliException& e )
    {
-     tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
-     DALI_TEST_EQUALS(e.mCondition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
+     DALI_TEST_PRINT_ASSERT( e );
+     DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
      assert1 = true;
    }
  
@@@ -262,8 -262,8 +262,8 @@@
    }
    catch( Dali::DaliException& e )
    {
-     tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
-     DALI_TEST_EQUALS(e.mCondition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
+     DALI_TEST_PRINT_ASSERT( e );
+     DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
      assert2 = true;
    }
  
@@@ -420,8 -420,18 +420,8 @@@ int UtcDaliPushButtonSetLabelText(void
    application.SendNotification();
    application.Render();
  
 -  TextView textView;
 -
    pushButton.SetLabelText( STR );
  
 -  textView = TextView::DownCast( pushButton.GetLabelText() );
 -  DALI_TEST_CHECK( STR == textView.GetText() );
 -
 -  TextView text = TextView::New( STR );
 -  pushButton.SetLabelText( text );
 -
 -  textView = TextView::DownCast( pushButton.GetLabelText() );
 -  DALI_TEST_CHECK( STR == textView.GetText() );
    END_TEST;
  }
  
diff --combined packaging/dali-toolkit.spec
index 1eed04f,ae993e7..86cb640
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       dali-toolkit
  Summary:    The OpenGLES Canvas Core Library Toolkit
- Version:    1.0.21
+ Version:    1.0.23
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0
@@@ -16,6 -16,7 +16,6 @@@ BuildRequires:  pkgconfig(dlog
  BuildRequires:  boost-devel
  BuildRequires:  pkgconfig(dali)
  BuildRequires:  pkgconfig(dali-core)
 -BuildRequires:  fribidi-devel
  
  %description
  The OpenGLES Canvas Core Library Toolkit - a set of controls that provide