[3.0] Remove/move experimental features

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

diff --git a/automated-tests/src/dali/utc-Dali-Image.cpp b/automated-tests/src/dali/utc-Dali-Image.cpp
index 6701067..a686651 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Image.cpp
+++ b/automated-tests/src/dali/utc-Dali-Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -78,21 +78,6 @@ int UtcDaliImageDownCast(void)
   END_TEST;
 }
 
-int UtcDaliImageGetReleasePolicy(void)
-{
-  TestApplication application;
-
-  tet_infoline("UtcDaliImageGetReleasePolicy");
-
-  Image image = ResourceImage::New(gTestImageFilename, ResourceImage::IMMEDIATE, Image::UNUSED);
-
-  DALI_TEST_CHECK( image );
-
-  DALI_TEST_CHECK( Image::UNUSED == image.GetReleasePolicy() );
-
-  END_TEST;
-}
-
 int UtcDaliImageGetWidthHeight(void)
 {
   TestApplication application;
@@ -190,6 +175,12 @@ int UtcDaliImageSignalUploaded(void)
   application.Render(16);
   application.SendNotification();
 
+  request = platform.GetRequest();
+  if(request)
+  {
+    platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
+  }
+
   //upload
   application.Render(16);
   application.SendNotification();
@@ -332,9 +323,9 @@ int UtcDaliImageContextLoss(void)
 
   platform.SetClosestImageSize(closestImageSize);
 
-  tet_infoline("UtcDaliImageContextLoss - Load image with LoadPolicy::Immediate, ReleasePolicy::Never, bitmap discard. Check that the image is re-requested on context regain\n");
+  tet_infoline("UtcDaliImageContextLoss - Load image with LoadPolicy::Immediate, bitmap discard. Check that the image is re-requested on context regain\n");
 
-  Image image = ResourceImage::New("image.png", ResourceImage::IMMEDIATE, Image::NEVER);
+  Image image = ResourceImage::New("image.png");
 
   DALI_TEST_CHECK( image );