projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove non-touch related deprecated APIs" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Control.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
index
5255f10
..
e7b096a
100755
(executable)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
@@
-26,6
+26,7
@@
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/public-api/align-enumerations.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/public-api/align-enumerations.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
@@
-425,7
+426,7
@@
int UtcDaliControlSignalAutomaticDisconnect(void)
DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
const Vector3 ignoredSize( 20, 20, 0 );
DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
const Vector3 ignoredSize( 20, 20, 0 );
- actor.Set
Size(
ignoredSize );
+ actor.Set
Property( Actor::Property::SIZE,
ignoredSize );
END_TEST;
}
END_TEST;
}
@@
-434,7
+435,7
@@
int UtcDaliControlTestParameters(void)
ToolkitTestApplication application;
DummyControl test = DummyControl::New();
ToolkitTestApplication application;
DummyControl test = DummyControl::New();
- test.Set
Size( 0.7f, 0.7f, 0.7f
);
+ test.Set
Property( Actor::Property::SIZE, Vector3( 0.7f, 0.7f, 0.7f )
);
Stage::GetCurrent().Add( test );
Stage::GetCurrent().Add( test );
@@
-950,7
+951,7
@@
int UtcDaliControlResourcesReady(void)
dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, smallVisual );
dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, smallVisual );
- actor.Set
Size( 200.f, 200.f
);
+ actor.Set
Property( Actor::Property::SIZE, Vector2( 200.f, 200.f )
);
Toolkit::Visual::ResourceStatus resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
Toolkit::Visual::ResourceStatus resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
@@
-1009,7
+1010,7
@@
int UtcDaliControlResourcesReady02(void)
gResourceReadySignalFired = false;
Control control = Control::New();
gResourceReadySignalFired = false;
Control control = Control::New();
- control.Set
Size( 200.f, 200.f
);
+ control.Set
Property( Actor::Property::SIZE, Vector2( 200.f, 200.f )
);
control.ResourceReadySignal().Connect( &ResourceReadySignal );
Property::Map propertyMap;
control.ResourceReadySignal().Connect( &ResourceReadySignal );
Property::Map propertyMap;
@@
-1120,7
+1121,7
@@
int UtcDaliControlDoAction(void)
Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
- dummyControl.Set
Size(200.f, 200.f
);
+ dummyControl.Set
Property( Actor::Property::SIZE, Vector2( 200.f, 200.f )
);
Stage::GetCurrent().Add( dummyControl );
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
Stage::GetCurrent().Add( dummyControl );
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
@@
-1162,7
+1163,7
@@
int UtcDaliControlDoActionWhenNotStage(void)
Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
- dummyControl.Set
Size(200.f, 200.f
);
+ dummyControl.Set
Property( Actor::Property::SIZE, Vector2( 200.f, 200.f )
);
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();