[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-scene3d-internal / utc-Dali-DliLoaderImpl.cpp

diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-DliLoaderImpl.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-DliLoaderImpl.cpp
index 0610deb..ca764bd 100644 (file)
--- a/automated-tests/src/dali-scene3d-internal/utc-Dali-DliLoaderImpl.cpp
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-DliLoaderImpl.cpp
@@ -182,6 +182,7 @@ int UtcDaliDliLoaderLoadSceneAssertions(void)
 
 int UtcDaliDliLoaderLoadSceneExercise(void)
 {
+  TestApplication app;
   Context ctx;
 
   auto path = ctx.pathProvider(ResourceType::Mesh) + "exercise.dli";
@@ -219,8 +220,6 @@ int UtcDaliDliLoaderLoadSceneExercise(void)
 
   Customization::Choices choices;
 
-  TestApplication app;
-
   Actor root = Actor::New();
   SetActorCentered(root);
   for(auto iRoot : scene.GetRoots())
@@ -232,7 +231,6 @@ int UtcDaliDliLoaderLoadSceneExercise(void)
     resources.LoadResources(ctx.pathProvider);
     if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
     {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
       scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
       ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
       scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
@@ -322,6 +320,7 @@ int UtcDaliDliLoaderLoadSceneMorph(void)
   DALI_TEST_EQUAL(ctx.cameraParameters.size(), 1u);
   DALI_TEST_EQUAL(ctx.lights.size(), 1u);
   DALI_TEST_EQUAL(ctx.animations.size(), 1u);
+  DALI_TEST_EQUAL(ctx.animations[0].GetDuration(), 1.0f);
   DALI_TEST_EQUAL(ctx.animGroups.size(), 0u);
 
   DALI_TEST_EQUAL(metadata.size(), 4u);
@@ -351,7 +350,6 @@ int UtcDaliDliLoaderLoadSceneMorph(void)
     resources.LoadResources(ctx.pathProvider);
     if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
     {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
       scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
       ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
       scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
@@ -416,7 +414,6 @@ int UtcDaliDliLoaderLoadSceneArc(void)
     resources.LoadResources(ctx.pathProvider);
     if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
     {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
       scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
       ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
       scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
@@ -697,7 +694,6 @@ int UtcDaliDliLoaderLoadCoverageTest(void)
     resources.LoadResources(ctx.pathProvider);
     if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
     {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
       scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
       ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
       scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));