From f57e43e38c4b3dd3bcf0aa8a107c42647631a9d8 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Tue, 26 May 2015 19:55:01 +0100 Subject: [PATCH] UTC coverage for Path,KeyFrames,LinearConstrainer,Layer,ImageActor Change-Id: Icb2dad0afb9b074ae355bc04f08090d0c08f4f07 --- automated-tests/src/dali/utc-Dali-Animation.cpp | 37 ++++++++++++++++++++--- automated-tests/src/dali/utc-Dali-Constrainer.cpp | 32 ++++++++++++++++++++ automated-tests/src/dali/utc-Dali-ImageActor.cpp | 16 ++++++++++ automated-tests/src/dali/utc-Dali-Path.cpp | 24 ++++++++++++++- dali/internal/event/actors/layer-impl.cpp | 2 +- dali/internal/event/actors/layer-impl.h | 12 +++++++- dali/internal/update/nodes/scene-graph-layer.cpp | 5 +-- dali/public-api/actors/layer.cpp | 5 --- dali/public-api/actors/layer.h | 15 --------- 9 files changed, 118 insertions(+), 30 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-Animation.cpp b/automated-tests/src/dali/utc-Dali-Animation.cpp index d4d66db..7397d92 100644 --- a/automated-tests/src/dali/utc-Dali-Animation.cpp +++ b/automated-tests/src/dali/utc-Dali-Animation.cpp @@ -6929,6 +6929,33 @@ int UtcDaliAnimationKeyFrames01P(void) DALI_TEST_EQUALS(keyFrames.GetType(), Property::NONE, TEST_LOCATION); keyFrames.Add(0.0f, 0.1f); + + DALI_TEST_EQUALS(keyFrames.GetType(), Property::FLOAT, TEST_LOCATION); + + KeyFrames keyFrames2( keyFrames); + DALI_TEST_CHECK( keyFrames2 ); + DALI_TEST_EQUALS(keyFrames2.GetType(), Property::FLOAT, TEST_LOCATION); + + KeyFrames keyFrames3 = KeyFrames::New(); + keyFrames3.Add(0.6f, true); + DALI_TEST_CHECK( keyFrames3 ); + DALI_TEST_EQUALS(keyFrames3.GetType(), Property::BOOLEAN, TEST_LOCATION); + + keyFrames3 = keyFrames; + DALI_TEST_CHECK( keyFrames3 ); + DALI_TEST_EQUALS(keyFrames3.GetType(), Property::FLOAT, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliAnimationKeyFrames02P(void) +{ + TestApplication application; + + KeyFrames keyFrames = KeyFrames::New(); + DALI_TEST_EQUALS(keyFrames.GetType(), Property::NONE, TEST_LOCATION); + + keyFrames.Add(0.0f, 0.1f); keyFrames.Add(0.2f, 0.5f); keyFrames.Add(0.4f, 0.0f); keyFrames.Add(0.6f, 1.0f); @@ -6949,7 +6976,7 @@ int UtcDaliAnimationKeyFrames01P(void) END_TEST; } -int UtcDaliAnimationKeyFrames02P(void) +int UtcDaliAnimationKeyFrames03P(void) { TestApplication application; @@ -6977,7 +7004,7 @@ int UtcDaliAnimationKeyFrames02P(void) END_TEST; } -int UtcDaliAnimationKeyFrames03P(void) +int UtcDaliAnimationKeyFrames04P(void) { TestApplication application; @@ -7005,7 +7032,7 @@ int UtcDaliAnimationKeyFrames03P(void) END_TEST; } -int UtcDaliAnimationKeyFrames04P(void) +int UtcDaliAnimationKeyFrames05P(void) { TestApplication application; @@ -7033,7 +7060,7 @@ int UtcDaliAnimationKeyFrames04P(void) END_TEST; } -int UtcDaliAnimationKeyFrames05P(void) +int UtcDaliAnimationKeyFrames06P(void) { TestApplication application; @@ -7061,7 +7088,7 @@ int UtcDaliAnimationKeyFrames05P(void) END_TEST; } -int UtcDaliAnimationKeyFrames06P(void) +int UtcDaliAnimationKeyFrames07P(void) { TestApplication application; diff --git a/automated-tests/src/dali/utc-Dali-Constrainer.cpp b/automated-tests/src/dali/utc-Dali-Constrainer.cpp index d98db91..076a9c2 100644 --- a/automated-tests/src/dali/utc-Dali-Constrainer.cpp +++ b/automated-tests/src/dali/utc-Dali-Constrainer.cpp @@ -312,6 +312,38 @@ int UtcPathConstrainerRemove(void) } //LinearConstrainer test cases +int UtcLinearConstrainerDownCast(void) +{ + TestApplication application; + Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New(); + + BaseHandle handle( linearConstrainer ); + Dali::LinearConstrainer linearConstrainer2 = Dali::LinearConstrainer::DownCast( handle ); + DALI_TEST_EQUALS( (bool)linearConstrainer2, true, TEST_LOCATION ); + + BaseHandle handle2; + Dali:: LinearConstrainer linearConstrainer3 = Dali::LinearConstrainer::DownCast( handle2 ); + DALI_TEST_EQUALS( (bool)linearConstrainer3, false, TEST_LOCATION ); + + END_TEST; +} + +int UtcLinearConstrainerCopyConstructor(void) +{ + TestApplication application; + Dali::LinearConstrainer linearConstrainer; + DALI_TEST_EQUALS( (bool)linearConstrainer, false, TEST_LOCATION ); + + linearConstrainer = Dali::LinearConstrainer::New(); + DALI_TEST_EQUALS( (bool)linearConstrainer, true, TEST_LOCATION ); + + // call the copy constructor + Dali::LinearConstrainer linearConstrainer2( linearConstrainer ); + DALI_TEST_EQUALS( (bool)linearConstrainer2, true, TEST_LOCATION ); + + END_TEST; +} + int UtcLinearConstrainerApply(void) { TestApplication application; diff --git a/automated-tests/src/dali/utc-Dali-ImageActor.cpp b/automated-tests/src/dali/utc-Dali-ImageActor.cpp index c344af0..9c18fc0 100644 --- a/automated-tests/src/dali/utc-Dali-ImageActor.cpp +++ b/automated-tests/src/dali/utc-Dali-ImageActor.cpp @@ -126,6 +126,22 @@ int UtcDaliImageActorDownCast2(void) END_TEST; } +int UtcDaliImageActorCopyConstructor(void) +{ + TestApplication application; + tet_infoline("Testing Dali::ImageActor::ImageActor(const ImageActor& )"); + + Image image = ResourceImage::New("IncorrectImageName"); + ImageActor actor1 = ImageActor::New(image); + + ImageActor actor2(actor1); + DALI_TEST_CHECK(actor2); + DALI_TEST_EQUALS( actor2, actor1, TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetImage(), image, TEST_LOCATION ); + + END_TEST; +} + int UtcDaliImageActor9Patch(void) { TestApplication application; diff --git a/automated-tests/src/dali/utc-Dali-Path.cpp b/automated-tests/src/dali/utc-Dali-Path.cpp index 7d12f6a..2f5687c 100644 --- a/automated-tests/src/dali/utc-Dali-Path.cpp +++ b/automated-tests/src/dali/utc-Dali-Path.cpp @@ -189,6 +189,27 @@ int utcDaliPathGenerateControlPoints01(void) END_TEST; } +int utcDaliPathGetPointCount(void) +{ + TestApplication application; + Dali::Path path = Dali::Path::New(); + + DALI_TEST_EQUALS(path.GetPointCount(), 0, TEST_LOCATION); + + path.AddPoint(Vector3( 50.0, 50.0, 0.0)); + path.AddPoint(Vector3(120.0, 70.0, 0.0)); + path.AddPoint(Vector3(190.0, 250.0, 0.0)); + path.AddPoint(Vector3(260.0, 260.0, 0.0)); + + DALI_TEST_EQUALS(path.GetPointCount(), 4, TEST_LOCATION); + + path.AddPoint(Vector3(330.0, 220.0, 0.0)); + path.AddPoint(Vector3(400.0, 50.0, 0.0)); + + DALI_TEST_EQUALS(path.GetPointCount(), 6, TEST_LOCATION); + END_TEST; +} + int utcDaliPathGenerateControlPoints02(void) { TestApplication application; @@ -330,7 +351,8 @@ int UtcDaliPathAssignment(void) Dali::Path path = Dali::Path::New(); SetupPath(path); - Dali::Path path2 = path; + Dali::Path path2; + path2 = path; DALI_TEST_CHECK(path2); //t = 0 diff --git a/dali/internal/event/actors/layer-impl.cpp b/dali/internal/event/actors/layer-impl.cpp index a258b69..debb79b 100644 --- a/dali/internal/event/actors/layer-impl.cpp +++ b/dali/internal/event/actors/layer-impl.cpp @@ -106,7 +106,7 @@ Layer::Layer( Actor::DerivedType type ) : Actor( type ), mLayerList(NULL), mClippingBox(0,0,0,0), - mSortFunction(Dali::Layer::ZValue), + mSortFunction(Layer::ZValue), mIsClipping(false), mDepthTestDisabled(false), mTouchConsumed(false), diff --git a/dali/internal/event/actors/layer-impl.h b/dali/internal/event/actors/layer-impl.h index 76a7ba4..22a74be 100644 --- a/dali/internal/event/actors/layer-impl.h +++ b/dali/internal/event/actors/layer-impl.h @@ -44,7 +44,17 @@ class Layer : public Actor public: /** - * @copydoc Dali::Layer::ZValue(const Vector3&, float) + * @brief This sort function sorts translucent actors according to the Z-value in view space. + * + * This is useful for 2D user interfaces. + * + * This is the default sorting function. + * + * We return a negative z value as in our translation, a low z means that it should + * be sorted further away and a high z means that it should be closer. + * @param[in] position position of actor in view space + * @param[in] sortModifier additional sort modifer + * @return depth */ static float ZValue(const Vector3& position, float sortModifier) { diff --git a/dali/internal/update/nodes/scene-graph-layer.cpp b/dali/internal/update/nodes/scene-graph-layer.cpp index 8b4e428..08da342 100644 --- a/dali/internal/update/nodes/scene-graph-layer.cpp +++ b/dali/internal/update/nodes/scene-graph-layer.cpp @@ -17,6 +17,7 @@ // CLASS HEADER #include +#include // INTERNAL INCLUDES #include @@ -36,7 +37,7 @@ SceneGraph::Layer* Layer::New() } Layer::Layer() -: mSortFunction( Dali::Layer::ZValue ), +: mSortFunction( Internal::Layer::ZValue ), mClippingBox( 0,0,0,0 ), mLastCamera(0), mIsClipping( false ), @@ -57,7 +58,7 @@ void Layer::SetSortFunction( Dali::Layer::SortFunctionType function ) if( mSortFunction != function ) { // is a custom sort function used - if( function != Dali::Layer::ZValue ) + if( function != Internal::Layer::ZValue ) { mIsDefaultSortFunction = false; } diff --git a/dali/public-api/actors/layer.cpp b/dali/public-api/actors/layer.cpp index c8c1413..712286f 100644 --- a/dali/public-api/actors/layer.cpp +++ b/dali/public-api/actors/layer.cpp @@ -138,11 +138,6 @@ bool Layer::IsDepthTestDisabled() const return GetImplementation(*this).IsDepthTestDisabled(); } -float Layer::ZValue(const Vector3& position, float sortModifier) -{ - return Internal::Layer::ZValue( position, sortModifier ); -} - void Layer::SetSortFunction(SortFunctionType function) { GetImplementation(*this).SetSortFunction(function); diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h index eb838c4..c8513ec 100644 --- a/dali/public-api/actors/layer.h +++ b/dali/public-api/actors/layer.h @@ -285,21 +285,6 @@ public: // Sorting /** - * @brief This sort function sorts translucent actors according to the Z-value in view space. - * - * This is useful for 2D user interfaces. - * - * This is the default sorting function. - * - * We return a negative z value as in our translation, a low z means that it should - * be sorted further away and a high z means that it should be closer. - * @param[in] position position of actor in view space - * @param[in] sortModifier additional sort modifer - * @return depth - */ - static float ZValue(const Vector3& position, float sortModifier); - - /** * @brief This allows the user to specify the sort function that the layer should use. * * The sort function is used to determine the order in which the actors are drawn -- 2.7.4