[4.0] Fix scissor clipping

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

diff --git a/automated-tests/src/dali/utc-Dali-Layer.cpp b/automated-tests/src/dali/utc-Dali-Layer.cpp
index 34c5741..b61dd46 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Layer.cpp
+++ b/automated-tests/src/dali/utc-Dali-Layer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -467,7 +467,9 @@ int UtcDaliLayerDefaultProperties(void)
   DALI_TEST_CHECK(Property::RECTANGLE == actor.GetPropertyType(Layer::Property::CLIPPING_BOX));
 
   Property::Value v = actor.GetProperty(Layer::Property::CLIPPING_BOX);
+  DALI_TEST_CHECK(v.Get<Rect<int> >() == testBox);
 
+  v = actor.GetCurrentProperty( Layer::Property::CLIPPING_BOX );
   DALI_TEST_CHECK(v.Get<Rect<int> >() == testBox);
 
   // set the same boundaries, but through a clipping box object
@@ -475,10 +477,12 @@ int UtcDaliLayerDefaultProperties(void)
 
   DALI_TEST_CHECK( actor.GetClippingBox() == testBox );
 
-
   Property::Value behavior = actor.GetProperty(Layer::Property::BEHAVIOR);
   DALI_TEST_EQUALS(behavior.Get<std::string>().c_str(), "LAYER_2D", TEST_LOCATION );
 
+  behavior = actor.GetCurrentProperty( Layer::Property::BEHAVIOR );
+  DALI_TEST_EQUALS(behavior.Get<std::string>().c_str(), "LAYER_2D", TEST_LOCATION );
+
   END_TEST;
 }
 
@@ -583,3 +587,58 @@ int UtcDaliLayerBehaviour(void)
   DALI_TEST_EQUALS( layer.GetBehavior(), Dali::Layer::LAYER_3D, TEST_LOCATION );
   END_TEST;
 }
+
+Actor CreateActor( bool withAlpha )
+{
+  Dali::BufferImage bufferImage;
+
+  if( withAlpha )
+  {
+    bufferImage = Dali::BufferImage::WHITE();
+  }
+  else
+  {
+    bufferImage = BufferImage::New( 1u, 1u, Pixel::RGB888 );
+    PixelBuffer* pBuffer = bufferImage.GetBuffer();
+    if( pBuffer )
+    {
+      pBuffer[0] = pBuffer[1] = pBuffer[2] = 0xFF;
+    }
+  }
+
+  Actor actor = CreateRenderableActor( bufferImage );
+  actor.SetParentOrigin( ParentOrigin::CENTER );
+  actor.SetAnchorPoint( AnchorPoint::CENTER );
+
+  return actor;
+}
+
+int UtcDaliLayer3DSort(void)
+{
+  tet_infoline( "Testing LAYER_3D sort coverage test" );
+  TestApplication application;
+  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+  TraceCallStack& enabledDisableTrace = glAbstraction.GetEnableDisableTrace();
+
+  Stage::GetCurrent().GetRootLayer().SetBehavior( Layer::LAYER_3D );
+
+  // Create an actor.
+  Actor actor = CreateActor( false );
+  Stage::GetCurrent().Add( actor );
+
+  // Create child actors.
+  Actor child1 = CreateActor( true );
+  actor.Add( child1 );
+  Actor child2 = CreateActor( false );
+  child1.Add( child2 );
+
+  enabledDisableTrace.Reset();
+  enabledDisableTrace.Enable( true );
+  application.SendNotification();
+  application.Render();
+  enabledDisableTrace.Enable( false );
+
+  DALI_TEST_CHECK( enabledDisableTrace.FindMethodAndParams( "Enable", "2929" ) );  // 2929 is GL_DEPTH_TEST
+
+  END_TEST;
+}