From c639ed26bcf02edb8e6e06d032763de3fbb176a5 Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 2 Mar 2023 11:04:45 +0000 Subject: [PATCH] Enable automated tests that load the exercise DLI model Change-Id: Ife30d9c271d28589b52e3f0079638bd612cce3f6 --- automated-tests/src/dali-scene3d/utc-Dali-Model.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/automated-tests/src/dali-scene3d/utc-Dali-Model.cpp b/automated-tests/src/dali-scene3d/utc-Dali-Model.cpp index 7840c74..28b929e 100644 --- a/automated-tests/src/dali-scene3d/utc-Dali-Model.cpp +++ b/automated-tests/src/dali-scene3d/utc-Dali-Model.cpp @@ -54,12 +54,8 @@ const char* TEST_GLTF_FILE_NAME = TEST_RESOURCE_DIR "/Animate const char* TEST_GLTF_ANIMATION_TEST_FILE_NAME = TEST_RESOURCE_DIR "/animationTest.gltf"; const char* TEST_GLTF_MULTIPLE_PRIMITIVE_FILE_NAME = TEST_RESOURCE_DIR "/simpleMultiplePrimitiveTest.gltf"; const char* TEST_DLI_FILE_NAME = TEST_RESOURCE_DIR "/arc.dli"; -// @TODO: The test cases for loading the DLI model below is temporarily disabled. -// Need to fix how resources are loaded when a model contains multiple scenes and -// each scene has its own root node. -#ifdef MULTIPLE_SCENES_MODEL_SUPPORT const char* TEST_DLI_EXERCISE_FILE_NAME = TEST_RESOURCE_DIR "/exercise.dli"; -#endif + /** * For the diffuse and specular cube map texture. * These textures are based off version of Wave engine sample @@ -1011,7 +1007,6 @@ int UtcDaliModelAnimation02(void) int UtcDaliModelAnimation03(void) { -#ifdef MULTIPLE_SCENES_MODEL_SUPPORT ToolkitTestApplication application; Scene3D::Model model = Scene3D::Model::New(TEST_DLI_EXERCISE_FILE_NAME); @@ -1040,16 +1035,12 @@ int UtcDaliModelAnimation03(void) Animation animationByName = model.GetAnimation("idleClip"); DALI_TEST_CHECK(animationByName); DALI_TEST_EQUALS(animationByIndex, animationByName, TEST_LOCATION); -#else - tet_result(TET_PASS); -#endif END_TEST; } int UtcDaliModelCameraGenerate01(void) { -#ifdef MULTIPLE_SCENES_MODEL_SUPPORT ToolkitTestApplication application; Scene3D::Model model = Scene3D::Model::New(TEST_DLI_EXERCISE_FILE_NAME); @@ -1077,9 +1068,6 @@ int UtcDaliModelCameraGenerate01(void) generatedCamera = model.GenerateCamera(1u); // Fail to generate camera DALI_TEST_CHECK(!generatedCamera); -#else - tet_result(TET_PASS); -#endif END_TEST; } -- 2.7.4