projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated APIs in Tizen 3.0
[platform/core/uifw/dali-core.git]
/
automated-tests
/
src
/
dali
/
utc-Dali-Layer.cpp
diff --git
a/automated-tests/src/dali/utc-Dali-Layer.cpp
b/automated-tests/src/dali/utc-Dali-Layer.cpp
index
c46799e
..
9b3e5a4
100644
(file)
--- a/
automated-tests/src/dali/utc-Dali-Layer.cpp
+++ b/
automated-tests/src/dali/utc-Dali-Layer.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-467,17
+467,23
@@
int UtcDaliLayerDefaultProperties(void)
DALI_TEST_CHECK(Property::RECTANGLE == actor.GetPropertyType(Layer::Property::CLIPPING_BOX));
Property::Value v = actor.GetProperty(Layer::Property::CLIPPING_BOX);
DALI_TEST_CHECK(Property::RECTANGLE == actor.GetPropertyType(Layer::Property::CLIPPING_BOX));
Property::Value v = actor.GetProperty(Layer::Property::CLIPPING_BOX);
+ DALI_TEST_CHECK(v.Get<Rect<int> >() == testBox);
+ v = actor.GetCurrentProperty( Layer::Property::CLIPPING_BOX );
DALI_TEST_CHECK(v.Get<Rect<int> >() == testBox);
// set the same boundaries, but through a clipping box object
actor.SetClippingBox( testBox );
DALI_TEST_CHECK(v.Get<Rect<int> >() == testBox);
// set the same boundaries, but through a clipping box object
actor.SetClippingBox( testBox );
-
DALI_TEST_CHECK( actor.GetClippingBox() == testBox );
DALI_TEST_CHECK( actor.GetClippingBox() == testBox );
+ actor.SetProperty(Layer::Property::BEHAVIOR, Property::Value(Layer::LAYER_UI));
+ DALI_TEST_CHECK(Property::STRING == actor.GetPropertyType(Layer::Property::BEHAVIOR));
Property::Value behavior = actor.GetProperty(Layer::Property::BEHAVIOR);
Property::Value behavior = actor.GetProperty(Layer::Property::BEHAVIOR);
- DALI_TEST_EQUALS(behavior.Get<std::string>().c_str(), "LAYER_2D", TEST_LOCATION );
+ DALI_TEST_EQUALS(behavior.Get<std::string>().c_str(), "LAYER_UI", TEST_LOCATION );
+
+ behavior = actor.GetCurrentProperty( Layer::Property::BEHAVIOR );
+ DALI_TEST_EQUALS(behavior.Get<std::string>().c_str(), "LAYER_UI", TEST_LOCATION );
END_TEST;
}
END_TEST;
}
@@
-578,7
+584,7
@@
int UtcDaliLayerBehaviour(void)
TestApplication application;
Layer layer = Layer::New();
TestApplication application;
Layer layer = Layer::New();
- DALI_TEST_EQUALS( layer.GetBehavior(), Dali::Layer::LAYER_
2D
, TEST_LOCATION );
+ DALI_TEST_EQUALS( layer.GetBehavior(), Dali::Layer::LAYER_
UI
, TEST_LOCATION );
layer.SetBehavior( Dali::Layer::LAYER_3D );
DALI_TEST_EQUALS( layer.GetBehavior(), Dali::Layer::LAYER_3D, TEST_LOCATION );
END_TEST;
layer.SetBehavior( Dali::Layer::LAYER_3D );
DALI_TEST_EQUALS( layer.GetBehavior(), Dali::Layer::LAYER_3D, TEST_LOCATION );
END_TEST;