projects / platform / core / uifw / dali-toolkit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove the texture element from the load queue
[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-ImageView.cpp
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index 20686c6..a59b0ff 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@ -163,7 +163,7 @@ void TestUrl( ImageView imageView, const std::string url )
 
 int UtcDaliImageViewNewP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
 
@@ -174,7 +174,7 @@ int UtcDaliImageViewNewP(void)
 
 int UtcDaliImageViewNewImageP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   BufferImage image = CreateBufferImage( 100, 200, Vector4( 1.f, 1.f, 1.f, 1.f ) );
   ImageView imageView = ImageView::New( image );
@@ -187,7 +187,7 @@ int UtcDaliImageViewNewImageP(void)
 
 int UtcDaliImageViewNewUrlP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME );
   DALI_TEST_CHECK( imageView );
@@ -199,7 +199,7 @@ int UtcDaliImageViewNewUrlP(void)
 
 int UtcDaliImageViewConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   ImageView imageView;
 
@@ -210,7 +210,7 @@ int UtcDaliImageViewConstructorP(void)
 
 int UtcDaliImageViewCopyConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
   ImageView imageView = ImageView::New();
@@ -223,7 +223,7 @@ int UtcDaliImageViewCopyConstructorP(void)
 
 int UtcDaliImageViewAssignmentOperatorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
 
@@ -236,7 +236,7 @@ int UtcDaliImageViewAssignmentOperatorP(void)
 
 int UtcDaliImageViewDownCastP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
 
@@ -253,7 +253,7 @@ int UtcDaliImageViewDownCastP(void)
 
 int UtcDaliImageViewDownCastN(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   BaseHandle unInitializedObject;
 
@@ -865,9 +865,16 @@ int UtcDaliImageViewSizeWithBackground(void)
 
   int width = 100;
   int height = 200;
-  Image image = CreateBufferImage( width, height, Vector4(1.f, 1.f, 1.f, 1.f) );
   ImageView imageView = ImageView::New();
-  imageView.SetBackgroundImage( image );
+
+  imageView.SetProperty( Control::Property::BACKGROUND,
+                         {
+                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
+                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
+                           { ImageVisual::Property::DESIRED_WIDTH, width },
+                           { ImageVisual::Property::DESIRED_HEIGHT, height },
+                         }
+                       );
 
   Stage::GetCurrent().Add( imageView );
   application.SendNotification();
@@ -887,11 +894,19 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void)
   int heightBackground = 200;
   int width = 300;
   int height = 400;
-  Image imageBackground = CreateBufferImage( widthBackground, heightBackground, Vector4(1.f, 1.f, 1.f, 1.f) );
   Image image = CreateBufferImage( width, height, Vector4(1.f, 1.f, 1.f, 1.f) );
 
   ImageView imageView = ImageView::New();
-  imageView.SetBackgroundImage( imageBackground );
+
+  imageView.SetProperty( Control::Property::BACKGROUND,
+                         {
+                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
+                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
+                           { ImageVisual::Property::DESIRED_WIDTH, widthBackground },
+                           { ImageVisual::Property::DESIRED_HEIGHT, heightBackground },
+                          }
+                       );
+
   imageView.SetImage( image );
 
   Stage::GetCurrent().Add( imageView );
@@ -910,10 +925,17 @@ int UtcDaliImageViewHeightForWidthBackground(void)
 
   int widthBackground = 100;
   int heightBackground = 200;
-  Image imageBackground = CreateBufferImage( widthBackground, heightBackground, Vector4(1.f, 1.f, 1.f, 1.f) );
 
   ImageView imageView = ImageView::New();
-  imageView.SetBackgroundImage( imageBackground );
+
+  imageView.SetProperty( Control::Property::BACKGROUND,
+                         {
+                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
+                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
+                           { ImageVisual::Property::DESIRED_WIDTH, widthBackground },
+                           { ImageVisual::Property::DESIRED_HEIGHT, heightBackground }
+                         }
+                       );
 
   Stage::GetCurrent().Add( imageView );
   application.SendNotification();
@@ -935,11 +957,20 @@ int UtcDaliImageViewHeightForWidthBackgroundAndImage(void)
   int heightBackground = 200;
   int width = 300;
   int height = 400;
-  Image imageBackground = CreateBufferImage( widthBackground, heightBackground, Vector4(1.f, 1.f, 1.f, 1.f) );
+
   Image image = CreateBufferImage( width, height, Vector4(1.f, 1.f, 1.f, 1.f) );
 
   ImageView imageView = ImageView::New();
