X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Scene3dView.cpp;h=1105c7304d58148b05b4d4551f77140edcd31a8f;hp=7c8dad43c400dd273489731e945f69bdd6b3ae3d;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=f66c8a201b4ca45d2b65229bdae411b6e18633fa

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp
index 7c8dad4..1105c73 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp
@@ -42,7 +42,8 @@ namespace
  * Donated by Norbert Nopper for glTF testing.
  * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/AnimatedCube
  */
-const char* TEST_GLTF_FILE_NAME = TEST_RESOURCE_DIR "/AnimatedCube.gltf";
+const char* TEST_GLTF_FILE_NAME[] = {TEST_RESOURCE_DIR "/AnimatedCube.gltf",
+                                     TEST_RESOURCE_DIR "/InterpolationTest.gltf"};
 /**
  * For the diffuse and specular cube map texture.
  * These textures are based off version of Wave engine sample
@@ -74,7 +75,7 @@ const char* TEST_SPECULAR_TEXTURE = TEST_RESOURCE_DIR "/forest_specular_cubemap.
 
 int UtcDaliScene3dViewConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   Scene3dView scene3dView;
 
@@ -84,10 +85,10 @@ int UtcDaliScene3dViewConstructorP(void)
 
 int UtcDaliScene3dViewCopyConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
-  Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME );
+  Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
 
   Scene3dView copy( scene3dView );
   DALI_TEST_CHECK( copy );
@@ -96,10 +97,10 @@ int UtcDaliScene3dViewCopyConstructorP(void)
 
 int UtcDaliScene3dViewCopyConstructor2P(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
-  Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME, TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE, Vector4::ONE );
+  Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0], TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE, Vector4::ONE );
 
   Scene3dView copy( scene3dView );
   DALI_TEST_CHECK( copy );
@@ -108,9 +109,9 @@ int UtcDaliScene3dViewCopyConstructor2P(void)
 
 int UtcDaliScene3dViewAssignmentOperatorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
-  Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME );
+  Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
 
   Scene3dView copy( scene3dView );
   DALI_TEST_CHECK( copy );
@@ -128,7 +129,7 @@ int UtcDaliScene3dViewNewP(void)
   Scene3dView scene3dView;
   DALI_TEST_CHECK( !scene3dView );
 
-  scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME );
+  scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
   DALI_TEST_CHECK( scene3dView );
 
   END_TEST;
@@ -150,7 +151,7 @@ int UtcDaliScene3dViewDownCast(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewDownCast");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME );
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
   BaseHandle handle(view);
 
   Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::DownCast( handle );
@@ -165,7 +166,7 @@ int UtcDaliScene3dViewSetLight(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewSetLight");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME );
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
 
   bool lightSet = view.SetLight( Scene3dView::LightType::DIRECTIONAL_LIGHT, Vector3( 1.0, 1.0, -1.0 ), Vector3( 0.3, 0.3, 0.3 ) );
   DALI_TEST_CHECK( lightSet );
@@ -180,7 +181,7 @@ int UtcDaliScene3dViewGetCamera(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewGetCamera");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME );
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
 
   CameraActor camera = view.GetDefaultCamera();
   DALI_TEST_CHECK( camera );
@@ -202,10 +203,13 @@ int UtcDaliScene3dViewAnimations(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewAnimations");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME );
+  for( auto filename : TEST_GLTF_FILE_NAME )
+  {
+    Toolkit::Scene3dView view = Toolkit::Scene3dView::New( filename );
 
-  bool playAnimation = view.PlayAnimations();
-  DALI_TEST_CHECK( playAnimation );
+    bool playAnimation = view.PlayAnimations();
+    DALI_TEST_CHECK( playAnimation );
+  }
 
   END_TEST;
 }
@@ -215,7 +219,7 @@ int UtcDaliScene3dViewAnimations2(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewAnimations2");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME );
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
 
   bool animated = true;
   unsigned int animationCount = view.GetAnimationCount();