projects / platform / core / uifw / dali-core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add API to UpdateProxy
[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 dbbb0f8..3654fdd 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Geometry.cpp
+++ b/automated-tests/src/dali/utc-Dali-Geometry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -15,8 +15,8 @@
  *
  */
 
-#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
+#include <dali/public-api/dali-core.h>
 
 using namespace Dali;
 
@@ -34,31 +34,32 @@ void geometry_test_cleanup(void)
 
 namespace
 {
+struct TexturedQuadVertex
+{
+  Vector2 position;
+  Vector2 textureCoordinates;
+};
 
-struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
-
-VertexBuffer CreateVertexBuffer( const std::string& aPosition, const std::string& aTexCoord )
+VertexBuffer CreateVertexBuffer(const std::string& aPosition, const std::string& aTexCoord)
 {
-  const float halfQuadSize = .5f;
+  const float        halfQuadSize              = .5f;
   TexturedQuadVertex texturedQuadVertexData[4] = {
-    { Vector2(-halfQuadSize, -halfQuadSize), Vector2(0.f, 0.f) },
-    { Vector2( halfQuadSize, -halfQuadSize), Vector2(1.f, 0.f) },
-    { Vector2(-halfQuadSize,  halfQuadSize), Vector2(0.f, 1.f) },
-    { Vector2( halfQuadSize,  halfQuadSize), Vector2(1.f, 1.f) } };
+    {Vector2(-halfQuadSize, -halfQuadSize), Vector2(0.f, 0.f)},
+    {Vector2(halfQuadSize, -halfQuadSize), Vector2(1.f, 0.f)},
+    {Vector2(-halfQuadSize, halfQuadSize), Vector2(0.f, 1.f)},
+    {Vector2(halfQuadSize, halfQuadSize), Vector2(1.f, 1.f)}};
 
   Property::Map vertexFormat;
   vertexFormat[aPosition] = Property::VECTOR2;
   vertexFormat[aTexCoord] = Property::VECTOR2;
 
-  VertexBuffer vertexData = VertexBuffer::New( vertexFormat );
-  vertexData.SetData( texturedQuadVertexData, 4 );
+  VertexBuffer vertexData = VertexBuffer::New(vertexFormat);
+  vertexData.SetData(texturedQuadVertexData, 4);
 
   return vertexData;
 }
 
-
-}
-
+} // namespace
 
 int UtcDaliGeometryNew01(void)
 {
@@ -66,15 +67,15 @@ int UtcDaliGeometryNew01(void)
 
   Geometry geometry = Geometry::New();
 
-  DALI_TEST_EQUALS( (bool)geometry, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)geometry, true, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliGeometryNew02(void)
 {
   TestApplication application;
-  Geometry geometry;
-  DALI_TEST_EQUALS( (bool)geometry, false, TEST_LOCATION );
+  Geometry        geometry;
+  DALI_TEST_EQUALS((bool)geometry, false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -86,7 +87,7 @@ int UtcDaliGeometryCopyConstructor(void)
 
   Geometry geometryCopy(geometry);
 
-  DALI_TEST_EQUALS( (bool)geometryCopy, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)geometryCopy, true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -97,10 +98,10 @@ int UtcDaliGeometryAssignmentOperator(void)
   Geometry geometry = Geometry::New();
 
   Geometry geometry2;
-  DALI_TEST_EQUALS( (bool)geometry2, false, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)geometry2, false, TEST_LOCATION);
 
   geometry2 = geometry;
-  DALI_TEST_EQUALS( (bool)geometry2, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)geometry2, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -110,19 +111,19 @@ int UtcDaliGeometryMoveConstructor(void)
   TestApplication application;
 
   Geometry geometry = Geometry::New();
-  DALI_TEST_CHECK( geometry );
-  DALI_TEST_EQUALS( 1, geometry.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
+  DALI_TEST_CHECK(geometry);
+  DALI_TEST_EQUALS(1, geometry.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION);
 
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
-  geometry.AddVertexBuffer( vertexBuffer );
-  DALI_TEST_EQUALS( 1u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
+  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord");
+  geometry.AddVertexBuffer(vertexBuffer);
+  DALI_TEST_EQUALS(1u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION);
 
-  Geometry move = std::move( geometry );
-  DALI_TEST_CHECK( move );
-  DALI_TEST_EQUALS( 1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, move.GetNumberOfVertexBuffers(), TEST_LOCATION );
-  DALI_TEST_CHECK( !geometry );
+  Geometry move = std::move(geometry);
+  DALI_TEST_CHECK(move);
+  DALI_TEST_EQUALS(1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, move.GetNumberOfVertexBuffers(), TEST_LOCATION);
+  DALI_TEST_CHECK(!geometry);
 
   END_TEST;
 }
@@ -132,20 +133,20 @@ int UtcDaliGeometryMoveAssignment(void)
   TestApplication application;
 
   Geometry geometry = Geometry::New();
-  DALI_TEST_CHECK( geometry );
-  DALI_TEST_EQUALS( 1, geometry.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
+  DALI_TEST_CHECK(geometry);
+  DALI_TEST_EQUALS(1, geometry.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION);
 
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
-  geometry.AddVertexBuffer( vertexBuffer );
-  DALI_TEST_EQUALS( 1u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
+  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord");
+  geometry.AddVertexBuffer(vertexBuffer);
+  DALI_TEST_EQUALS(1u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION);
 
   Geometry move;
-  move = std::move( geometry );
-  DALI_TEST_CHECK( move );
-  DALI_TEST_EQUALS( 1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, move.GetNumberOfVertexBuffers(), TEST_LOCATION );
-  DALI_TEST_CHECK( !geometry );
+  move = std::move(geometry);
+  DALI_TEST_CHECK(move);
+  DALI_TEST_EQUALS(1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, move.GetNumberOfVertexBuffers(), TEST_LOCATION);
+  DALI_TEST_CHECK(!geometry);
 
   END_TEST;
 }
@@ -157,8 +158,8 @@ int UtcDaliGeometryDownCast01(void)
   Geometry geometry = Geometry::New();
 
   BaseHandle handle(geometry);
-  Geometry geometry2 = Geometry::DownCast(handle);
-  DALI_TEST_EQUALS( (bool)geometry2, true, TEST_LOCATION );
+  Geometry   geometry2 = Geometry::DownCast(handle);
+  DALI_TEST_EQUALS((bool)geometry2, true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -166,9 +167,9 @@ int UtcDaliGeometryDownCast02(void)
 {
   TestApplication application;
 
-  Handle handle = Handle::New(); // Create a custom object
+  Handle   handle   = Handle::New(); // Create a custom object
   Geometry geometry = Geometry::DownCast(handle);
-  DALI_TEST_EQUALS( (bool)geometry, false, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)geometry, false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -177,15 +178,18 @@ int UtcDaliGeometryAddVertexBuffer(void)
   TestApplication application;
 
   tet_infoline("Test AddVertexBuffer");
+  auto& bufferTrace = application.GetGlAbstraction().GetBufferTrace();
+  bufferTrace.Enable(true);
+  bufferTrace.EnableLogging(true);
 
-  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
-  Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer( vertexBuffer1 );
+  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1");
+  Geometry     geometry      = Geometry::New();
+  geometry.AddVertexBuffer(vertexBuffer1);
 
-  Shader shader = CreateShader();
+  Shader   shader   = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
+  Actor    actor    = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   application.GetScene().Add(actor);
 
@@ -196,18 +200,18 @@ int UtcDaliGeometryAddVertexBuffer(void)
 
   {
     const TestGlAbstraction::BufferDataCalls& bufferDataCalls =
-        application.GetGlAbstraction().GetBufferDataCalls();
+      application.GetGlAbstraction().GetBufferDataCalls();
 
-    DALI_TEST_EQUALS( bufferDataCalls.size(), 1u, TEST_LOCATION );
+    DALI_TEST_EQUALS(bufferDataCalls.size(), 3u, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( bufferDataCalls[0], 4*sizeof( TexturedQuadVertex ), TEST_LOCATION );
+    DALI_TEST_EQUALS(bufferDataCalls[0], 4 * sizeof(TexturedQuadVertex), TEST_LOCATION);
   }
 
   // add the second vertex buffer
   application.GetGlAbstraction().ResetBufferDataCalls();
 
-  VertexBuffer vertexBuffer2 = CreateVertexBuffer( "aPosition2", "aTexCoord2" );
-  geometry.AddVertexBuffer( vertexBuffer2 );
+  VertexBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2");
+  geometry.AddVertexBuffer(vertexBuffer2);
   application.SendNotification();
   application.Render(0);
   application.Render();
@@ -215,11 +219,11 @@ int UtcDaliGeometryAddVertexBuffer(void)
 
   {
     const TestGlAbstraction::BufferDataCalls& bufferDataCalls =
-        application.GetGlAbstraction().GetBufferDataCalls();
+      application.GetGlAbstraction().GetBufferDataCalls();
 
     //Check that only the new buffer gets uploaded
-    DALI_TEST_EQUALS( bufferDataCalls.size(), 1u, TEST_LOCATION );
-    DALI_TEST_EQUALS( bufferDataCalls[0], 4*sizeof( TexturedQuadVertex ), TEST_LOCATION );
+    DALI_TEST_EQUALS(bufferDataCalls.size(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(bufferDataCalls[0], 4 * sizeof(TexturedQuadVertex), TEST_LOCATION);
   }
 
   END_TEST;
@@ -228,22 +232,25 @@ int UtcDaliGeometryAddVertexBuffer(void)
 int UtcDaliGeometryGetNumberOfVertexBuffers(void)
 {
   TestApplication application;
+  auto&           bufferTrace = application.GetGlAbstraction().GetBufferTrace();
+  bufferTrace.Enable(true);
+  bufferTrace.EnableLogging(true);
 
   tet_infoline("Test GetNumberOfVertexBuffers");
-  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
-  VertexBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2" );
-  VertexBuffer vertexBuffer3 = CreateVertexBuffer("aPosition3", "aTexCoord3" );
+  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1");
+  VertexBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2");
+  VertexBuffer vertexBuffer3 = CreateVertexBuffer("aPosition3", "aTexCoord3");
 
   Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer( vertexBuffer1 );
-  DALI_TEST_EQUALS( geometry.GetNumberOfVertexBuffers(), 1u, TEST_LOCATION );
+  geometry.AddVertexBuffer(vertexBuffer1);
+  DALI_TEST_EQUALS(geometry.GetNumberOfVertexBuffers(), 1u, TEST_LOCATION);
 
-  geometry.AddVertexBuffer( vertexBuffer2 );
-  geometry.AddVertexBuffer( vertexBuffer3 );
-  DALI_TEST_EQUALS( geometry.GetNumberOfVertexBuffers(), 3u, TEST_LOCATION );
+  geometry.AddVertexBuffer(vertexBuffer2);
+  geometry.AddVertexBuffer(vertexBuffer3);
+  DALI_TEST_EQUALS(geometry.GetNumberOfVertexBuffers(), 3u, TEST_LOCATION);
 
-  geometry.RemoveVertexBuffer( 2u );
-  DALI_TEST_EQUALS( geometry.GetNumberOfVertexBuffers(), 2u, TEST_LOCATION );
+  geometry.RemoveVertexBuffer(2u);
+  DALI_TEST_EQUALS(geometry.GetNumberOfVertexBuffers(), 2u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -251,52 +258,58 @@ int UtcDaliGeometryGetNumberOfVertexBuffers(void)
 int UtcDaliGeometryRemoveVertexBuffer(void)
 {
   TestApplication application;
+  auto&           bufferTrace = application.GetGlAbstraction().GetBufferTrace();
+  bufferTrace.Enable(true);
+  bufferTrace.EnableLogging(true);
 
   tet_infoline("Test RemoveVertexBuffer");
 
-  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
-  VertexBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2" );
+  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1");
+  VertexBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2");
 
   Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer( vertexBuffer1 );
+  geometry.AddVertexBuffer(vertexBuffer1);
 
-  Shader shader = CreateShader();
+  Shader   shader   = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
+  Actor    actor    = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( geometry.GetNumberOfVertexBuffers(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(geometry.GetNumberOfVertexBuffers(), 1u, TEST_LOCATION);
 
-  geometry.RemoveVertexBuffer( 0 );
-  geometry.AddVertexBuffer( vertexBuffer2 );
-  DALI_TEST_EQUALS( geometry.GetNumberOfVertexBuffers(), 1u, TEST_LOCATION );
+  geometry.RemoveVertexBuffer(0);
+  geometry.AddVertexBuffer(vertexBuffer2);
+  DALI_TEST_EQUALS(geometry.GetNumberOfVertexBuffers(), 1u, TEST_LOCATION);
 
-  geometry.RemoveVertexBuffer( 0 );
-  DALI_TEST_EQUALS( geometry.GetNumberOfVertexBuffers(), 0u, TEST_LOCATION );
+  geometry.RemoveVertexBuffer(0);
+  DALI_TEST_EQUALS(geometry.GetNumberOfVertexBuffers(), 0u, TEST_LOCATION);
 
   //Todo: test by checking the BufferDataCalls
   // make sure the vertex buffer in actually removed from gl
 
-   END_TEST;
+  END_TEST;
 }
 
 int UtcDaliGeometrySetIndexBuffer(void)
 {
   TestApplication application;
+  auto&           bufferTrace = application.GetGlAbstraction().GetBufferTrace();
+  bufferTrace.Enable(true);
+  bufferTrace.EnableLogging(true);
 
   tet_infoline("Test SetIndexBuffer");
 
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
+  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord");
 
   Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer( vertexBuffer );
+  geometry.AddVertexBuffer(vertexBuffer);
 
-  Shader shader = CreateShader();
+  Shader   shader   = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
+  Actor    actor    = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   application.GetScene().Add(actor);
 
@@ -307,18 +320,18 @@ int UtcDaliGeometrySetIndexBuffer(void)
 
   {
     const TestGlAbstraction::BufferDataCalls& bufferDataCalls =
-        application.GetGlAbstraction().GetBufferDataCalls();
+      application.GetGlAbstraction().GetBufferDataCalls();
 
-    DALI_TEST_EQUALS( bufferDataCalls.size(), 1u, TEST_LOCATION );
+    DALI_TEST_EQUALS(bufferDataCalls.size(), 3u, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( bufferDataCalls[0], 4*sizeof( TexturedQuadVertex ), TEST_LOCATION );
+    DALI_TEST_EQUALS(bufferDataCalls[0], 4 * sizeof(TexturedQuadVertex), TEST_LOCATION);
   }
 
   // Set index buffer
   application.GetGlAbstraction().ResetBufferDataCalls();
 
-  const unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 };
-  geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+  const unsigned short indexData[6] = {0, 3, 1, 0, 2, 3};
+  geometry.SetIndexBuffer(indexData, sizeof(indexData) / sizeof(indexData[0]));
   application.SendNotification();
   application.Render(0);
   application.Render();
@@ -326,40 +339,42 @@ int UtcDaliGeometrySetIndexBuffer(void)
 
   {
     const TestGlAbstraction::BufferDataCalls& bufferDataCalls =
-        application.GetGlAbstraction().GetBufferDataCalls();
+      application.GetGlAbstraction().GetBufferDataCalls();
 
     //Only the index buffer should be uploaded
-    DALI_TEST_EQUALS( bufferDataCalls.size(), 1u, TEST_LOCATION );
+    DALI_TEST_EQUALS(bufferDataCalls.size(), 1u, TEST_LOCATION);
 
     // should be unsigned short instead of unsigned int
-    DALI_TEST_EQUALS( bufferDataCalls[0], 6*sizeof( unsigned short ), TEST_LOCATION );
+    DALI_TEST_EQUALS(bufferDataCalls[0], 6 * sizeof(unsigned short), TEST_LOCATION);
   }
 
-
   END_TEST;
 }
 
 int UtcDaliGeometrySetGetGeometryType01(void)
 {
   TestApplication application;
+  auto&           bufferTrace = application.GetGlAbstraction().GetBufferTrace();
+  bufferTrace.Enable(true);
+  bufferTrace.EnableLogging(true);
 
   tet_infoline("Test SetType and GetType: without index buffer");
 
-  unsigned int numVertex = 4u;
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
+  unsigned int numVertex    = 4u;
+  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord");
 
   Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer( vertexBuffer );
+  geometry.AddVertexBuffer(vertexBuffer);
 
-  Shader shader = CreateShader();
+  Shader   shader   = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
+  Actor    actor    = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   application.GetScene().Add(actor);
 
   TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  TraceCallStack& drawTrace = glAbstraction.GetDrawTrace();
+  TraceCallStack&    drawTrace     = glAbstraction.GetDrawTrace();
 
   /****************************************************/
   // Default (TRIANGLES), no index buffer
@@ -369,20 +384,20 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // Test the default geometry type is GL_TRIANGLE
   // no index buffer, call glDrawArrays,
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawArrays" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
   std::stringstream out;
   out << GL_TRIANGLES << ", " << 0 << ", " << numVertex;
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLES, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::TRIANGLES, TEST_LOCATION);
 
   /*********************************************************/
   // LINES, no index buffer
-  geometry.SetType( Geometry::LINES );
+  geometry.SetType(Geometry::LINES);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -390,20 +405,20 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_LINES
   // no index buffer, call glDrawArrays,
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawArrays" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
   out.str("");
   out << GL_LINES << ", " << 0 << ", " << numVertex;
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::LINES, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::LINES, TEST_LOCATION);
 
   /*****************************************************/
   //POINTS
-  geometry.SetType( Geometry::POINTS );
+  geometry.SetType(Geometry::POINTS);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -411,20 +426,20 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_POINTS
   // no index buffer, call glDrawArrays,
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawArrays" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
   out.str("");
   out << GL_POINTS << ", " << 0 << ", " << numVertex;
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::POINTS, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::POINTS, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_STRIP, no index buffer
-  geometry.SetType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType(Geometry::TRIANGLE_STRIP);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -432,20 +447,20 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_TRIANGLE_STRIP
   // no index buffer, call glDrawArrays,
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawArrays" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
   out.str("");
   out << GL_TRIANGLE_STRIP << ", " << 0 << ", " << numVertex;
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_FAN, no index buffer
-  geometry.SetType( Geometry::TRIANGLE_FAN );
+  geometry.SetType(Geometry::TRIANGLE_FAN);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -453,16 +468,16 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_TRIANGLE_FAN
   // no index buffer, call glDrawArrays,
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawArrays" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
   out.str("");
   out << GL_TRIANGLE_FAN << ", " << 0 << ", " << numVertex;
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
 
   END_TEST;
 }
@@ -470,28 +485,30 @@ int UtcDaliGeometrySetGetGeometryType01(void)
 int UtcDaliGeometrySetGetGeometryType02(void)
 {
   TestApplication application;
+  auto&           bufferTrace = application.GetGlAbstraction().GetBufferTrace();
+  bufferTrace.Enable(true);
+  bufferTrace.EnableLogging(true);
 
   tet_infoline("Test SetType and GetType: with index buffer");
 
-  unsigned int numVertex = 4u;
-  unsigned int numIndex = 6u; // 6 unsigned short
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
-
+  unsigned int numVertex    = 4u;
+  unsigned int numIndex     = 6u; // 6 unsigned short
+  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord");
 
   Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer( vertexBuffer );
-  const unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 };
-  geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+  geometry.AddVertexBuffer(vertexBuffer);
+  const unsigned short indexData[6] = {0, 3, 1, 0, 2, 3};
+  geometry.SetIndexBuffer(indexData, sizeof(indexData) / sizeof(indexData[0]));
 
-  Shader shader = CreateShader();
+  Shader   shader   = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE,Vector3::ONE * 100.f);
+  Actor    actor    = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, Vector3::ONE * 100.f);
   actor.AddRenderer(renderer);
   application.GetScene().Add(actor);
 
   TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  TraceCallStack& drawTrace = glAbstraction.GetDrawTrace();
+  TraceCallStack&    drawTrace     = glAbstraction.GetDrawTrace();
 
   /****************************************************/
   // Default (TRIANGLES), with index buffer
@@ -501,19 +518,20 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // Test the default geometry type is GL_TRIANGLE
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawElements" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 2, TEST_LOCATION);
   std::stringstream out;
-  out << GL_TRIANGLES << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
+  out << GL_TRIANGLES << ", " << numIndex << ", " << GL_UNSIGNED_SHORT << ", "
+      << "indices";
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::TRIANGLES, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::TRIANGLES, TEST_LOCATION);
 
   /*********************************************************/
   // LINES, with index buffer
-  geometry.SetType( Geometry::LINES );
+  geometry.SetType(Geometry::LINES);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -521,19 +539,20 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_LINES
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawElements" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 2, TEST_LOCATION);
   out.str("");
-  out << GL_LINES << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
+  out << GL_LINES << ", " << numIndex << ", " << GL_UNSIGNED_SHORT << ", "
+      << "indices";
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::LINES, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::LINES, TEST_LOCATION);
 
   /*****************************************************/
   //POINTS
-  geometry.SetType( Geometry::POINTS );
+  geometry.SetType(Geometry::POINTS);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -541,20 +560,20 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_POINTS
   // As Points does not use the index buffer, call glDrawArrays,
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawArrays" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
   out.str("");
   out << GL_POINTS << ", " << 0 << ", " << numVertex;
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.TestMethodAndParams(1, "DrawArrays", out.str()), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( geometry.GetType(), Geometry::POINTS, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::POINTS, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_STRIP
-  geometry.SetType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType(Geometry::TRIANGLE_STRIP);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -562,19 +581,20 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_TRIANGLE_STRIP
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawElements" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 2, TEST_LOCATION);
   out.str("");
-  out << GL_TRIANGLE_STRIP << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
+  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.GetType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::TRIANGLE_STRIP, TEST_LOCATION);
 
   /*****************************************************/
   //TRIANGLE_FAN
-  geometry.SetType( Geometry::TRIANGLE_FAN );
+  geometry.SetType(Geometry::TRIANGLE_FAN);
 
   drawTrace.Reset();
   drawTrace.Enable(true);
@@ -582,15 +602,16 @@ int UtcDaliGeometrySetGetGeometryType02(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  drawTrace.Enable( false );
+  drawTrace.Enable(false);
 
   // geometry type is set as GL_TRIANGLE_FAN
-  DALI_TEST_EQUALS( drawTrace.CountMethod( "DrawElements" ), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 2, TEST_LOCATION);
   out.str("");
-  out << GL_TRIANGLE_FAN << ", " << numIndex << ", " << GL_UNSIGNED_SHORT<<", "<<"indices";
-  DALI_TEST_EQUALS( drawTrace.TestMethodAndParams(1, "DrawElements", out.str()), true, TEST_LOCATION);
+  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.GetType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
+  DALI_TEST_EQUALS(geometry.GetType(), Geometry::TRIANGLE_FAN, TEST_LOCATION);
 
   END_TEST;
 }
@@ -598,12 +619,12 @@ int UtcDaliGeometrySetGetGeometryType02(void)
 int UtcDaliGeometrySetIndexBufferNegative(void)
 {
   TestApplication application;
-  Dali::Geometry instance;
+  Dali::Geometry  instance;
   try
   {
     unsigned short* arg1(nullptr);
-    unsigned long arg2(0u);
-    instance.SetIndexBuffer(arg1,arg2);
+    unsigned long   arg2(0u);
+    instance.SetIndexBuffer(arg1, arg2);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -616,7 +637,7 @@ int UtcDaliGeometrySetIndexBufferNegative(void)
 int UtcDaliGeometryAddVertexBufferNegative(void)
 {
   TestApplication application;
-  Dali::Geometry instance;
+  Dali::Geometry  instance;
   try
   {
     Dali::VertexBuffer arg1;
@@ -633,7 +654,7 @@ int UtcDaliGeometryAddVertexBufferNegative(void)
 int UtcDaliGeometryRemoveVertexBufferNegative(void)
 {
   TestApplication application;
-  Dali::Geometry instance;
+  Dali::Geometry  instance;
   try
   {
     unsigned long arg1(0u);
@@ -650,7 +671,7 @@ int UtcDaliGeometryRemoveVertexBufferNegative(void)
 int UtcDaliGeometrySetTypeNegative(void)
 {
   TestApplication application;
-  Dali::Geometry instance;
+  Dali::Geometry  instance;
   try
   {
     Dali::Geometry::Type arg1(Geometry::POINTS);
@@ -667,7 +688,7 @@ int UtcDaliGeometrySetTypeNegative(void)
 int UtcDaliGeometryGetNumberOfVertexBuffersNegative(void)
 {
   TestApplication application;
-  Dali::Geometry instance;
+  Dali::Geometry  instance;
   try
   {
     instance.GetNumberOfVertexBuffers();
@@ -683,7 +704,7 @@ int UtcDaliGeometryGetNumberOfVertexBuffersNegative(void)
 int UtcDaliGeometryGetTypeNegative(void)
 {
   TestApplication application;
-  Dali::Geometry instance;
+  Dali::Geometry  instance;
   try
   {
     instance.GetType();
Domain: Graphics System / DALi;