From: Adeel Kazmi Date: Wed, 17 Jul 2019 10:17:26 +0000 (+0100) Subject: (Automated Tests) Clean up linking X-Git-Tag: dali_1.4.29~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=71f37f16f983957d32defb8456fade32c99fcfef;hp=6d96d7c0b6a74a5fe927dcaa2d9b1fae932af08d (Automated Tests) Clean up linking - Styling tests SHOULD NOT link with the real adaptor at all. - InputMethodOptions & some additiona Window stubs required to ensure it all links properly when not using the real Adaptor. - Third Party tests do not require any of the toolkit test functionality. Change-Id: Ia05973bf400f201d3f9a1bc51d3cc1c34b3509c8 --- diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt index b7d87f7..4037aac 100755 --- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt @@ -41,6 +41,7 @@ LIST(APPEND TC_SOURCES ../dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-options.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp diff --git a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt index ce5ba8d..1c62f77 100644 --- a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt @@ -22,6 +22,7 @@ LIST(APPEND TC_SOURCES ../dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-feedback-player.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-options.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-native-image-source.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp @@ -56,11 +57,6 @@ LIST(APPEND TC_SOURCES PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED dali-core dali-toolkit - dali-adaptor -) - -PKG_CHECK_MODULES(DALI_ADAPTOR REQUIRED - dali-adaptor ) ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror ) diff --git a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp index 3103f35..94d625d 100755 --- a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp +++ b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ Integration::Bitmap* CreateBitmap( unsigned int imageWidth, unsigned int imageHe return bitmap; } -Integration::ResourcePointer CustomizeNinePatch( TestApplication& application, +Integration::ResourcePointer CustomizeNinePatch( ToolkitTestApplication& application, unsigned int ninePatchImageWidth, unsigned int ninePatchImageHeight) { @@ -119,7 +119,7 @@ int UtcDaliStyleManagerConstructorP(void) int UtcDaliStyleManagerCopyConstructorP(void) { - TestApplication application; + ToolkitTestApplication application; StyleManager styleManager = StyleManager::Get(); StyleManager copyOfStyleManager( styleManager ); @@ -130,7 +130,7 @@ int UtcDaliStyleManagerCopyConstructorP(void) int UtcDaliStyleManagerAssignmentOperatorP(void) { - TestApplication application; + ToolkitTestApplication application; StyleManager styleManager = StyleManager::Get(); StyleManager copyOfStyleManager = styleManager; diff --git a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt index 084c2d5..dfbe07f 100644 --- a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt @@ -12,22 +12,7 @@ SET(TC_SOURCES # Append list of test harness files (Won't get parsed for test cases) LIST(APPEND TC_SOURCES - ../dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp - ../dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.cpp - ../dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp ../dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp ../dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp ../dali-toolkit/dali-toolkit-test-utils/test-animation-data.cpp @@ -51,8 +36,8 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED ) # Locate GTest -cmake_minimum_required(VERSION 2.6) -find_package(GTest REQUIRED) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +FIND_PACKAGE(GTest REQUIRED) #ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror ) # ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} ) diff --git a/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp b/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp index 465e7f3..0ae564f 100644 --- a/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp +++ b/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ #include -#include +#include // GTest fails to compile with "error: return-statement with a value, in function returning 'void'" error // if using dali assert function so define new assert with returning void. #define _ASSERT_H_ diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt index 8989f59..21eb07c 100755 --- a/automated-tests/src/dali-toolkit/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit/CMakeLists.txt @@ -81,6 +81,7 @@ LIST(APPEND TC_SOURCES dali-toolkit-test-utils/toolkit-event-thread-callback.cpp dali-toolkit-test-utils/toolkit-environment-variable.cpp dali-toolkit-test-utils/toolkit-input-method-context.cpp + dali-toolkit-test-utils/toolkit-input-method-options.cpp dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp dali-toolkit-test-utils/toolkit-orientation.cpp dali-toolkit-test-utils/toolkit-physical-keyboard.cpp diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-options.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-options.cpp new file mode 100644 index 0000000..b306e7e --- /dev/null +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-options.cpp @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +/** + * This is a copy of dali-adaptor/devel-api/adaptor-framework/input-method-options.cpp. + */ + +// CLASS HEADER +#include + +using namespace Dali::InputMethod; +using namespace Dali::InputMethod::Category; + +namespace Dali +{ + +#define TOKEN_STRING(x) #x + +struct InputMethodOptions::Impl +{ + Impl() + { + mPanelLayout = PanelLayout::NORMAL; + mAutoCapital = AutoCapital::SENTENCE; + mButtonAction = ButtonAction::DEFAULT; + mVariation = NormalLayout::NORMAL; + } + + PanelLayout::Type mPanelLayout; + AutoCapital::Type mAutoCapital; + ButtonAction::Type mButtonAction; + int mVariation:4; +}; + +InputMethodOptions::InputMethodOptions() +{ + mImpl.reset(new Impl()); +} + +InputMethodOptions::~InputMethodOptions() +{ + // destructor cannot be inlined and must be in a unit + // for unique_ptr to work with forward declaration +} + +bool InputMethodOptions::IsPassword() const +{ + return (mImpl->mPanelLayout == Dali::InputMethod::PanelLayout::PASSWORD); +} + +void InputMethodOptions::ApplyProperty( const Property::Map& settings ) +{ + for ( unsigned int i = 0, count = settings.Count(); i < count; ++i ) + { + Property::Key key = settings.GetKeyAt( i ); + if( key.type == Property::Key::INDEX ) + { + continue; + } + + Property::Value item = settings.GetValue(i); + + if( key == TOKEN_STRING( PANEL_LAYOUT ) ) + { + if( item.GetType() == Property::INTEGER ) + { + int value = item.Get< int >(); + mImpl->mPanelLayout = static_cast(value); + } + } + else if ( key == TOKEN_STRING( BUTTON_ACTION ) ) + { + if ( item.GetType() == Property::INTEGER ) + { + int value = item.Get< int >(); + mImpl->mButtonAction = static_cast(value); + } + } + else if ( key == TOKEN_STRING( AUTO_CAPITALIZE ) ) + { + if ( item.GetType() == Property::INTEGER ) + { + int value = item.Get< int >(); + mImpl->mAutoCapital = static_cast(value); + } + } + else if( key == TOKEN_STRING( VARIATION ) ) + { + if( item.GetType() == Property::INTEGER ) + { + int value = item.Get< int >(); + mImpl->mVariation = value; + } + } + else + { + } + } +} + +void InputMethodOptions::RetrieveProperty( Property::Map& settings ) +{ + settings[TOKEN_STRING( PANEL_LAYOUT )] = mImpl->mPanelLayout; + settings[TOKEN_STRING( BUTTON_ACTION )] = mImpl->mButtonAction; + settings[TOKEN_STRING( AUTO_CAPITALIZE )] = mImpl->mAutoCapital; + settings[TOKEN_STRING( VARIATION )] = mImpl->mVariation; +} + +bool InputMethodOptions::CompareAndSet( InputMethod::Category::Type type, const InputMethodOptions& options, int& index) +{ + return true; + bool updated = false; + + switch (type) + { + case PANEL_LAYOUT: + { + if ( options.mImpl->mPanelLayout != mImpl->mPanelLayout ) + { + mImpl->mPanelLayout = options.mImpl->mPanelLayout; + index = static_cast(mImpl->mPanelLayout); + updated = true; + } + break; + } + case BUTTON_ACTION: + { + if ( options.mImpl->mButtonAction != mImpl->mButtonAction ) + { + mImpl->mButtonAction = options.mImpl->mButtonAction; + index = static_cast(mImpl->mButtonAction); + updated = true; + } + break; + } + case AUTO_CAPITALIZE: + { + if ( options.mImpl->mAutoCapital != mImpl->mAutoCapital ) + { + mImpl->mAutoCapital = options.mImpl->mAutoCapital; + index = static_cast(mImpl->mAutoCapital); + updated = true; + } + break; + } + case VARIATION: + { + if ( options.mImpl->mVariation != mImpl->mVariation ) + { + mImpl->mVariation = options.mImpl->mVariation; + index = static_cast(mImpl->mVariation); + updated = true; + } + break; + } + } + return updated; +} + +} // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp index 48453d6..1b8cdbd 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp @@ -84,6 +84,17 @@ Window::~Window() { } +Window::Window(const Window& handle) +: BaseHandle( handle ) +{ +} + +Window& Window::operator=(const Window& rhs) +{ + BaseHandle::operator=(rhs); + return *this; +} + Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent ) { Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( windowPosition, name, "", isTransparent );