Revert "Renaming PropertyBuffer to VertexBuffer"

[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..7fe2e63 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Geometry.cpp
+++ b/automated-tests/src/dali/utc-Dali-Geometry.cpp
@@ -37,7 +37,7 @@ namespace
 
 struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
 
-VertexBuffer CreateVertexBuffer( const std::string& aPosition, const std::string& aTexCoord )
+PropertyBuffer CreateVertexBuffer( const std::string& aPosition, const std::string& aTexCoord )
 {
   const float halfQuadSize = .5f;
   TexturedQuadVertex texturedQuadVertexData[4] = {
@@ -50,7 +50,7 @@ VertexBuffer CreateVertexBuffer( const std::string& aPosition, const std::string
   vertexFormat[aPosition] = Property::VECTOR2;
   vertexFormat[aTexCoord] = Property::VECTOR2;
 
-  VertexBuffer vertexData = VertexBuffer::New( vertexFormat );
+  PropertyBuffer vertexData = PropertyBuffer::New( vertexFormat );
   vertexData.SetData( texturedQuadVertexData, 4 );
 
   return vertexData;
@@ -114,7 +114,7 @@ int UtcDaliGeometryMoveConstructor(void)
   DALI_TEST_EQUALS( 1, geometry.GetBaseObject().ReferenceCount(), TEST_LOCATION );
   DALI_TEST_EQUALS( 0u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
 
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
+  PropertyBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
   geometry.AddVertexBuffer( vertexBuffer );
   DALI_TEST_EQUALS( 1u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
 
@@ -136,7 +136,7 @@ int UtcDaliGeometryMoveAssignment(void)
   DALI_TEST_EQUALS( 1, geometry.GetBaseObject().ReferenceCount(), TEST_LOCATION );
   DALI_TEST_EQUALS( 0u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
 
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
+  PropertyBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
   geometry.AddVertexBuffer( vertexBuffer );
   DALI_TEST_EQUALS( 1u, geometry.GetNumberOfVertexBuffers(), TEST_LOCATION );
 
@@ -178,7 +178,7 @@ int UtcDaliGeometryAddVertexBuffer(void)
 
   tet_infoline("Test AddVertexBuffer");
 
-  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
+  PropertyBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( vertexBuffer1 );
 
@@ -206,7 +206,7 @@ int UtcDaliGeometryAddVertexBuffer(void)
   // add the second vertex buffer
   application.GetGlAbstraction().ResetBufferDataCalls();
 
-  VertexBuffer vertexBuffer2 = CreateVertexBuffer( "aPosition2", "aTexCoord2" );
+  PropertyBuffer vertexBuffer2 = CreateVertexBuffer( "aPosition2", "aTexCoord2" );
   geometry.AddVertexBuffer( vertexBuffer2 );
   application.SendNotification();
   application.Render(0);
@@ -230,9 +230,9 @@ int UtcDaliGeometryGetNumberOfVertexBuffers(void)
   TestApplication application;
 
   tet_infoline("Test GetNumberOfVertexBuffers");
-  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
-  VertexBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2" );
-  VertexBuffer vertexBuffer3 = CreateVertexBuffer("aPosition3", "aTexCoord3" );
+  PropertyBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
+  PropertyBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2" );
+  PropertyBuffer vertexBuffer3 = CreateVertexBuffer("aPosition3", "aTexCoord3" );
 
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( vertexBuffer1 );
@@ -254,8 +254,8 @@ int UtcDaliGeometryRemoveVertexBuffer(void)
 
   tet_infoline("Test RemoveVertexBuffer");
 
-  VertexBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
-  VertexBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2" );
+  PropertyBuffer vertexBuffer1 = CreateVertexBuffer("aPosition1", "aTexCoord1" );
+  PropertyBuffer vertexBuffer2 = CreateVertexBuffer("aPosition2", "aTexCoord2" );
 
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( vertexBuffer1 );
@@ -288,7 +288,7 @@ int UtcDaliGeometrySetIndexBuffer(void)
 
   tet_infoline("Test SetIndexBuffer");
 
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
+  PropertyBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
 
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( vertexBuffer );
@@ -346,7 +346,7 @@ int UtcDaliGeometrySetGetGeometryType01(void)
   tet_infoline("Test SetType and GetType: without index buffer");
 
   unsigned int numVertex = 4u;
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
+  PropertyBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
 
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( vertexBuffer );
@@ -475,7 +475,7 @@ int UtcDaliGeometrySetGetGeometryType02(void)
 
   unsigned int numVertex = 4u;
   unsigned int numIndex = 6u; // 6 unsigned short
-  VertexBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
+  PropertyBuffer vertexBuffer = CreateVertexBuffer("aPosition", "aTexCoord" );
 
 
   Geometry geometry = Geometry::New();
@@ -619,7 +619,7 @@ int UtcDaliGeometryAddVertexBufferNegative(void)
   Dali::Geometry instance;
   try
   {
-    Dali::VertexBuffer arg1;
+    Dali::PropertyBuffer arg1;
     instance.AddVertexBuffer(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }