From 35cd4720d71f06f810258109e38d0c185c5d41ea Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 2 Sep 2016 18:48:04 +0100 Subject: [PATCH] Raised test coverage for Model3dView Change-Id: I14824620a0379bb0f6a10188e424449ac3e2af73 --- automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp index 15737f4..0d699f6 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp @@ -38,9 +38,9 @@ void model_view_cleanup(void) namespace { -const char * TEST_OBJ_FILE_NAME = "Dino.obj"; -const char * TEST_MTL_FILE_NAME = "Dino.mtl"; -//const char * TEST_IMG_PATH = ""; +const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj"; +const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl"; +const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/"; } // Negative test case for a method @@ -118,8 +118,12 @@ int UtcDaliModelViewPropertyNames(void) DALI_TEST_CHECK( val.Get( obj_file_name ) ); DALI_TEST_EQUALS( obj_file_name, TEST_MTL_FILE_NAME, TEST_LOCATION ); - //modelView.SetProperty( Model3dView::Property::MTL_URL, Dali::Property::Value( mtlUrl ) ); - //modelView.SetProperty( Model3dView::Property::IMAGES_URL, Dali::Property::Value( imagesUrl ) ); + view.SetProperty( Model3dView::Property::IMAGES_URL, Dali::Property::Value( TEST_RESOURCE_LOCATION ) ); + val = view.GetProperty( Model3dView::Property::IMAGES_URL ); + DALI_TEST_CHECK( val.Get( obj_file_name ) ); + DALI_TEST_EQUALS( obj_file_name, TEST_RESOURCE_LOCATION, TEST_LOCATION ); + + Stage::GetCurrent().Add(view); END_TEST; } -- 2.7.4