-  imageView.SetBackgroundImage( imageBackground );
+
+  imageView.SetProperty( Control::Property::BACKGROUND,
+                         {
+                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
+                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
+                           { ImageVisual::Property::DESIRED_WIDTH, widthBackground },
+                           { ImageVisual::Property::DESIRED_HEIGHT, heightBackground }
+                         }
+                       );
+
   imageView.SetImage( image );
 
   Stage::GetCurrent().Add( imageView );
@@ -1080,15 +1111,17 @@ int UtcDaliImageViewCheckResourceReady(void)
 
   gResourceReadySignalFired = false;
 
-
-  int width = 100;
-  int height = 200;
-  Image image = CreateBufferImage( width, height, Vector4(1.f, 1.f, 1.f, 1.f) );
-
   // Check ImageView with background and main image, to ensure both visuals are marked as loaded
   ImageView imageView = ImageView::New( TEST_GIF_FILE_NAME );
 
-  imageView.SetBackgroundImage( image );
+  imageView.SetProperty( Control::Property::BACKGROUND,
+                         {
+                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
+                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
+                           { ImageVisual::Property::DESIRED_WIDTH, 100 },
+                           { ImageVisual::Property::DESIRED_HEIGHT, 200 }
+                          }
+                       );
 
   DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
 
@@ -1096,10 +1129,12 @@ int UtcDaliImageViewCheckResourceReady(void)
 
   Stage::GetCurrent().Add( imageView );
 
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
   application.SendNotification();
   application.Render(16);
 
-
   DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
 
   DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
@@ -1293,10 +1328,10 @@ int UtcDaliImageViewResourceUrlP(void)
   ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
-  DALI_TEST_CHECK( imageView.GetProperty( ImageView::Property::RESOURCE_URL ).Get< std::string >().empty() );
+  DALI_TEST_CHECK( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >().empty() );
 
-  imageView.SetProperty( ImageView::Property::RESOURCE_URL, "TestString" );
-  DALI_TEST_EQUALS( imageView.GetProperty( ImageView::Property::RESOURCE_URL ).Get< std::string >(), "TestString", TEST_LOCATION );
+  imageView.SetProperty( ImageView::Property::IMAGE, "TestString" );
+  DALI_TEST_EQUALS( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >(), "TestString", TEST_LOCATION );
 
   END_TEST;
 }
@@ -1915,6 +1950,146 @@ int UtcDaliImageViewPaddingProperty02(void)
   END_TEST;
 }
 
+int UtcDaliImageViewPaddingProperty03(void)
+{
+  tet_infoline("Test Setting Image Padding then removing it.");
+
+  ToolkitTestApplication application;
+
+  ImageView imageView = ImageView::New();
+  Property::Map imagePropertyMap;
+  imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
+  imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ;
+  imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128;
+  imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128;
+  imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
+  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
+  imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  imageView.SetParentOrigin( ParentOrigin::TOP_LEFT );
+  imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
+  Stage::GetCurrent().Add( imageView );
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS( imageView.GetProperty<Extents>( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION );
+
+  tet_infoline("Remove Padding and test Visual is position correctly");
+
+  imageView.SetProperty( Control::Property::PADDING, Extents( 0, 0, 0, 0 ) );
+
+  application.SendNotification();
+  application.Render();
+
+  // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
+  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap( resultMap );
+
+  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
+  DALI_TEST_CHECK( transformValue );
+  Property::Map* retMap = transformValue->GetMap();
+  DALI_TEST_CHECK( retMap );
+
+  // Image Visual should be positioned depending on ImageView's padding
+  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION );
+
+  END_TEST;
+}
+
+int UtcDaliImageViewPaddingProperty04(void)
+{
+  tet_infoline("Test Setting Image Padding then removing it. Visual Fitting Mode as Fill");
+
+  ToolkitTestApplication application;
+
+  ImageView imageView = ImageView::New();
+  Property::Map imagePropertyMap;
+  imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
+  imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ;
+  imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128;
+  imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128;
+  imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FILL;
+  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
+  imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  imageView.SetParentOrigin( ParentOrigin::TOP_LEFT );
+  imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
+  Stage::GetCurrent().Add( imageView );
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS( imageView.GetProperty<Extents>( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION );
+
+  tet_infoline("Remove Padding and test Visual is position correctly");
+
+  imageView.SetProperty( Control::Property::PADDING, Extents( 0, 0, 0, 0 ) );
+
+  application.SendNotification();
+  application.Render();
+
+  // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
+  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap( resultMap );
+
+  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
+  DALI_TEST_CHECK( transformValue );
+  Property::Map* retMap = transformValue->GetMap();
+  DALI_TEST_CHECK( retMap );
+
+  // Image Visual should be positioned depending on ImageView's padding
+  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION );
+
+  END_TEST;
+}
+
+int UtcDaliImageViewTransformTest01(void)
+{
+  tet_infoline("Test Setting a offset transform on the ImageView");
+
+  ToolkitTestApplication application;
+
+  ImageView imageView = ImageView::New();
+  Property::Map imagePropertyMap;
+  imagePropertyMap.Add( Toolkit::Visual::Property::TYPE,Toolkit::Visual::IMAGE )
+                  .Add( Toolkit::ImageVisual::Property::URL,TEST_RESOURCE_DIR "/Kid1.svg" )
+                  .Add( ImageVisual::Property::DESIRED_WIDTH,120 )
+                  .Add( ImageVisual::Property::DESIRED_HEIGHT,120 )
+                  .Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL )
+                  .Add( Visual::Property::TRANSFORM,
+                        Property::Map().Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY,
+                                             Vector2( Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE ) )
+                                       .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( 8, 8 ) ) );
+
+  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
+  imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  imageView.SetParentOrigin( ParentOrigin::TOP_LEFT );
+  Stage::GetCurrent().Add( imageView );
+
+  application.SendNotification();
+  application.Render();
+
+  // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
+  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap( resultMap );
+
+  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
+  DALI_TEST_CHECK( transformValue );
+  Property::Map* retMap = transformValue->GetMap();
+  DALI_TEST_CHECK( retMap );
+
+  // Image Visual should be positioned depending on ImageView's padding
+  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 8, 8 ), TEST_LOCATION );
+  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET_POLICY )->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+
+  END_TEST;
+}
+
 int UtcDaliImageViewUsingAtlasAndGetNaturalSize(void)
 {
   ToolkitTestApplication application;
@@ -1945,7 +2120,7 @@ int UtcDaliImageViewFillMode(void)
   ToolkitTestApplication application;
 
   tet_infoline( "Create an ImageVisual without padding and set the fill-mode to fill" );
-  tet_infoline( "  There should be no need to change the transform, our size-policy should be relative and size shoudl be [1,1]");
+  tet_infoline( "  There should be no need to change the transform, our size-policy should be relative and size should be [1,1]");
 
   ImageView imageView = ImageView::New();
   Property::Map imageMap;
@@ -2225,3 +2400,135 @@ int UtcDaliImageViewReloadFailedOnResourceReadySignal(void)
 
   END_TEST;
 }
