From ba6fbfbbd66e5d63cf0659f0eeeff63c1b29efec Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 15 Nov 2016 11:39:53 +0900 Subject: [PATCH] Revert "[3.0] Raised test coverage for Model3dView" This reverts commit 1a03fa5f8f1dfdbfce42b528cd6f18ee0a23de22. Change-Id: I2f87b5a97c21bd4d847a7a8f06262ea13feab78f --- automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp index 0d699f6..15737f4 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 = 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 "/"; +const char * TEST_OBJ_FILE_NAME = "Dino.obj"; +const char * TEST_MTL_FILE_NAME = "Dino.mtl"; +//const char * TEST_IMG_PATH = ""; } // Negative test case for a method @@ -118,12 +118,8 @@ int UtcDaliModelViewPropertyNames(void) DALI_TEST_CHECK( val.Get( obj_file_name ) ); DALI_TEST_EQUALS( obj_file_name, TEST_MTL_FILE_NAME, TEST_LOCATION ); - 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); + //modelView.SetProperty( Model3dView::Property::MTL_URL, Dali::Property::Value( mtlUrl ) ); + //modelView.SetProperty( Model3dView::Property::IMAGES_URL, Dali::Property::Value( imagesUrl ) ); END_TEST; } -- 2.7.4