[UTC/ITC][dali-core/dali-toolkit][ACR-1336][Remove TC for deprecated APIs]

- Removed deprecated APIs since Tizen 3.0

Change-Id: I93b774433c14da83b0caec0b20de0bb320ff77c4
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/src/itc/dali-adaptor/application/ITs-application.cpp b/src/itc/dali-adaptor/application/ITs-application.cpp
index 3127433a5e9a10c8d233379b7ad68246a73c77c2..dd9550377f27f7beaf103706602bc093674a9706 100755 (executable)
--- a/src/itc/dali-adaptor/application/ITs-application.cpp
+++ b/src/itc/dali-adaptor/application/ITs-application.cpp
@@ -31,8 +31,7 @@ ViewMode viewModes[VIEW_MODE_COUNT]=
 {
        MONO,
        STEREO_HORIZONTAL,
-       STEREO_VERTICAL,
-       STEREO_INTERLACED
+       STEREO_VERTICAL
 };
  
 void ITs_application_startup(void)

diff --git a/src/itc/dali-core/actor/ITs-actor-impl.h b/src/itc/dali-core/actor/ITs-actor-impl.h
index 8174a14f17d51f92dd2e4505042c6afe6f4f991a..dab8542810747dbe94df20b930e76bbe8b7d15bd 100755 (executable)
--- a/src/itc/dali-core/actor/ITs-actor-impl.h
+++ b/src/itc/dali-core/actor/ITs-actor-impl.h
@@ -114,7 +114,6 @@ const PropertyStringIndex PROPERTY_TABLE[] =
   { "inheritOrientation",       Actor::Property::INHERIT_ORIENTATION,      Property::BOOLEAN     },
   { "inheritScale",             Actor::Property::INHERIT_SCALE,            Property::BOOLEAN     },
   { "colorMode",                Actor::Property::COLOR_MODE,               Property::STRING      },
-  { "positionInheritance",      Actor::Property::POSITION_INHERITANCE,     Property::STRING      },
   { "drawMode",                 Actor::Property::DRAW_MODE,                Property::STRING      },
   { "sizeModeFactor",           Actor::Property::SIZE_MODE_FACTOR,         Property::VECTOR3     },
   { "widthResizePolicy",        Actor::Property::WIDTH_RESIZE_POLICY,      Property::STRING      },
@@ -391,30 +390,6 @@ void ActorAddUnparent()
        DaliLog::PrintPass();
 }
 