+
+int UtcDaliImageViewLoadRemoteSVG(void)
+{
+  tet_infoline("Test reloading failed image from within signal handler.");
+
+  ToolkitTestApplication application;
+  Toolkit::ImageView imageView;
+  imageView = Toolkit::ImageView::New(  );
+  imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg");
+  imageView.SetParentOrigin( ParentOrigin::TOP_LEFT );
+  imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  imageView.SetSize(300, 300);
+  imageView.SetPosition( Vector3( 150.0f , 150.0f , 0.0f ) );
+
+  Stage::GetCurrent().Add( imageView );
+
+  DALI_TEST_CHECK( imageView );
+
+  DALI_TEST_EQUALS( imageView.GetRendererCount(), 0u, TEST_LOCATION );
+
+  application.SendNotification();
+
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION );
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSvgLoadingFailure(void)
+{
+  ToolkitTestApplication application;
+
+  // Local svg file
+  {
+    gResourceReadySignalFired = false;
+
+    ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/Kid1.svg" );
+    imageView.SetSize( 200.f, 200.f );
+    imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+
+    DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
+
+    Stage::GetCurrent().Add( imageView );
+
+    application.SendNotification();
+
+    // loading started, this waits for the loader thread
+    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+    application.SendNotification();
+    application.Render(16);
+
+    DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+    DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION );
+  }
+
+  // Remote svg file
+  {
+    gResourceReadySignalFired = false;
+
+    ImageView imageView = ImageView::New( "https://bar.org/foobar.svg" );
+    imageView.SetSize( 200.f, 200.f );
+    imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+
+    DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
+
+    Stage::GetCurrent().Add( imageView );
+
+    application.SendNotification();
+
+    // loading started, this waits for the loader thread
+    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+    application.SendNotification();
+    application.Render(16);
+
+    DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+    DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION );
+  }
+
+  END_TEST;
+}
+
+namespace
+{
+
+static int gResourceReadySignalCounter = 0;
+
+void OnResourceReadySignal( Control control )
+{
+  gResourceReadySignalCounter++;
+
+  if( gResourceReadySignalCounter == 1 )
+  {
+    // Set image twice
+    ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
+    ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
+  }
+}
+
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal(void)
+{
+  tet_infoline("Test setting image from within signal handler.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  ImageView imageView = ImageView::New( gImage_34_RGBA );
+  imageView.ResourceReadySignal().Connect( &OnResourceReadySignal );
+
+  Stage::GetCurrent().Add( imageView );
+
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION );
+
+  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+
+  END_TEST;
+}
Domain: Graphics System / DALi;