[dali_1.9.17] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-Geometry.cpp

diff --git a/automated-tests/src/dali/utc-Dali-Geometry.cpp b/automated-tests/src/dali/utc-Dali-Geometry.cpp
index 0bb9aa3..ab99c59 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Geometry.cpp
+++ b/automated-tests/src/dali/utc-Dali-Geometry.cpp
@@ -35,11 +35,6 @@ void geometry_test_cleanup(void)
 namespace
 {
 
-void TestConstraintNoBlue( Vector4& current, const PropertyInputContainer& inputs )
-{
-  current.b = 0.0f;
-}
-
 struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
 
 PropertyBuffer CreateVertexBuffer( const std::string& aPosition, const std::string& aTexCoord )
@@ -145,7 +140,7 @@ int UtcDaliGeometryAddVertexBuffer(void)
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
   Actor actor = Actor::New();
-  actor.SetSize(Vector3::ONE * 100.f);
+  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   Stage::GetCurrent().Add(actor);
 
@@ -223,7 +218,7 @@ int UtcDaliGeometryRemoveVertexBuffer(void)
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
   Actor actor = Actor::New();
-  actor.SetSize(Vector3::ONE * 100.f);
+  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   Stage::GetCurrent().Add(actor);
 
@@ -256,7 +251,7 @@ int UtcDaliGeometrySetIndexBuffer(void)
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
   Actor actor = Actor::New();
-  actor.SetSize(Vector3::ONE * 100.f);
+  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   Stage::GetCurrent().Add(actor);
 
@@ -303,7 +298,7 @@ int UtcDaliGeometrySetGetGeometryType01(void)
 {
   TestApplication application;
 
-  tet_infoline("Test SetGeometryType and GetGeometryType: without index buffer");
+  tet_infoline("Test SetType and GetType: without index buffer");
 
   unsigned int numVertex = 4u;
   PropertyBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
@@ -314,7 +309,7 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
   Actor actor = Actor::New();
-  actor.SetSize(Vector3::ONE * 100.f);
+  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   Stage::GetCurrent().Add(actor);
 
@@ -338,11 +333,11 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   out << GL_TRIANGLES << ", " << 0 << ", " << numVertex;
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::TRIANGLES, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLES, TEST_LOCATION);
 
   /*********************************************************/
   // LINES, no index buffer
-  geometry.SetGeometryType( Geometry::LINES );
+  geometry.SetType( Geometry::LINES );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -359,11 +354,11 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   out << GL_LINES << ", " << 0 << ", " << numVertex;
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::LINES, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::LINES, TEST_LOCATION);
 
   /*****************************************************/
   //POINTS
-  geometry.SetGeometryType( Geometry::POINTS );
+  geometry.SetType( Geometry::POINTS );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -380,11 +375,11 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   out << GL_POINTS << ", " << 0 << ", " << numVertex;
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::POINTS, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::POINTS, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_STRIP, no index buffer
-  geometry.SetGeometryType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType( Geometry::TRIANGLE_STRIP );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -401,11 +396,11 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   out << GL_TRIANGLE_STRIP << ", " << 0 << ", " << numVertex;
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_FAN, no index buffer
-  geometry.SetGeometryType( Geometry::TRIANGLE_FAN );
+  geometry.SetType( Geometry::TRIANGLE_FAN );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -422,7 +417,7 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   out << GL_TRIANGLE_FAN << ", " << 0 << ", " << numVertex;
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
 
   END_TEST;
 }
@@ -431,7 +426,7 @@ int UtcDaliGeometrySetGetGeometryType02(void)
 {
   TestApplication application;
 
-  tet_infoline("Test SetGeometryType and GetGeometryType: with index buffer");
+  tet_infoline("Test SetType and GetType: with index buffer");
 
   unsigned int numVertex = 4u;
   unsigned int numIndex = 6u; // 6 unsigned short
@@ -446,7 +441,7 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
   Actor actor = Actor::New();
-  actor.SetSize(Vector3::ONE * 100.f);
+  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   Stage::GetCurrent().Add(actor);
 
@@ -469,11 +464,11 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   out << GL_TRIANGLES << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::TRIANGLES, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLES, TEST_LOCATION);
 
   /*********************************************************/
   // LINES, with index buffer
-  geometry.SetGeometryType( Geometry::LINES );
+  geometry.SetType( Geometry::LINES );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -489,11 +484,11 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   out << GL_LINES << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::LINES, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::LINES, TEST_LOCATION);
 
   /*****************************************************/
   //POINTS
-  geometry.SetGeometryType( Geometry::POINTS );
+  geometry.SetType( Geometry::POINTS );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -510,11 +505,11 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   out << GL_POINTS << ", " << 0 << ", " << numVertex;
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::POINTS, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::POINTS, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_STRIP
-  geometry.SetGeometryType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType( Geometry::TRIANGLE_STRIP );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -530,11 +525,11 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   out << GL_TRIANGLE_STRIP << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_FAN
-  geometry.SetGeometryType( Geometry::TRIANGLE_FAN );
+  geometry.SetType( Geometry::TRIANGLE_FAN );
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -550,7 +545,7 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   out << GL_TRIANGLE_FAN << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
   DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetGeometryType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
+  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
 
   END_TEST;
 }