-void ActorSetGetDrawModeSTENCIL()
-{      
-       Vector3 vec3Position( 1.0f, 2.0f, 3.0f );
-       DrawMode::Type  eSetDrawMode = DrawMode::STENCIL;
-       
-       Actor actor = Actor::New();
-       DALI_CHECK_FAIL(!actor, "Actor::New() is failed ");
-       
-       actor.SetDrawMode(eSetDrawMode);
-       
-       actor.SetPosition( vec3Position );
-       actor.SetParentOrigin( ParentOrigin::CENTER );
-       actor.SetAnchorPoint( AnchorPoint::CENTER );
-       actor.SetSize(vec3Position);
-       Stage::GetCurrent().Add(actor);
-       
-       DrawMode::Type getDrawModeType = actor.GetDrawMode();
-       DALI_CHECK_FAIL(getDrawModeType!=eSetDrawMode, "getDrawModeType mismatched with setDrawmode");
-       
-       Stage::GetCurrent().Remove(actor);
-       
-       DaliLog::PrintPass();
-}
-
 void ActorSetGetDrawModeNORMAL()
 {
        Vector3 vec3Position( 1.0f, 2.0f, 3.0f );
@@ -1033,28 +1008,19 @@ void ActorGetWorldPositionSetGetPositionInheritanceModeINHERIT_PARENT_POSITION()
 {
        Actor parentActor = Actor::New();
        DALI_CHECK_FAIL(!parentActor, "Actor::New() is failed ");
-       
+
        parentActor.SetPosition(ACTOR_SET_POSITION);
        parentActor.SetParentOrigin( ParentOrigin::CENTER );
        parentActor.SetAnchorPoint( AnchorPoint::CENTER );
        Stage::GetCurrent().Add(parentActor);
-       
+
        Actor childActor = Actor::New();
        DALI_CHECK_FAIL(!childActor, "Actor::New() is failed ");
        childActor.SetParentOrigin( ParentOrigin::CENTER );
        childActor.SetAnchorPoint( AnchorPoint::CENTER );
        childActor.SetPosition(ACTOR_CHILD_SET_POSITION);
-       childActor.SetPositionInheritanceMode(INHERIT_PARENT_POSITION); 
        parentActor.Add(childActor);
-       PositionInheritanceMode ePositionMode = childActor.GetPositionInheritanceMode();
-       
-       if(ePositionMode != INHERIT_PARENT_POSITION)
-       {                
-               LOG_E("ePositionMode should be INHERIT_PARENT_POSITION");
-               parentActor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
-       }
+
        g_Actor = parentActor;
 }
 void VTActorGetWorldPositionParent001()
@@ -1062,14 +1028,14 @@ void VTActorGetWorldPositionParent001()
        Actor childActor = g_Actor.GetChildAt(0);
        Vector3 vec3WorldPosition = childActor.GetCurrentWorldPosition();
        if(vec3WorldPosition != (ACTOR_SET_POSITION+ACTOR_CHILD_SET_POSITION))
-       {                
-               LOG_E("vec3WorldPosition should be sum of parent and child position");
-               g_Actor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
+       {
+                LOG_E("vec3WorldPosition should be sum of parent and child position");
+                g_Actor.Remove(childActor);
+                test_return_value=TC_FAIL;
+                return;
        }
 
-       g_Actor.Remove(childActor);             
+       g_Actor.Remove(childActor);
        Stage::GetCurrent().Remove(g_Actor);
 
        DaliLog::PrintPass();
@@ -1079,28 +1045,20 @@ void ActorGetWorldPositionSetGetPositionInheritanceModeUSE_PARENT_POSITION()
 {
        Actor parentActor = Actor::New();
        DALI_CHECK_FAIL(!parentActor, " Actor::New() is failed ");
-       
+
        parentActor.SetPosition(ACTOR_SET_POSITION);
        parentActor.SetParentOrigin( ParentOrigin::CENTER );
        parentActor.SetAnchorPoint( AnchorPoint::CENTER );
        Stage::GetCurrent().Add(parentActor);
-       
+
        Actor childActor = Actor::New();
        DALI_CHECK_FAIL(!childActor, "Actor::New() is failed ");
-               
+
        childActor.SetParentOrigin( ParentOrigin::CENTER );
        childActor.SetAnchorPoint( AnchorPoint::CENTER );
-       childActor.SetPosition(ACTOR_CHILD_SET_POSITION);       
+       childActor.SetPosition(ACTOR_CHILD_SET_POSITION);
        parentActor.Add(childActor);
-       PositionInheritanceMode ePositionMode = childActor.GetPositionInheritanceMode();
-       
-       if(ePositionMode != INHERIT_PARENT_POSITION)
-       {                
-               LOG_E("ePositionMode should be INHERIT_PARENT_POSITION");
-               parentActor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
-       }
+
        g_Actor = parentActor;
 }
 void VTActorGetWorldPositionParent002()
@@ -1108,11 +1066,11 @@ void VTActorGetWorldPositionParent002()
        Actor childActor = g_Actor.GetChildAt(0);
        Vector3 vec3WorldPosition = childActor.GetCurrentWorldPosition();
        if(vec3WorldPosition != (ACTOR_SET_POSITION+ACTOR_CHILD_SET_POSITION))
-       {        
-               LOG_E("vec3WorldPosition should be sum of parent and child position");
-               g_Actor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
+       {
+                LOG_E("vec3WorldPosition should be sum of parent and child position");
+                g_Actor.Remove(childActor);
+                test_return_value=TC_FAIL;
+                return;
        }
 
        childActor.SetInheritPosition( false );
@@ -1121,9 +1079,9 @@ void VTActorGetWorldPositionParent003()
 {
        Actor childActor = g_Actor.GetChildAt(0);
        DALI_CHECK_FAIL(childActor.GetCurrentWorldPosition() != ACTOR_CHILD_SET_POSITION, "vec3WorldPosition should be parent position");
-       g_Actor.Remove(childActor);             
+       g_Actor.Remove(childActor);
        Stage::GetCurrent().Remove(g_Actor);
-       
+
        DaliLog::PrintPass();
 }
 
@@ -1131,29 +1089,20 @@ void ActorGetWorldPositionSetGetPositionInheritanceModeUSE_PARENT_POSITION_PLUS_
 {
        Actor parentActor = Actor::New();
        DALI_CHECK_FAIL(!parentActor, " Actor::New() is failed ");
-       
+
        parentActor.SetPosition(ACTOR_SET_POSITION);
        parentActor.SetParentOrigin( ParentOrigin::CENTER );
        parentActor.SetAnchorPoint( AnchorPoint::CENTER );
        Stage::GetCurrent().Add(parentActor);
-       
+
        Actor childActor = Actor::New();
        DALI_CHECK_FAIL(!childActor, "Actor::New() is failed ");
 
        childActor.SetParentOrigin( ParentOrigin::CENTER );
        childActor.SetAnchorPoint( AnchorPoint::CENTER );
-       childActor.SetPosition(ACTOR_CHILD_SET_POSITION);       
+       childActor.SetPosition(ACTOR_CHILD_SET_POSITION);
        parentActor.Add(childActor);
-       PositionInheritanceMode ePositionMode = childActor.GetPositionInheritanceMode();
-       
-       if(ePositionMode != INHERIT_PARENT_POSITION)
-       {        
-               LOG_E("ePositionMode should be INHERIT_PARENT_POSITION ");
-               parentActor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
-       }
-       
+
        g_Actor = parentActor;
 }
 void VTActorGetWorldPositionParentLocal001()
@@ -1162,10 +1111,10 @@ void VTActorGetWorldPositionParentLocal001()
        Vector3 vec3WorldPosition = childActor.GetCurrentWorldPosition();
        if(vec3WorldPosition != (ACTOR_SET_POSITION+ACTOR_CHILD_SET_POSITION))
        {
-               LOG_E("vec3WorldPosition should be sum of parent and child position ");
-               g_Actor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
+                LOG_E("vec3WorldPosition should be sum of parent and child position ");
+                g_Actor.Remove(childActor);
+                test_return_value=TC_FAIL;
+                return;
        }
 
        childActor.SetInheritPosition( false );
@@ -1175,7 +1124,7 @@ void VTActorGetWorldPositionParentLocal002()
 {
        Actor childActor = g_Actor.GetChildAt(0);
        DALI_CHECK_FAIL(childActor.GetCurrentWorldPosition() != ACTOR_CHILD_SET_OFFSET, "vec3WorldPosition should be sum of parent position and child offset");
-       g_Actor.Remove(childActor);             
+       g_Actor.Remove(childActor);
        Stage::GetCurrent().Remove(g_Actor);
 
        DaliLog::PrintPass();
@@ -1192,53 +1141,34 @@ void ActorGetWorldPositionSetGetPositionInheritanceModeDONT_INHERIT_POSITION()
 
        Actor childActor = Actor::New();
        DALI_CHECK_FAIL(!childActor, "Actor::New() is failed ");
-       
+
        childActor.SetParentOrigin( ParentOrigin::CENTER );
        childActor.SetAnchorPoint( AnchorPoint::CENTER );
-       childActor.SetPosition(ACTOR_CHILD_SET_POSITION);       
+       childActor.SetPosition(ACTOR_CHILD_SET_POSITION);
        parentActor.Add(childActor);
-       PositionInheritanceMode ePositionMode = childActor.GetPositionInheritanceMode();
-       
-       if(ePositionMode != INHERIT_PARENT_POSITION)
-       {        
-               LOG_E("ePositionMode should be INHERIT_PARENT_POSITION");
-               parentActor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
-       }
        g_Actor = parentActor;
 }
 void VTActorGetWorldPositionNotInherited001()
 {
        Actor childActor = g_Actor.GetChildAt(0);
-       Vector3 vec3WorldPosition = childActor.GetCurrentWorldPosition();       
+       Vector3 vec3WorldPosition = childActor.GetCurrentWorldPosition();
        if(vec3WorldPosition != (ACTOR_SET_POSITION+ACTOR_CHILD_SET_POSITION))
        {
-               LOG_E("vec3WorldPosition should be sum of parent and child position");
-               g_Actor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
-       }
-
-       childActor.SetPositionInheritanceMode(DONT_INHERIT_POSITION);
-       PositionInheritanceMode ePosMode = childActor.GetPositionInheritanceMode();
-       
-       if(ePosMode != DONT_INHERIT_POSITION)
-       {
-               LOG_E("ePositionMode should be DONT_INHERIT_POSITION");
-               g_Actor.Remove(childActor);
-               test_return_value=TC_FAIL;
-               return;
+                LOG_E("vec3WorldPosition should be sum of parent and child position");
+                g_Actor.Remove(childActor);
+                test_return_value=TC_FAIL;
+                return;
        }
 
+       childActor.SetInheritPosition( false );
        childActor.SetPosition(ACTOR_CHILD_SET_OFFSET);
 }
 void VTActorGetWorldPositionNotInherited002()
 {
        Actor childActor = g_Actor.GetChildAt(0);
-       DALI_CHECK_FAIL(childActor.GetCurrentWorldPosition() != ACTOR_CHILD_SET_OFFSET, "vec3WorldPosition should be child offset");                    
+       DALI_CHECK_FAIL(childActor.GetCurrentWorldPosition() != ACTOR_CHILD_SET_OFFSET, "vec3WorldPosition should be child offset");
        Stage::GetCurrent().Remove(g_Actor);
-       
+
        DaliLog::PrintPass();
 }
 

diff --git a/src/itc/dali-core/actor/ITs-actor.cpp b/src/itc/dali-core/actor/ITs-actor.cpp
index cd98c023f27651a43af4bc3f938aaef7f7ae7666..a9a05159aef4c3176fb2bc65271214604aa00d70 100755 (executable)
--- a/src/itc/dali-core/actor/ITs-actor.cpp
+++ b/src/itc/dali-core/actor/ITs-actor.cpp
@@ -37,7 +37,6 @@ namespace
                ACTOR_GET_PARENT,
                ACTOR_FIND_CHILD_BY_NAME_ID,
                ACTOR_ADD_UNPARENT,
-               ACTOR_SET_GET_DRAWMODE_STENCIL,
                ACTOR_SET_GET_DRAWMODE_NORMAL,
                ACTOR_SET_IS_KEYBOARD_FOCUSABLE,
                ACTOR_SET_IS_VISIBLE,
@@ -174,10 +173,6 @@ namespace
                                ActorAddUnparent();
                                break;
                                
-                               case ACTOR_SET_GET_DRAWMODE_STENCIL:
-                               ActorSetGetDrawModeSTENCIL();
-                               break;
-                               
                                case ACTOR_SET_GET_DRAWMODE_NORMAL:
                                ActorSetGetDrawModeNORMAL();
                                break;
@@ -674,7 +669,7 @@ namespace
                                        break;
                                }
                                break;
-                               
+
                                case ACTOR_GET_WORLDPOSITION_SET_GET_POSITION_INHERITANCE_MODE_INHERIT_PARENT_POSITION:
                                VTActorGetWorldPositionParent001();
                                mTimer.Stop();
@@ -688,7 +683,7 @@ namespace
                                        VTActorGetWorldPositionParent002();
                                        g_nRenderCount++;
                                        break;
-                                       
+
                                        case 1:
                                        VTActorGetWorldPositionParent003();
                                        mTimer.Stop();
@@ -704,7 +699,7 @@ namespace
                                        VTActorGetWorldPositionParentLocal001();
                                        g_nRenderCount++;
                                        break;
-                                       
+
                                        case 1:
                                        VTActorGetWorldPositionParentLocal002();
                                        mTimer.Stop();
@@ -720,7 +715,7 @@ namespace
                                        VTActorGetWorldPositionNotInherited001();
                                        g_nRenderCount++;
                                        break;
-                                       
+
                                        case 1:
                                        VTActorGetWorldPositionNotInherited002();
                                        mTimer.Stop();
@@ -1070,34 +1065,6 @@ int ITcActorAddUnparent(void)
     return test_return_value;
 }
 
-//& purpose: Set and get the Actor's DrawMode for STENCIL
-//& type: auto
-/**
-* @testcase                            ITcActorSetGetDrawModeSTENCIL
-* @type                                        Positive
-* @since_tizen                         2.4
-* @description                 Set and get the Actor's DrawMode for STENCIL
-* @scenario                                    Create an initialized Actor \n
-*                                                      Set the Actor's DrawMode to STENCIL \n
-*                                                      Get the Actor's DrawMode to STENCIL \n
-*                                                      Check the Actor's DrawMode \n
-* @apicovered                          Actor::New(), SetDrawMode, GetDrawMode
-* @passcase                                if set and get value is matched.
-* @failcase                                if set and get value is not matched.
-* @precondition                            NA
-* @postcondition                       NA
-*/
-
-int ITcActorSetGetDrawModeSTENCIL(void)
-{
-       DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       Actor_TestApp testApp( application, ACTOR_SET_GET_DRAWMODE_STENCIL);
-       application.MainLoop();
-    return test_return_value;
-}
-
 //& purpose: Set and get the Actor's DrawMode for NORMAL
 //& type: auto
 /**
@@ -1682,7 +1649,7 @@ int ITcActorSetGetCurrentParentOrigin(void)
 *                                                      Get the world-position of the Actor \n
 *                                                      Check the world-position of the Actor \n
 *                                                      Remove child from it's parent \n
-* @apicovered                          Actor::New(),SetPosition, Add, GetPositionInheritanceMode,GetCurrentWorldPosition,SetPositionInheritanceMode 
+* @apicovered                          Actor::New(),SetPosition, Add, GetCurrentWorldPosition
 * @passcase                                if set and get value is matched.
 * @failcase                                if set and get value is not matched.
 * @precondition                            NA
@@ -1721,7 +1688,7 @@ int ITcActorGetWorldPositionSetGetPositionInheritanceModeINHERIT_PARENT_POSITION
 *                                                      Get the world-position of the Actor \n
 *                                                      Check the world-position of the Actor \n
 *                                                      Remove child from it's parent
-* @apicovered                          Actor::New(),SetPosition, Add, GetPositionInheritanceMode,GetCurrentWorldPosition,SetPositionInheritanceMode 
+* @apicovered                          Actor::New(),SetPosition, Add, GetCurrentWorldPosition
 * @passcase                                if set and get value is matched.
 * @failcase                                if set and get value is not matched.
 * @precondition                            NA
@@ -1761,7 +1728,7 @@ int ITcActorGetWorldPositionSetGetPositionInheritanceModeUSE_PARENT_POSITION(voi
 *                                                      Get the world-position of the Actor \n
 *                                                      Check the world-position of the Actor \n
 *                                                      Remove child from it's parent
-* @apicovered                          Actor::New(),SetPosition, Add, GetPositionInheritanceMode,GetCurrentWorldPosition,SetPositionInheritanceMode 
+* @apicovered                          Actor::New(),SetPosition, Add, GetCurrentWorldPosition
 * @passcase                                if set and get value is matched.
 * @failcase                                if set and get value is not matched.
 * @precondition                            NA
@@ -1801,7 +1768,7 @@ int ITcActorGetWorldPositionSetGetPositionInheritanceModeUSE_PARENT_POSITION_PLU
 *                                                      Get the world-position of the Actor \n
 *                                                      Check the world-position of the Actor \n
 *                                                      Remove child from it's parent \n
-* @apicovered                          Actor::New(),SetPosition, Add, GetPositionInheritanceMode,GetCurrentWorldPosition,SetPositionInheritanceMode 
+* @apicovered                          Actor::New(),SetPosition, Add, GetCurrentWorldPosition
 * @passcase                                if set and get value is matched.
 * @failcase                                if set and get value is not matched.
 * @precondition                            NA

diff --git a/src/itc/dali-core/layer/ITs-layer-impl.h b/src/itc/dali-core/layer/ITs-layer-impl.h
index a9c2fd6b8aa638cd01f49c660e81a59f93a5ab35..c87e830b5b38c0f7c7f925f4cf54056d17922268 100755 (executable)
--- a/src/itc/dali-core/layer/ITs-layer-impl.h
+++ b/src/itc/dali-core/layer/ITs-layer-impl.h
@@ -90,7 +90,7 @@ void LayerDownCast(void)
        
        Layer layer1 = Layer::New();
 
-       DALI_CHECK_FAIL( layer1.GetBehavior() != Dali::Layer::LAYER_2D, "Layer Behavior Mismatch" );
+       DALI_CHECK_FAIL( layer1.GetBehavior() != Dali::Layer::LAYER_UI, "Layer Behavior Mismatch" );
        layer1.SetBehavior( Dali::Layer::LAYER_3D );
        DALI_CHECK_FAIL( layer1.GetBehavior() != Dali::Layer::LAYER_3D, "Layer Behavior Mismatch" );
        

diff --git a/src/itc/dali-core/tct-dali-core-native_mobile.h b/src/itc/dali-core/tct-dali-core-native_mobile.h
index 56950ee3765ff095f371c62fca3ceba49c1e7bf5..84d0b20fd30505427bed64717ee57142994df9ed 100755 (executable)
--- a/src/itc/dali-core/tct-dali-core-native_mobile.h
+++ b/src/itc/dali-core/tct-dali-core-native_mobile.h
@@ -211,7 +211,6 @@ extern int ITcActorGetChildAt(void);
 extern int ITcActorGetParent(void);
 extern int ITcActorFindChildByNameId(void);
 extern int ITcActorAddUnparent(void);
-extern int ITcActorSetGetDrawModeSTENCIL(void);
 extern int ITcActorSetGetDrawModeNORMAL(void);
 extern int ITcActorSetIsKeyboardFocusable(void);
 extern int ITcActorSetIsVisible(void);
@@ -1091,7 +1090,6 @@ testcase tc_array[] = {
        {"ITcActorGetParent",ITcActorGetParent,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorFindChildByNameId",ITcActorFindChildByNameId,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorAddUnparent",ITcActorAddUnparent,ITs_actor_startup,ITs_actor_cleanup},
-       {"ITcActorSetGetDrawModeSTENCIL",ITcActorSetGetDrawModeSTENCIL,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetGetDrawModeNORMAL",ITcActorSetGetDrawModeNORMAL,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetIsKeyboardFocusable",ITcActorSetIsKeyboardFocusable,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetIsVisible",ITcActorSetIsVisible,ITs_actor_startup,ITs_actor_cleanup},

diff --git a/src/itc/dali-core/tct-dali-core-native_tizeniot.h b/src/itc/dali-core/tct-dali-core-native_tizeniot.h
index 52c98dbc9c8cbdee0aa4db9bdcf513e8d637f83d..113c89a696dffb50e79defe7af247e6e5f6124de 100755 (executable)
--- a/src/itc/dali-core/tct-dali-core-native_tizeniot.h
+++ b/src/itc/dali-core/tct-dali-core-native_tizeniot.h
@@ -211,7 +211,6 @@ extern int ITcActorGetChildAt(void);
 extern int ITcActorGetParent(void);
 extern int ITcActorFindChildByNameId(void);
 extern int ITcActorAddUnparent(void);
-extern int ITcActorSetGetDrawModeSTENCIL(void);
 extern int ITcActorSetGetDrawModeNORMAL(void);
 extern int ITcActorSetIsKeyboardFocusable(void);
 extern int ITcActorSetIsVisible(void);
@@ -1088,7 +1087,6 @@ testcase tc_array[] = {
        {"ITcActorGetParent",ITcActorGetParent,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorFindChildByNameId",ITcActorFindChildByNameId,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorAddUnparent",ITcActorAddUnparent,ITs_actor_startup,ITs_actor_cleanup},
-       {"ITcActorSetGetDrawModeSTENCIL",ITcActorSetGetDrawModeSTENCIL,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetGetDrawModeNORMAL",ITcActorSetGetDrawModeNORMAL,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetIsKeyboardFocusable",ITcActorSetIsKeyboardFocusable,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetIsVisible",ITcActorSetIsVisible,ITs_actor_startup,ITs_actor_cleanup},

diff --git a/src/itc/dali-core/tct-dali-core-native_wearable.h b/src/itc/dali-core/tct-dali-core-native_wearable.h
index a261b7d0cb8c0e38cd4add41342684243123a9f2..8c9a35369515aea8bea294907128a8ecb9d7d3e2 100755 (executable)
--- a/src/itc/dali-core/tct-dali-core-native_wearable.h
+++ b/src/itc/dali-core/tct-dali-core-native_wearable.h
@@ -211,7 +211,6 @@ extern int ITcActorGetChildAt(void);
 extern int ITcActorGetParent(void);
 extern int ITcActorFindChildByNameId(void);
 extern int ITcActorAddUnparent(void);
-extern int ITcActorSetGetDrawModeSTENCIL(void);
 extern int ITcActorSetGetDrawModeNORMAL(void);
 extern int ITcActorSetIsKeyboardFocusable(void);
 extern int ITcActorSetIsVisible(void);
@@ -1090,7 +1089,6 @@ testcase tc_array[] = {
        {"ITcActorGetParent",ITcActorGetParent,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorFindChildByNameId",ITcActorFindChildByNameId,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorAddUnparent",ITcActorAddUnparent,ITs_actor_startup,ITs_actor_cleanup},
-       {"ITcActorSetGetDrawModeSTENCIL",ITcActorSetGetDrawModeSTENCIL,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetGetDrawModeNORMAL",ITcActorSetGetDrawModeNORMAL,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetIsKeyboardFocusable",ITcActorSetIsKeyboardFocusable,ITs_actor_startup,ITs_actor_cleanup},
        {"ITcActorSetIsVisible",ITcActorSetIsVisible,ITs_actor_startup,ITs_actor_cleanup},

diff --git a/src/itc/dali-toolkit/scrollable/ITs-scrollable.cpp b/src/itc/dali-toolkit/scrollable/ITs-scrollable.cpp
index 483dd55cd49d7a01fbf40df9c3a6a63a80557843..b1e02aa8d58a048309fc3eec1fa1c7ddf8c1d374 100755 (executable)
--- a/src/itc/dali-toolkit/scrollable/ITs-scrollable.cpp
+++ b/src/itc/dali-toolkit/scrollable/ITs-scrollable.cpp
@@ -143,12 +143,12 @@ void ScrollableCopyConstructorAssignmentOperator()
        const Vector2 VEC2_SET_SIZE(2.0f,5.0f); 
     ScrollView scrollview = ScrollView::New();
     DALI_CHECK_FAIL(!scrollview, "Scrollview::New is failed");
-    scrollview.SetDrawMode(Dali::DrawMode::STENCIL);
+    scrollview.SetDrawMode(Dali::DrawMode::OVERLAY_2D);
     
     //Assignment   
     Scrollable scrollable = scrollview;
     DALI_CHECK_FAIL(scrollable != scrollview, "Scrollable::Assignment is failed ");
-    DALI_CHECK_FAIL(scrollable.GetDrawMode() != Dali::DrawMode::STENCIL, "Scrolable::Assignment property mismatched");
+    DALI_CHECK_FAIL(scrollable.GetDrawMode() != Dali::DrawMode::OVERLAY_2D, "Scrolable::Assignment property mismatched");
     
     //CopyConstructor
     scrollable.SetMinimumSize(VEC2_SET_SIZE); 

diff --git a/src/itc/dali-toolkit/text-field/ITs-text-field.cpp b/src/itc/dali-toolkit/text-field/ITs-text-field.cpp
index c75a7870db5ca698dbfaf416cb266041eee327d2..81e509f5ace679b353e81f3a5e6a1f28e5ecd6af 100755 (executable)
--- a/src/itc/dali-toolkit/text-field/ITs-text-field.cpp
+++ b/src/itc/dali-toolkit/text-field/ITs-text-field.cpp
@@ -59,8 +59,6 @@ const char* const PROPERTY_NAME_HORIZONTAL_ALIGNMENT                 = "horizont
 const char* const PROPERTY_NAME_VERTICAL_ALIGNMENT                   = "verticalAlignment";
 const char* const PROPERTY_NAME_TEXT_COLOR                           = "textColor";
 const char* const PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR               = "placeholderTextColor";
-const char* const PROPERTY_NAME_SHADOW_OFFSET                        = "shadowOffset";
-const char* const PROPERTY_NAME_SHADOW_COLOR                         = "shadowColor";
 const char* const PROPERTY_NAME_PRIMARY_CURSOR_COLOR                 = "primaryCursorColor";
 const char* const PROPERTY_NAME_SECONDARY_CURSOR_COLOR               = "secondaryCursorColor";
 const char* const PROPERTY_NAME_ENABLE_CURSOR_BLINK                  = "enableCursorBlink";
@@ -381,8 +379,6 @@ void TextFieldSetGetPropertiesAndIndex()
        DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_VERTICAL_ALIGNMENT ) != TextField::Property::VERTICAL_ALIGNMENT  ,"Property index not match for VERTICAL_ALIGNMENT");
        DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_TEXT_COLOR ) != TextField::Property::TEXT_COLOR  ,"Property index not match for TEXT_COLOR");
        DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR ) != TextField::Property::PLACEHOLDER_TEXT_COLOR  ,"Property index not match for PLACEHOLDER_TEXT_COLOR");
-       DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_SHADOW_OFFSET ) != TextField::Property::SHADOW_OFFSET  ,"Property index not match for SHADOW_OFFSET");
-       DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_SHADOW_COLOR ) != TextField::Property::SHADOW_COLOR  ,"Property index not match for SHADOW_COLOR");
        DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_PRIMARY_CURSOR_COLOR ) != TextField::Property::PRIMARY_CURSOR_COLOR  ,"Property index not match for PRIMARY_CURSOR_COLOR");
        DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_SECONDARY_CURSOR_COLOR ) != TextField::Property::SECONDARY_CURSOR_COLOR  ,"Property index not match for SECONDARY_CURSOR_COLOR");
        DALI_CHECK_FAIL( textField.GetPropertyIndex( PROPERTY_NAME_ENABLE_CURSOR_BLINK ) != TextField::Property::ENABLE_CURSOR_BLINK  ,"Property index not match for ENABLE_CURSOR_BLINK");
@@ -467,11 +463,6 @@ void TextFieldSetGetPropertiesAndIndex()
        textField.SetProperty( TextField::Property::PLACEHOLDER_TEXT_COLOR, Color::RED );
        DALI_CHECK_FAIL( textField.GetProperty<Vector4>( TextField::Property::PLACEHOLDER_TEXT_COLOR ) != Color::RED, "Property value not match." );
 
-       textField.SetProperty( TextField::Property::SHADOW_OFFSET, Vector2( 1.f, 1.f ) );
-       DALI_CHECK_FAIL( textField.GetProperty<Vector2>( TextField::Property::SHADOW_OFFSET ) != Vector2( 1.f, 1.f ), "Property value not match." );
-       textField.SetProperty( TextField::Property::SHADOW_COLOR, Color::GREEN );
-       DALI_CHECK_FAIL( textField.GetProperty<Vector4>( TextField::Property::SHADOW_COLOR ) != Color::GREEN, "Property value not match." );
-
        textField.SetProperty( TextField::Property::PRIMARY_CURSOR_COLOR, Color::RED );
        DALI_CHECK_FAIL( textField.GetProperty<Vector4>( TextField::Property::PRIMARY_CURSOR_COLOR ) != Color::RED, "Property value not match." );
        textField.SetProperty( TextField::Property::SECONDARY_CURSOR_COLOR, Color::BLUE );

diff --git a/src/itc/dali-toolkit/text-label/ITs-text-label.cpp b/src/itc/dali-toolkit/text-label/ITs-text-label.cpp
index b5a0604966a4b87041d474564bac26fd73d93157..daff95576446e1c360d22c2e15afe8e84e81badf 100755 (executable)
--- a/src/itc/dali-toolkit/text-label/ITs-text-label.cpp
+++ b/src/itc/dali-toolkit/text-label/ITs-text-label.cpp
@@ -182,19 +182,26 @@ void TextLabelGetSetPropertiesWithAssignment()
 
        label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLUE );
        DALI_CHECK_FAIL( label.GetProperty<Vector4>( TextLabel::Property::TEXT_COLOR ) != Color::BLUE, "TextLabel color set/get failed." );
-       DALI_CHECK_FAIL( label.GetProperty<Vector4>( TextLabel::Property::UNDERLINE_COLOR ) != Color::BLUE, "TextLabel color set/get failed." );
 
-       label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 3.0f, 3.0f ) );
-       DALI_CHECK_FAIL( label.GetProperty<Vector2>( TextLabel::Property::SHADOW_OFFSET ) != Vector2( 3.0f, 3.0f ), "TextLabel shadoe offset set/get failed." );
-       label.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLUE );
-       DALI_CHECK_FAIL( label.GetProperty<Vector4>( TextLabel::Property::SHADOW_COLOR ) != Color::BLUE, "TextLabel shadow color set/get failed." );
+    Property::Map shadowMapSet;
+    Property::Map shadowMapGet;
+    shadowMapSet.Insert( "color", Color::BLUE );
+    shadowMapSet.Insert( "offset", Vector2( 3.0f, 3.0f ) );
+    shadowMapSet.Insert( "blurRadius", 5.0f );
+    label.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
 
-       label.SetProperty( TextLabel::Property::UNDERLINE_ENABLED, true );
-       DALI_CHECK_FAIL( !label.GetProperty<bool>( TextLabel::Property::UNDERLINE_ENABLED ), "TextLabel underline enable set/get failed." );
-       label.SetProperty( TextLabel::Property::UNDERLINE_COLOR, Color::RED );
-       DALI_CHECK_FAIL( label.GetProperty<Vector4>( TextLabel::Property::UNDERLINE_COLOR ) != Color::RED, "TextLabel underline color set/get failed." );
-       label.SetProperty( TextLabel::Property::UNDERLINE_HEIGHT, 1.0f );
-       DALI_CHECK_FAIL( label.GetProperty<float>( TextLabel::Property::UNDERLINE_HEIGHT ) != 1.0f, "TextLabel underline height set/get failed." );
+    shadowMapGet = label.GetProperty<Property::Map>( TextLabel::Property::SHADOW );
+    DALI_CHECK_FAIL( shadowMapGet.Count() != shadowMapSet.Count(), "TextLabel shadow set/get failed." );
+
+    Property::Map underlineMapSet;
+    Property::Map underlineMapGet;
+    underlineMapSet.Insert( "enable", "true" );
+    underlineMapSet.Insert( "color", "red" );
+    underlineMapSet.Insert( "height", "1.0" );
+    label.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
+
+    underlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
+    DALI_CHECK_FAIL( underlineMapGet.Count() != underlineMapSet.Count(), "TextLabel underline set/get failed." );
 
        TextLabel label2 = TextLabel::New( "New text" );
        DALI_CHECK_FAIL( !label2,"TextLabel TextLabel::New(const string) failed.");
@@ -228,43 +235,40 @@ void TextLabelNewWithTextCopy()
        const string STR_LABEL_TEXT = "Label Text";
        const Vector2 VEC2_SHADOW_OFFSET( Vector2::ONE );
        const float F_UNDERLINE_HEIGHT = 5.0f;
-       float fGetUnderLineHeight = 0.0f;
-       
-       bool bEnableUnderLine = true, bCheckEnableUnderLine = false;
-       Vector4 vec4ShadowColorGet, vec4UnderLineColorGet;
-       Vector2 vec2ShadowOffSetGet;
+
+    bool bEnableUnderLine = true;
        string strLabelTextGet = "";
        
        TextLabel textLabel = TextLabel::New( STR_LABEL_TEXT );
        DALI_CHECK_INSTANCE( textLabel, "TextLabel::New() is failed." );
-       
-       textLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, VEC2_SHADOW_OFFSET );
-       textLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::CYAN );
-       textLabel.SetProperty( TextLabel::Property::UNDERLINE_ENABLED, bEnableUnderLine );
-       textLabel.SetProperty( TextLabel::Property::UNDERLINE_COLOR, Color::RED );
-       textLabel.SetProperty( TextLabel::Property::UNDERLINE_HEIGHT, F_UNDERLINE_HEIGHT );
-       
+
+
+    Property::Map shadowMapSet;
+    Property::Map shadowMapGet;
+    shadowMapSet.Insert( "color", Color::CYAN );
+    shadowMapSet.Insert( "offset", VEC2_SHADOW_OFFSET );
+    shadowMapSet.Insert( "blurRadius", 5.0f );
+    textLabel.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
+
+    Property::Map underlineMapSet;
+    Property::Map underlineMapGet;
+    underlineMapSet.Insert( "enable", bEnableUnderLine );
+    underlineMapSet.Insert( "color", Color::RED );
+    underlineMapSet.Insert( "height", F_UNDERLINE_HEIGHT );
+    textLabel.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
+
        TextLabel textLabelCopy( textLabel );
        DALI_CHECK_INSTANCE( textLabelCopy, "TextLabel handle is empty after copying." );
        
        strLabelTextGet = textLabelCopy.GetProperty<string>( TextLabel::Property::TEXT );
        DALI_CHECK_FAIL( strLabelTextGet != STR_LABEL_TEXT, "TextLabel::TextLabel(const TextLabel&) is failed along with set text." );
-       
-       vec2ShadowOffSetGet = textLabelCopy.GetProperty<Vector2>( TextLabel::Property::SHADOW_OFFSET );
-       DALI_CHECK_FAIL( vec2ShadowOffSetGet != VEC2_SHADOW_OFFSET, "TextLabel::TextLabel(const TextLabel&) is failed along with set shadow offset." );
-       
-       vec4ShadowColorGet = textLabelCopy.GetProperty<Vector4>( TextLabel::Property::SHADOW_COLOR );
-       DALI_CHECK_FAIL( vec4ShadowColorGet != Color::CYAN, "TextLabel::TextLabel(const TextLabel&) is failed along with set shadow color." );
-       
-       bCheckEnableUnderLine = textLabelCopy.GetProperty<bool>( TextLabel::Property::UNDERLINE_ENABLED );
-       DALI_CHECK_FAIL( bCheckEnableUnderLine != bEnableUnderLine, "TextLabel::TextLabel(const TextLabel&) is failed along with set underline flag." );
-       
-       vec4UnderLineColorGet = textLabelCopy.GetProperty<Vector4>( TextLabel::Property::UNDERLINE_COLOR );
-       DALI_CHECK_FAIL( vec4UnderLineColorGet != Color::RED, "TextLabel::TextLabel(const TextLabel&) is failed along with set underline color." );
-       
-       fGetUnderLineHeight = textLabelCopy.GetProperty<float>( TextLabel::Property::UNDERLINE_HEIGHT );        
-       DALI_CHECK_FAIL( fGetUnderLineHeight != F_UNDERLINE_HEIGHT, "TextLabel::TextLabel(const TextLabel&) is failed along with set underline height." );
-       
+
+    shadowMapGet = textLabelCopy.GetProperty<Property::Map>( TextLabel::Property::SHADOW );
+    DALI_CHECK_FAIL( shadowMapGet.Count() != shadowMapSet.Count(), "TextLabel::TextLabel(const TextLabel&) is failed along with set shadow." );
+
+    underlineMapGet = textLabelCopy.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
+    DALI_CHECK_FAIL( underlineMapGet.Count() != underlineMapSet.Count(), "TextLabel::TextLabel(const TextLabel&) is failed along with set underline." );
+
        DaliLog::PrintPass();
 }
 

diff --git a/src/utc/dali-adaptor/application/utc-dali-application.cpp b/src/utc/dali-adaptor/application/utc-dali-application.cpp
index e0d15405ef18de664f3998760a322002307f1d66..c833d2a2a0bf8b0a09662681932fb251ba6700d5 100755 (executable)
--- a/src/utc/dali-adaptor/application/utc-dali-application.cpp
+++ b/src/utc/dali-adaptor/application/utc-dali-application.cpp
@@ -451,8 +451,6 @@ namespace
       mApplication.SetViewMode(STEREO_HORIZONTAL);
 
       mApplication.SetViewMode(STEREO_VERTICAL);
-
-      mApplication.SetViewMode(STEREO_INTERLACED);
     }
 
     void TestStereoBase()

diff --git a/src/utc/dali-core/actor/utc-dali-actor-impl.h b/src/utc/dali-core/actor/utc-dali-actor-impl.h
index ce4cece9643432bee26f7a59bcd95c7604cff9ce..db2a87e4f3a5c3be85885aa243d349c5d3ccdce3 100755 (executable)
--- a/src/utc/dali-core/actor/utc-dali-actor-impl.h
+++ b/src/utc/dali-core/actor/utc-dali-actor-impl.h
@@ -78,7 +78,6 @@ const PropertyStringIndex PROPERTY_TABLE[] =
   { "inheritOrientation",       Actor::Property::INHERIT_ORIENTATION,      Property::BOOLEAN     },
   { "inheritScale",             Actor::Property::INHERIT_SCALE,            Property::BOOLEAN     },
   { "colorMode",                Actor::Property::COLOR_MODE,               Property::STRING      },
-  { "positionInheritance",      Actor::Property::POSITION_INHERITANCE,     Property::STRING      },
   { "drawMode",                 Actor::Property::DRAW_MODE,                Property::STRING      },
   { "sizeModeFactor",           Actor::Property::SIZE_MODE_FACTOR,         Property::VECTOR3     },
   { "widthResizePolicy",        Actor::Property::WIDTH_RESIZE_POLICY,      Property::STRING      },
@@ -1138,17 +1137,8 @@ void ActorGetCurrentWorldPositionP()
   childActor.SetParentOrigin( ParentOrigin::CENTER );
   childActor.SetAnchorPoint( AnchorPoint::CENTER );
   childActor.SetPosition(ACTOR_CHILD_SET_POSITION);
-  childActor.SetPositionInheritanceMode(INHERIT_PARENT_POSITION);
   parentActor.Add(childActor);
-  PositionInheritanceMode ePositionMode = childActor.GetPositionInheritanceMode();
 
-  if(ePositionMode != INHERIT_PARENT_POSITION)
-  {
-    LOG_E("ePositionMode should be INHERIT_PARENT_POSITION");
-    parentActor.Remove(childActor);
-    test_return_value=TC_FAIL;
-    return;
-  }
   gActor = parentActor;
 }
 
@@ -1170,64 +1160,6 @@ void VTActorGetWorldPositionParent001()
   DaliLog::PrintPass();
 }
 
-void ActorSetPositionInheritanceModeP()
-{
-  Actor parentActor = Actor::New();
-  DALI_CHECK_FAIL(!parentActor, "Actor::New() is failed ");
-
-  parentActor.SetPosition(ACTOR_SET_POSITION);
-  parentActor.SetParentOrigin( ParentOrigin::CENTER );
-  parentActor.SetAnchorPoint( AnchorPoint::CENTER );
-  Stage::GetCurrent().Add(parentActor);
-
-  Actor childActor = Actor::New();
-  DALI_CHECK_FAIL(!childActor, "Actor::New() is failed ");
-  childActor.SetParentOrigin( ParentOrigin::CENTER );
-  childActor.SetAnchorPoint( AnchorPoint::CENTER );
-  childActor.SetPosition(ACTOR_CHILD_SET_POSITION);
-  childActor.SetPositionInheritanceMode(INHERIT_PARENT_POSITION);
-  parentActor.Add(childActor);
-  PositionInheritanceMode ePositionMode = childActor.GetPositionInheritanceMode();
-
-  if(ePositionMode != INHERIT_PARENT_POSITION)
-  {
-    LOG_E("ePositionMode should be INHERIT_PARENT_POSITION");
-    parentActor.Remove(childActor);
-    test_return_value=TC_FAIL;
-    return;
-  }
-  gActor = parentActor;
-}
-
-void ActorGetPositionInheritanceModeP()
-{
-  Actor parentActor = Actor::New();
-  DALI_CHECK_FAIL(!parentActor, "Actor::New() is failed ");
-
-  parentActor.SetPosition(ACTOR_SET_POSITION);
-  parentActor.SetParentOrigin( ParentOrigin::CENTER );
-  parentActor.SetAnchorPoint( AnchorPoint::CENTER );
-  Stage::GetCurrent().Add(parentActor);
-
-  Actor childActor = Actor::New();
-  DALI_CHECK_FAIL(!childActor, "Actor::New() is failed ");
-  childActor.SetParentOrigin( ParentOrigin::CENTER );
-  childActor.SetAnchorPoint( AnchorPoint::CENTER );
-  childActor.SetPosition(ACTOR_CHILD_SET_POSITION);
-  childActor.SetPositionInheritanceMode(INHERIT_PARENT_POSITION);
-  parentActor.Add(childActor);
-  PositionInheritanceMode ePositionMode = childActor.GetPositionInheritanceMode();
-
-  if(ePositionMode != INHERIT_PARENT_POSITION)
-  {
-    LOG_E("ePositionMode should be INHERIT_PARENT_POSITION");
-    parentActor.Remove(childActor);
-    test_return_value=TC_FAIL;
-    return;
-  }
-  gActor = parentActor;
-}
-
 void ActorSetPositionP()
 {
   gActor = Actor::New();

diff --git a/src/utc/dali-core/actor/utc-dali-actor.cpp b/src/utc/dali-core/actor/utc-dali-actor.cpp
index 953d8ddf6c249269aeb274ef53e658951658b53e..0c77e565c151416bed89b606ca0505034c10bf95 100755 (executable)
--- a/src/utc/dali-core/actor/utc-dali-actor.cpp
+++ b/src/utc/dali-core/actor/utc-dali-actor.cpp
@@ -68,8 +68,6 @@ namespace
     ACTOR_SET_PARENT_ORIGIN_P,
     ACTOR_GET_CURRENT_PARENT_ORIGIN_P,
     ACTOR_GET_CURRENT_WORLD_POSITION_P,
-    ACTOR_SET_POSITION_INHERITANCE_MODE_P,
-    ACTOR_GET_POSITION_INHERITANCE_MODE_P,
     ACTOR_SET_POSITION_P,
     ACTOR_SET_POSITION_P2,
     ACTOR_SET_POSITION_P3,
@@ -329,14 +327,6 @@ namespace
           ActorGetCurrentWorldPositionP();
           break;
 
-        case ACTOR_SET_POSITION_INHERITANCE_MODE_P:
-          ActorSetPositionInheritanceModeP();
-          break;
-
-        case ACTOR_GET_POSITION_INHERITANCE_MODE_P:
-          ActorGetPositionInheritanceModeP();
-          break;
-
         case ACTOR_SET_POSITION_P:
           ActorSetPositionP();
           break;
@@ -983,18 +973,6 @@ namespace
           mApplication.Quit();
           break;
 
-        case ACTOR_SET_POSITION_INHERITANCE_MODE_P:
-          VTActorGetWorldPositionParent001();
-          mTimer.Stop();
-          mApplication.Quit();
-          break;
-
-        case ACTOR_GET_POSITION_INHERITANCE_MODE_P:
-          VTActorGetWorldPositionParent001();
-          mTimer.Stop();
-          mApplication.Quit();
-          break;
-
         case ACTOR_SET_INHERIT_SCALE_P:
           switch (gRenderCount)
           {
@@ -1795,42 +1773,6 @@ int UtcDaliActorGetCurrentWorldPositionP(void)
   return test_return_value;
 }
 
-/**
- * @testcase           UtcDaliActorSetPositionInheritanceModeP
- * @since_tizen        2.4
- * @description        check if SetPositionInheritanceMode api works or not.
- */
-
-int UtcDaliActorSetPositionInheritanceModeP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv);
-  CHECK_GL;
-  Actor_TestApp testApp(application, ACTOR_SET_POSITION_INHERITANCE_MODE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase           UtcDaliActorGetPositionInheritanceModeP
- * @since_tizen        2.4
- * @description        check if GetPositionInheritanceMode api works or not.
- */
-
-int UtcDaliActorGetPositionInheritanceModeP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv);
-  CHECK_GL;
-  Actor_TestApp testApp(application, ACTOR_GET_POSITION_INHERITANCE_MODE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
 /**
  * @testcase           UtcDaliActorSetPositionP
  * @since_tizen        2.4

diff --git a/src/utc/dali-core/layer/utc-dali-layer-impl.h b/src/utc/dali-core/layer/utc-dali-layer-impl.h
index e9c82c1f2856ff018585859dda8dd2b3593441de..49bc32e0e47ef1ca852eea99f77e12bbc0fa9648 100755 (executable)
--- a/src/utc/dali-core/layer/utc-dali-layer-impl.h
+++ b/src/utc/dali-core/layer/utc-dali-layer-impl.h
@@ -670,7 +670,7 @@ void LayerSetBehaviorP()
 {
   Layer layer = Layer::New();
 
-  DALI_CHECK_FAIL(layer.GetBehavior() != Dali::Layer::LAYER_2D, "setbehavior and getbehavior mismatch" );
+  DALI_CHECK_FAIL(layer.GetBehavior() != Dali::Layer::LAYER_UI, "setbehavior and getbehavior mismatch" );
   layer.SetBehavior(Dali::Layer::LAYER_3D );
   DALI_CHECK_FAIL(layer.GetBehavior() != Dali::Layer::LAYER_3D, "setbehavior and getbehavior mismatch" );
   DaliLog::PrintPass();
@@ -680,7 +680,7 @@ void LayerGetBehaviorP()
 {
   Layer layer = Layer::New();
 
-  DALI_CHECK_FAIL(layer.GetBehavior() != Dali::Layer::LAYER_2D, "setbehavior and getbehavior mismatch" );
+  DALI_CHECK_FAIL(layer.GetBehavior() != Dali::Layer::LAYER_UI, "setbehavior and getbehavior mismatch" );
   layer.SetBehavior(Dali::Layer::LAYER_3D );
   DALI_CHECK_FAIL(layer.GetBehavior() != Dali::Layer::LAYER_3D, "setbehavior and getbehavior mismatch" );
   DaliLog::PrintPass();

diff --git a/src/utc/dali-core/tct-dali-core-core_mobile.h b/src/utc/dali-core/tct-dali-core-core_mobile.h
index e7fb9bbccdd5052909581ae54eb6fc269a68ff06..33ed167e91ef4ec2f74e3e0b9f19be49af3fcfdb 100755 (executable)
--- a/src/utc/dali-core/tct-dali-core-core_mobile.h
+++ b/src/utc/dali-core/tct-dali-core-core_mobile.h
@@ -917,8 +917,6 @@ extern int UtcDaliActorGetCurrentOpacityP(void);
 extern int UtcDaliActorSetParentOriginP(void);
 extern int UtcDaliActorGetCurrentParentOriginP(void);
 extern int UtcDaliActorGetCurrentWorldPositionP(void);
-extern int UtcDaliActorSetPositionInheritanceModeP(void);
-extern int UtcDaliActorGetPositionInheritanceModeP(void);
 extern int UtcDaliActorSetPositionP(void);
 extern int UtcDaliActorSetPositionP2(void);
 extern int UtcDaliActorSetPositionP3(void);
@@ -2094,8 +2092,6 @@ testcase tc_array[] = {
        {"UtcDaliActorSetParentOriginP",UtcDaliActorSetParentOriginP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorGetCurrentParentOriginP",UtcDaliActorGetCurrentParentOriginP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorGetCurrentWorldPositionP",UtcDaliActorGetCurrentWorldPositionP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
-       {"UtcDaliActorSetPositionInheritanceModeP",UtcDaliActorSetPositionInheritanceModeP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
-       {"UtcDaliActorGetPositionInheritanceModeP",UtcDaliActorGetPositionInheritanceModeP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP",UtcDaliActorSetPositionP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP2",UtcDaliActorSetPositionP2,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP3",UtcDaliActorSetPositionP3,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},

diff --git a/src/utc/dali-core/tct-dali-core-core_tizeniot.h b/src/utc/dali-core/tct-dali-core-core_tizeniot.h
index e7fb9bbccdd5052909581ae54eb6fc269a68ff06..33ed167e91ef4ec2f74e3e0b9f19be49af3fcfdb 100755 (executable)
--- a/src/utc/dali-core/tct-dali-core-core_tizeniot.h
+++ b/src/utc/dali-core/tct-dali-core-core_tizeniot.h
@@ -917,8 +917,6 @@ extern int UtcDaliActorGetCurrentOpacityP(void);
 extern int UtcDaliActorSetParentOriginP(void);
 extern int UtcDaliActorGetCurrentParentOriginP(void);
 extern int UtcDaliActorGetCurrentWorldPositionP(void);
-extern int UtcDaliActorSetPositionInheritanceModeP(void);
-extern int UtcDaliActorGetPositionInheritanceModeP(void);
 extern int UtcDaliActorSetPositionP(void);
 extern int UtcDaliActorSetPositionP2(void);
 extern int UtcDaliActorSetPositionP3(void);
@@ -2094,8 +2092,6 @@ testcase tc_array[] = {
        {"UtcDaliActorSetParentOriginP",UtcDaliActorSetParentOriginP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorGetCurrentParentOriginP",UtcDaliActorGetCurrentParentOriginP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorGetCurrentWorldPositionP",UtcDaliActorGetCurrentWorldPositionP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
-       {"UtcDaliActorSetPositionInheritanceModeP",UtcDaliActorSetPositionInheritanceModeP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
-       {"UtcDaliActorGetPositionInheritanceModeP",UtcDaliActorGetPositionInheritanceModeP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP",UtcDaliActorSetPositionP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP2",UtcDaliActorSetPositionP2,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP3",UtcDaliActorSetPositionP3,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},

diff --git a/src/utc/dali-core/tct-dali-core-core_wearable.h b/src/utc/dali-core/tct-dali-core-core_wearable.h
index 52bfde4d1e57f5e3e358b45e1f36eb73643754cc..894968dc581c8a38e24436635ed217f91b033741 100755 (executable)
--- a/src/utc/dali-core/tct-dali-core-core_wearable.h
+++ b/src/utc/dali-core/tct-dali-core-core_wearable.h
@@ -917,8 +917,6 @@ extern int UtcDaliActorGetCurrentOpacityP(void);
 extern int UtcDaliActorSetParentOriginP(void);
 extern int UtcDaliActorGetCurrentParentOriginP(void);
 extern int UtcDaliActorGetCurrentWorldPositionP(void);
-extern int UtcDaliActorSetPositionInheritanceModeP(void);
-extern int UtcDaliActorGetPositionInheritanceModeP(void);
 extern int UtcDaliActorSetPositionP(void);
 extern int UtcDaliActorSetPositionP2(void);
 extern int UtcDaliActorSetPositionP3(void);
@@ -2093,8 +2091,6 @@ testcase tc_array[] = {
        {"UtcDaliActorSetParentOriginP",UtcDaliActorSetParentOriginP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorGetCurrentParentOriginP",UtcDaliActorGetCurrentParentOriginP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorGetCurrentWorldPositionP",UtcDaliActorGetCurrentWorldPositionP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
-       {"UtcDaliActorSetPositionInheritanceModeP",UtcDaliActorSetPositionInheritanceModeP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
-       {"UtcDaliActorGetPositionInheritanceModeP",UtcDaliActorGetPositionInheritanceModeP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP",UtcDaliActorSetPositionP,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP2",UtcDaliActorSetPositionP2,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},
        {"UtcDaliActorSetPositionP3",UtcDaliActorSetPositionP3,utc_Dali_Actor_startup,utc_Dali_Actor_cleanup},

diff --git a/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp b/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp
index 4d6d50478ca71e6f9ef8b20c0bf5ae26467ce7ba..eae8da45d4d15fd3418db46b3e79ca3c5ba9eb28 100755 (executable)
--- a/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp
+++ b/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp
@@ -173,7 +173,6 @@ void ScrollableCopyConstructorP()
   const Vector2 VEC2_SET_SIZE(2.0f,5.0f);
   ScrollView scrollview = ScrollView::New();
   DALI_CHECK_FAIL(!scrollview, "Scrollview::New is failed");
-  scrollview.SetDrawMode(Dali::DrawMode::STENCIL);
 
   Scrollable scrollable = scrollview;
   Scrollable scrollablenew (scrollable);
@@ -188,12 +187,12 @@ void ScrollableOperatorAssignmentP()
   const Vector2 VEC2_SET_SIZE(2.0f,5.0f);
   ScrollView scrollview = ScrollView::New();
   DALI_CHECK_FAIL(!scrollview, "Scrollview::New is failed");
-  scrollview.SetDrawMode(Dali::DrawMode::STENCIL);
+  scrollview.SetDrawMode(Dali::DrawMode::OVERLAY_2D);
 
   //Assignment
   Scrollable scrollable = scrollview;
   DALI_CHECK_FAIL(scrollable != scrollview, "Scrollable::Assignment is failed ");
-  DALI_CHECK_FAIL(scrollable.GetDrawMode() != Dali::DrawMode::STENCIL, "Scrolable::Assignment property mismatched");
+  DALI_CHECK_FAIL(scrollable.GetDrawMode() != Dali::DrawMode::OVERLAY_2D, "Scrolable::Assignment property mismatched");
 
   DaliLog::PrintPass();
 }