Merge "Remove unsafe new-delete pair from program and change unoptimal resizes to...

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

diff --git a/automated-tests/src/dali/utc-Dali-Material.cpp b/automated-tests/src/dali/utc-Dali-Material.cpp
index 1c0d9e2..e07ecdd 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Material.cpp
+++ b/automated-tests/src/dali/utc-Dali-Material.cpp
@@ -129,15 +129,15 @@ int UtcDaliMaterialSettersAndGetters(void)
   material.SetNormalMapFileName("normal-map.png");
   DALI_TEST_EQUALS( material.GetNormalMapFileName(), "normal-map.png", TEST_LOCATION);
 
-  Image diffuseTexture = Image::New("diffuse-texture.png");
+  Image diffuseTexture = ResourceImage::New("diffuse-texture.png");
   material.SetDiffuseTexture(diffuseTexture);
   DALI_TEST_EQUALS( material.GetDiffuseTexture(), diffuseTexture, TEST_LOCATION );
 
-  Image opacityTexture = Image::New("opacity-texture.png");
+  Image opacityTexture = ResourceImage::New("opacity-texture.png");
   material.SetOpacityTexture(opacityTexture);
   DALI_TEST_EQUALS( material.GetOpacityTexture(), opacityTexture, TEST_LOCATION);
 
-  Image normalMap = Image::New("normal-map.png");
+  Image normalMap = ResourceImage::New("normal-map.png");
   material.SetNormalMap(normalMap);
   DALI_TEST_EQUALS( material.GetNormalMap(), normalMap, TEST_LOCATION);
 
@@ -175,7 +175,7 @@ int UtcDaliMaterialStage01(void)
 
   {
     Material material = Material::New("material");
-    Image image = Image::New( "image.png", Image::Immediate, Image::Never );
+    Image image = ResourceImage::New( "image.png", ResourceImage::IMMEDIATE, Image::NEVER );
     DALI_TEST_CHECK(image);
     application.SendNotification();
     application.Render(16);
@@ -205,7 +205,6 @@ int UtcDaliMaterialStage01(void)
     {
       MeshActor meshActor = MeshActor::New(mesh);
       meshActor.SetSize(100, 100);
-      meshActor.SetAffectedByLighting(false);
       Stage::GetCurrent().Add(meshActor);
       application.SendNotification();
       application.Render();
@@ -258,7 +257,7 @@ int UtcDaliMaterialStage02(void)
   {
     Material material = Material::New("material");
 
-    Image image = Image::New( "image.png", Image::OnDemand, Image::Unused );
+    Image image = ResourceImage::New( "image.png", ResourceImage::ON_DEMAND, Image::UNUSED );
     DALI_TEST_CHECK(image);
     application.SendNotification();
     application.Render(16);
@@ -285,7 +284,6 @@ int UtcDaliMaterialStage02(void)
     {
       MeshActor meshActor = MeshActor::New(mesh);
       meshActor.SetSize(100, 100);
-      meshActor.SetAffectedByLighting(false);
       Stage::GetCurrent().Add(meshActor);
       application.SendNotification();
       application.Render();