Merge "DALi Version 2.1.46" into devel/master

[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 a74a42f..8b63242 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) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -194,7 +194,6 @@ int UtcDaliLayerRaise2(void)
   END_TEST;
 }
 
-
 int UtcDaliLayerLower1(void)
 {
   tet_infoline("Testing Dali::Layer::Lower()");
@@ -219,7 +218,6 @@ int UtcDaliLayerLower1(void)
   END_TEST;
 }
 
-
 int UtcDaliLayerLower2(void)
 {
   tet_infoline("Testing Dali::Layer lower Action");
@@ -339,7 +337,6 @@ int UtcDaliLayerLowerToBottom2(void)
   END_TEST;
 }
 
-
 int UtcDaliLayerSetClipping(void)
 {
   tet_infoline("Testing Dali::Layer::SetClipping()");
@@ -768,7 +765,9 @@ int UtcDaliLayer3DSort(void)
   application.Render();
   enabledDisableTrace.Enable(false);
 
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "2929")); // 2929 is GL_DEPTH_TEST
+  std::ostringstream depth;
+  depth << std::hex << GL_DEPTH_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", depth.str()));
 
   END_TEST;
 }