From 896e8f9f96d378ddadec4115274b1c7267ced21a Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Tue, 14 Sep 2021 17:10:38 +0900 Subject: [PATCH 01/16] aurum: Code clean up for 1.0 Release 1. Delete useless class such as capi, AccessibleUtils. 2. Delete commented out codes. 3. Delete useless build configure. 4. Delete uesless methods. 5. Delete useless event types. 6. Code indentations. Change-Id: I5bd1495ebfd41990b52f5c9ecc4a630ed43a057f --- libaurum/capi/inc/capi_uidevice.h | 164 --------------------- libaurum/capi/src/capi_uidevice.c | 1 - libaurum/inc/Accessibility/Accessible.h | 1 - libaurum/inc/Accessibility/AccessibleNode.h | 4 +- libaurum/inc/Accessibility/AccessibleUtils.h | 113 -------------- libaurum/inc/Accessibility/AccessibleWatcher.h | 8 +- libaurum/inc/Accessibility/IEventConsumer.h | 15 +- .../Impl/Accessibility/AtspiAccessibleWatcher.h | 62 -------- libaurum/inc/Impl/TizenDeviceImpl.h | 6 +- libaurum/inc/Waiter.h | 2 +- libaurum/src/Accessibility/AccessibleUtils.cc | 119 --------------- libaurum/src/Accessibility/meson.build | 1 - .../Impl/Accessibility/AtspiAccessibleWatcher.cc | 56 +------ libaurum/src/UiObject.cc | 10 -- meson.build | 2 - .../src/Commands/CloseAppCommand.cc | 6 +- .../src/Commands/GetAppInfoCommand.cc | 5 +- .../src/Commands/InstallAppCommand.cc | 6 +- .../src/Commands/RemoveAppCommand.cc | 5 +- .../src/Runnable/LaunchAppRunnable.cc | 5 - 20 files changed, 23 insertions(+), 568 deletions(-) delete mode 100644 libaurum/capi/inc/capi_uidevice.h delete mode 100644 libaurum/capi/src/capi_uidevice.c delete mode 100644 libaurum/inc/Accessibility/AccessibleUtils.h delete mode 100644 libaurum/src/Accessibility/AccessibleUtils.cc diff --git a/libaurum/capi/inc/capi_uidevice.h b/libaurum/capi/inc/capi_uidevice.h deleted file mode 100644 index b91be75..0000000 --- a/libaurum/capi/inc/capi_uidevice.h +++ /dev/null @@ -1,164 +0,0 @@ -#pragma once - - -typedef enum _KeyRequestType { - STROKE, - LONG_STROKE, - PRESS, - RELEASE, -} KeyRequestType; - -typedef enum _TimeRequestType { - WALLCLOCK, - MONOTONIC, -} TimeRequestType; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_click(const int x, const int y); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_interval_click(const int x, const int y, const unsigned int intv); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_drag(const int sx, const int sy, const int ex, const int ey, - const int steps, const int durationMs); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_touchDown(const int x, const int y); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_touchMove(const int x, const int y, const int seq); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_touchUp(const int x, const int y, const int seq); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_wheelUp(int amount, const int durationMs); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_wheelDown(int amount, const int durationMs); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressBack(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressHome(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressMenu(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressVolUp(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressVolDown(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressPower(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressKeyCode(char* keycode, KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_takeScreenshot(char* path, float scale, int quality); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -long long aurum_uidevice_getSystemTime(TimeRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_hasObject(const std::shared_ptr selector); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::shared_ptr aurum_uidevice_findObject( - const std::shared_ptr selector) const; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::vector> aurum_uidevice_findObjects( - const std::shared_ptr selector) const; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -/* -bool aurum_uidevice_waitFor( - const std::function condition) const; -*/ -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::shared_ptr aurum_uidevice_waitFor( - const std::function(const ISearchable *)> - condition) const; -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::shared_ptr aurum_uidevice_getInstance(IDevice *deviceImpl = nullptr); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::vector> aurum_uidevice_getWindowRoot() const; diff --git a/libaurum/capi/src/capi_uidevice.c b/libaurum/capi/src/capi_uidevice.c deleted file mode 100644 index da98682..0000000 --- a/libaurum/capi/src/capi_uidevice.c +++ /dev/null @@ -1 +0,0 @@ -#include "capi_uidevice.h" \ No newline at end of file diff --git a/libaurum/inc/Accessibility/Accessible.h b/libaurum/inc/Accessibility/Accessible.h index 1f369be..df22041 100644 --- a/libaurum/inc/Accessibility/Accessible.h +++ b/libaurum/inc/Accessibility/Accessible.h @@ -1,7 +1,6 @@ #pragma once #include "AccessibleNode.h" -#include "AccessibleUtils.h" #include "AccessibleWatcher.h" #include "AccessibleApplication.h" #include "AccessibleWindow.h" diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index bbef725..c5dc2b5 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -6,9 +6,7 @@ #include #include -#include "AccessibleUtils.h" #include "IEventConsumer.h" - #include "Rect.h" #include "config.h" @@ -63,7 +61,7 @@ enum class NodeFeatureProperties { * @since_tizen 5.5 */ class AccessibleNode : public std::enable_shared_from_this, public IEventConsumer { -public: // Constructor & Destructor +public: /** * @brief TBD * @since_tizen 5.5 diff --git a/libaurum/inc/Accessibility/AccessibleUtils.h b/libaurum/inc/Accessibility/AccessibleUtils.h deleted file mode 100644 index 3b38a84..0000000 --- a/libaurum/inc/Accessibility/AccessibleUtils.h +++ /dev/null @@ -1,113 +0,0 @@ -#pragma once - -//#include -#include - -#include -#include - -#include "config.h" - -/** - * @brief TBD - * @since_tizen 5.5 - */ -struct GobjDeletor { - void operator()(gpointer ptr) const - { - if (ptr) g_object_unref(ptr); - } -}; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -struct GarrayDeletor { - void operator()(GArray *ptr) const - { - if (ptr) g_array_free(ptr, 1); - } -}; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -using unique_ptr_gobj = std::unique_ptr; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -using unique_ptr_garray = std::unique_ptr; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -unique_ptr_gobj make_gobj_unique(T *ptr) -{ - return unique_ptr_gobj(ptr); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -unique_ptr_garray make_garray_unique(T *ptr) -{ - return unique_ptr_garray(ptr); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -unique_ptr_gobj make_gobj_ref_unique(T *ptr) -{ - g_object_ref(ptr); - return unique_ptr_gobj(ptr); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -std::shared_ptr make_gobj_shared(T *ptr) -{ - return std::shared_ptr(ptr, [](T *ptr){ if(ptr) g_object_unref(ptr); }); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -std::shared_ptr make_garray_shared(T *ptr) -{ - return std::shared_ptr(ptr, [](T *ptr){ if(ptr) g_array_free(ptr, 1); }); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -std::shared_ptr make_gobj_ref_shared(T *ptr) -{ - g_object_ref(ptr); - return std::shared_ptr(ptr, [](T *ptr){ if(ptr) g_object_unref(ptr); }); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -//char *state_to_char(AtspiStateType state); diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index 3090741..c01654b 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -3,7 +3,6 @@ #include "AccessibleApplication.h" #include "AccessibleWindow.h" #include "AccessibleNode.h" -#include "AccessibleUtils.h" #include "IEventSource.h" #include "Runnable.h" #include "A11yEvent.h" @@ -59,13 +58,18 @@ public: */ virtual std::vector> getApplications(void) const = 0; - /**s + /** * @brief TBD * @since_tizen 6.5 */ virtual bool executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) = 0; + /** + * @brief TBD + * @since_tizen 6.5 + */ virtual std::map> getActiveAppMap(void) = 0; + public: /** * @brief TBD diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index 970e516..5240ecc 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -1,20 +1,13 @@ #pragma once enum class EventType { - Window, - Object, -}; - -enum class WindowEventType { - WindowActivated, - WindowDeactivated, - WindowCreated, - WindowDestroyed, + none = 0, + Object = 1, }; enum class ObjectEventType { - ObjectStateVisible, - ObjectStateDefunct, + none = 0, + ObjectStateDefunct = 1, }; class IEventConsumer diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index 663835f..a089e4c 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -41,36 +41,6 @@ public: * @brief TBD * @since_tizen 5.5 */ - virtual void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onWindowDeactivated(AtspiAccessible *node) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onWindowCreated(AtspiAccessible *node) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onWindowDestroyed(AtspiAccessible *node) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onVisibilityChanged(AtspiAccessible *node, bool visible) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ virtual void onObjectDefunct(AtspiAccessible *node) = 0; }; @@ -118,36 +88,6 @@ public: * @brief TBD * @since_tizen 5.5 */ - void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onWindowDeactivated(AtspiAccessible *node) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onWindowCreated(AtspiAccessible *node) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onWindowDestroyed(AtspiAccessible *node) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onVisibilityChanged(AtspiAccessible *node, bool visible) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ void onObjectDefunct(AtspiAccessible *node) override; /** @@ -180,8 +120,6 @@ private: */ bool addToWindowSet(AtspiAccessible *node); - void print_debug(); - /** * @brief TBD * @since_tizen 6.5 diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index 01541db..fff19b5 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -1,13 +1,11 @@ #pragma once #include "config.h" - #include "IDevice.h" -#include -#ifdef GBS_BUILD +#include #include -#endif + /** * @brief TizenDeviceImpl Class * @since_tizen 5.5 diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index ae33f60..9218a3d 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -21,7 +21,7 @@ public: * @since_tizen 5.5 */ Waiter(const ISearchable *searchableObject, - const UiObject *uiObject = nullptr); // : mObject{object} + const UiObject *uiObject = nullptr); /** * @brief TBD diff --git a/libaurum/src/Accessibility/AccessibleUtils.cc b/libaurum/src/Accessibility/AccessibleUtils.cc deleted file mode 100644 index b126880..0000000 --- a/libaurum/src/Accessibility/AccessibleUtils.cc +++ /dev/null @@ -1,119 +0,0 @@ -#include "Aurum.h" - -#include - -char* state_to_char(AtspiStateType state) -{ - switch (state) { - case ATSPI_STATE_INVALID: - return strdup("ATSPI_STATE_INVALID"); - case ATSPI_STATE_ACTIVE: - return strdup("ATSPI_STATE_ACTIVE"); - case ATSPI_STATE_ARMED: - return strdup("ATSPI_STATE_ARMED"); - case ATSPI_STATE_BUSY: - return strdup("ATSPI_STATE_BUSY"); - case ATSPI_STATE_CHECKED: - return strdup("ATSPI_STATE_CHECKED"); - case ATSPI_STATE_COLLAPSED: - return strdup("ATSPI_STATE_COLLAPSED"); - case ATSPI_STATE_DEFUNCT: - return strdup("ATSPI_STATE_DEFUNCT"); - case ATSPI_STATE_EDITABLE: - return strdup("ATSPI_STATE_EDITABLE"); - case ATSPI_STATE_ENABLED: - return strdup("ATSPI_STATE_ENABLED"); - case ATSPI_STATE_EXPANDABLE: - return strdup("ATSPI_STATE_EXPANDABLE"); - case ATSPI_STATE_EXPANDED: - return strdup("ATSPI_STATE_EXPANDED"); - case ATSPI_STATE_FOCUSABLE: - return strdup("ATSPI_STATE_FOCUSABLE"); - case ATSPI_STATE_FOCUSED: - return strdup("ATSPI_STATE_FOCUSED"); - case ATSPI_STATE_HAS_TOOLTIP: - return strdup("ATSPI_STATE_HAS_TOOLTIP"); - case ATSPI_STATE_HORIZONTAL: - return strdup("ATSPI_STATE_HORIZONTAL"); - case ATSPI_STATE_ICONIFIED: - return strdup("ATSPI_STATE_ICONIFIED"); - case ATSPI_STATE_MULTI_LINE: - return strdup("ATSPI_STATE_MULTI_LINE"); - case ATSPI_STATE_MULTISELECTABLE: - return strdup("ATSPI_STATE_MULTISELECTABLE"); - case ATSPI_STATE_OPAQUE: - return strdup("ATSPI_STATE_OPAQUE"); - case ATSPI_STATE_PRESSED: - return strdup("ATSPI_STATE_PRESSED"); - case ATSPI_STATE_RESIZABLE: - return strdup("ATSPI_STATE_RESIZABLE"); - case ATSPI_STATE_SELECTABLE: - return strdup("ATSPI_STATE_SELECTABLE"); - case ATSPI_STATE_SELECTED: - return strdup("ATSPI_STATE_SELECTED"); - case ATSPI_STATE_SENSITIVE: - return strdup("ATSPI_STATE_SENSITIVE"); - case ATSPI_STATE_SHOWING: - return strdup("ATSPI_STATE_SHOWING"); - case ATSPI_STATE_SINGLE_LINE: - return strdup("ATSPI_STATE_SINGLE_LINE"); - case ATSPI_STATE_STALE: - return strdup("ATSPI_STATE_STALE"); - case ATSPI_STATE_TRANSIENT: - return strdup("ATSPI_STATE_TRANSIENT"); - case ATSPI_STATE_VERTICAL: - return strdup("ATSPI_STATE_VERTICAL"); - case ATSPI_STATE_VISIBLE: - return strdup("ATSPI_STATE_VISIBLE"); - case ATSPI_STATE_MANAGES_DESCENDANTS: - return strdup("ATSPI_STATE_MANAGES_DESCENDANTS"); - case ATSPI_STATE_INDETERMINATE: - return strdup("ATSPI_STATE_INDETERMINATE"); - case ATSPI_STATE_REQUIRED: - return strdup("ATSPI_STATE_REQUIRED"); - case ATSPI_STATE_TRUNCATED: - return strdup("ATSPI_STATE_TRUNCATED"); - case ATSPI_STATE_ANIMATED: - return strdup("ATSPI_STATE_ANIMATED"); - case ATSPI_STATE_INVALID_ENTRY: - return strdup("ATSPI_STATE_INVALID_ENTRY"); - case ATSPI_STATE_SUPPORTS_AUTOCOMPLETION: - return strdup("ATSPI_STATE_SUPPORTS_AUTOCOMPLETION"); - case ATSPI_STATE_SELECTABLE_TEXT: - return strdup("ATSPI_STATE_SELECTABLE_TEXT"); - case ATSPI_STATE_IS_DEFAULT: - return strdup("ATSPI_STATE_IS_DEFAULT"); - case ATSPI_STATE_VISITED: - return strdup("ATSPI_STATE_VISITED"); - case ATSPI_STATE_CHECKABLE: - return strdup("ATSPI_STATE_CHECKABLE"); - case ATSPI_STATE_HAS_POPUP: - return strdup("ATSPI_STATE_HAS_POPUP"); - case ATSPI_STATE_READ_ONLY: - return strdup("ATSPI_STATE_READ_ONLY"); - case ATSPI_STATE_LAST_DEFINED: - return strdup("ATSPI_STATE_LAST_DEFINED"); - case ATSPI_STATE_MODAL: - return strdup("ATSPI_STATE_MODAL"); - default: - return strdup("\0"); - } -} - -static void _print_stateset_debug( AtspiStateSet *stateSet) -{ - if (!stateSet) return; - GArray *states = AtspiWrapper::Atspi_state_set_get_states(stateSet); - if (!states) return; - - char *state_name = NULL; - AtspiStateType stat; - LOGI("check ss:%p s:%p, len:%d", stateSet, states, states->len); - for (int i = 0; states && (i < states->len); ++i) { - stat = g_array_index(states, AtspiStateType, i); - state_name = state_to_char(stat); - LOGI("state: %s", state_name); - free(state_name); - } - g_array_free(states, 1); -} \ No newline at end of file diff --git a/libaurum/src/Accessibility/meson.build b/libaurum/src/Accessibility/meson.build index 9eb7868..4bb5f1d 100644 --- a/libaurum/src/Accessibility/meson.build +++ b/libaurum/src/Accessibility/meson.build @@ -1,7 +1,6 @@ libaurum_src += [ files('AccessibleApplication.cc'), files('AccessibleNode.cc'), - #files('AccessibleUtils.cc'), files('AccessibleWatcher.cc'), files('AccessibleWindow.cc'), ] \ No newline at end of file diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index fa61623..4d8c6d6 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -11,6 +11,9 @@ #include #include +#define COMPARE(A, B) \ + (B != A11yEvent::EVENT_NONE) && ((A & B) == B) + std::vector> AtspiAccessibleWatcher::mEventQueue; GThread *AtspiAccessibleWatcher::mEventThread = nullptr; std::mutex AtspiAccessibleWatcher::mMutex = std::mutex{}; @@ -188,56 +191,6 @@ void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *user_data) if (pkg) free(pkg); } -void AtspiAccessibleWatcher::print_debug() -{ - LOGI("activatewindowlist-------------------"); - std::for_each(mActivatedWindowList.begin(), mActivatedWindowList.end(), [](auto acc){ - LOGI("child:%p", acc); - }); - - LOGI("mActivatedApplicationList--------------------------"); - std::for_each(mActivatedApplicationList.begin(), mActivatedApplicationList.end(), [](auto acc){ - LOGI("child:%p", acc); - }); - - LOGI("mWindowSet------------------------------"); - std::for_each(mWindowSet.begin(), mWindowSet.end(), [](auto acc){ - LOGI("child:%p", acc); - }); - LOGI("------------------------------"); -} - -void AtspiAccessibleWatcher::onWindowActivated(AtspiAccessible *node, - WindowActivateInfoType type) -{ - LOGI("onWindowActivated obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowActivated, node); -} - -void AtspiAccessibleWatcher::onWindowDeactivated(AtspiAccessible *node) -{ - LOGI("onWindowDeactivated obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowDeactivated, node); -} - -void AtspiAccessibleWatcher::onWindowCreated(AtspiAccessible *node) -{ - LOGI("onWindowCreated obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowCreated, node); -} - -void AtspiAccessibleWatcher::onWindowDestroyed(AtspiAccessible *node) -{ - LOGI("onWindowDestroyed obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowDestroyed, node); -} - -void AtspiAccessibleWatcher::onVisibilityChanged(AtspiAccessible *node, bool visible) -{ - LOGI("onVisibilityChanged obj:%p", node); - notifyAll((int)EventType::Object, (int)ObjectEventType::ObjectStateVisible, node); -} - void AtspiAccessibleWatcher::onObjectDefunct(AtspiAccessible *node) { LOGI("onObjectDefunct obj:%p", node); @@ -282,9 +235,6 @@ std::vector> AtspiAccessibleWatcher::getA return ret; } -#define COMPARE(A, B) \ - (B != A11yEvent::EVENT_NONE) && ((A & B) == B) - bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) { mMutex.lock(); diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index 6470a85..e8f7cdd 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -31,16 +31,6 @@ UiObject::UiObject(const std::shared_ptr device, const std::shared_ptr { } -// UiObject::UiObject(const UiObject &src) -// : mDevice(src.mDevice), -// mSelector(src.mSelector), -// mNode(src.mNode), -// mWaiter{src.mWaiter}, -// mNode_src(std::move(src.mNode_src)) - -// { -// } - UiObject::UiObject(UiObject &&src) : mDevice(src.mDevice), mSelector(std::move(src.mSelector)), diff --git a/meson.build b/meson.build index 68d7bd9..3a8f395 100644 --- a/meson.build +++ b/meson.build @@ -9,8 +9,6 @@ dir_include = join_paths(dir_prefix, get_option('includedir')) config_h = configuration_data() if get_option('tizen') == true - config_h.set10('GBS_BUILD', true) - config_h.set10('GBSBUILD', true) config_h.set10('TIZEN', true) else message('') diff --git a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc index c1073f4..d1863d2 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc @@ -2,9 +2,7 @@ #include "CloseAppCommand.h" #include #include -#ifdef GBSBUILD #include -#endif CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request, ::aurum::RspCloseApp *response) @@ -15,7 +13,7 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request, ::grpc::Status CloseAppCommand::execute() { LOGI("CloseApp --------------- "); -#ifdef GBSBUILD + std::string packageName = mRequest->packagename(); app_context_h app_context = NULL; @@ -33,7 +31,7 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request, mResponse->set_status(::aurum::RspStatus::ERROR); return grpc::Status::OK; } -#endif + return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc index cf14e32..4e155bb 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc @@ -1,9 +1,7 @@ #include "bootstrap.h" #include "GetAppInfoCommand.h" -#ifdef GBSBUILD #include #include -#endif GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, ::aurum::RspGetAppInfo *response) @@ -14,7 +12,7 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, ::grpc::Status GetAppInfoCommand::execute() { LOGI("GetAppInfo --------------- "); -#ifdef GBSBUILD + std::string packageName = mRequest->packagename(); app_context_h app_context; @@ -45,6 +43,5 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, } } -#endif return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc index 500557a..9e1b0b2 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc @@ -3,9 +3,7 @@ #include #include #include -#ifdef GBSBUILD #include -#endif InstallAppCommand::InstallAppCommand( ::grpc::ServerReader<::aurum::ReqInstallApp> *request, @@ -17,7 +15,7 @@ InstallAppCommand::InstallAppCommand( ::grpc::Status InstallAppCommand::execute() { LOGI("InstallApp --------------- "); -#ifdef GBSBUILD + ::aurum::ReqInstallApp chunk; std::ofstream outfile("/tmp/app.tpk", std::ofstream::binary); @@ -34,7 +32,7 @@ InstallAppCommand::InstallAppCommand( package_manager_request_create(&pkgRequest); package_manager_request_install(pkgRequest, "/tmp/app.tpk", &id); -#endif + return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc index 7c20460..3fe4c37 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc @@ -2,9 +2,7 @@ #include "RemoveAppCommand.h" #include #include -#ifdef GBSBUILD #include -#endif RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, ::aurum::RspRemoveApp* response) @@ -16,7 +14,6 @@ RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, { LOGI("RemoveAppCommand::execute"); -#ifdef GBSBUILD package_manager_request_h pkgRequest; std::string name = mRequest->packagename(); int id; @@ -27,7 +24,7 @@ RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, mResponse->set_status(::aurum::RspStatus::OK); } } -#endif + return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc b/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc index 887a44a..b842b8d 100644 --- a/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc +++ b/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc @@ -2,10 +2,7 @@ #include "bootstrap.h" #include "LaunchAppCommand.h" #include "LaunchAppRunnable.h" - -#ifdef GBSBUILD #include -#endif LaunchAppRunnable::LaunchAppRunnable(std::string pkg, const google::protobuf::RepeatedPtrField& data) : mPkg{pkg}, mData(data) @@ -14,7 +11,6 @@ LaunchAppRunnable::LaunchAppRunnable(std::string pkg, const google::protobuf::Re void LaunchAppRunnable::run() const { -#ifdef GBSBUILD app_control_h appControl; std::string packageName = mPkg; int ret = -1; @@ -51,7 +47,6 @@ void LaunchAppRunnable::run() const } app_control_destroy(appControl); -#endif } std::string LaunchAppRunnable::getPkgName() -- 2.7.4 From 887b7b1f0defd45b0a133057ccf4950e0067a5c5 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 24 Sep 2021 16:38:30 +0900 Subject: [PATCH 02/16] libaurum: Add doc for Device classes. Change-Id: I01816661088c9afe3f0c13afb65127f720c541b8 --- libaurum/inc/Impl/MockDeviceImpl.h | 4 +- libaurum/inc/Impl/TizenDeviceImpl.h | 143 +++++---------------- libaurum/inc/Interface/IDevice.h | 166 ++++++++++++++++++++----- libaurum/inc/UiDevice.h | 234 ++++++++++++++++++++++++++++------- libaurum/inc/UiObject.h | 2 +- libaurum/src/Impl/MockDeviceImpl.cc | 4 +- libaurum/src/Impl/TizenDeviceImpl.cc | 10 +- libaurum/src/UiDevice.cc | 4 +- libaurum/src/UiObject.cc | 4 +- 9 files changed, 375 insertions(+), 196 deletions(-) diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index 342e748..b2cd9f1 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -44,7 +44,7 @@ public: * @brief TBD * @since_tizen 5.5 */ - bool click(const int x, const int y, const unsigned int intv) override; + bool click(const int x, const int y, const unsigned int durationMs) override; /** * @brief TBD @@ -142,7 +142,7 @@ protected: * @brief TBD * @since_tizen 5.5 */ - bool strokeKeyCode(std::string keycode, unsigned int intv); + bool strokeKeyCode(std::string keycode, unsigned int durationMs); /** * @brief TBD diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index fff19b5..79db52c 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -6,239 +6,162 @@ #include #include -/** - * @brief TizenDeviceImpl Class - * @since_tizen 5.5 - */ class TizenDeviceImpl : public IDevice { public: - /** - * @brief TBD - * @since_tizen 5.5 - */ TizenDeviceImpl(); - /** - * @brief TBD - * @since_tizen 5.5 - */ ~TizenDeviceImpl(); /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::click() */ bool click(const int x, const int y) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::click() */ - bool click(const int x, const int y, const unsigned int intv) override; + bool click(const int x, const int y, const unsigned int durationMs) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::drag() */ bool drag(const int sx, const int sy, const int ex, const int ey, const int steps, const int durationMs) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::touchDown() */ int touchDown(const int x, const int y) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::touchMove() */ bool touchMove(const int x, const int y, const int seq) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::touchUp() */ bool touchUp(const int x, const int y, const int seq) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::wheelUp() */ bool wheelUp(int amount, const int durationMs) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::wheelDown() */ bool wheelDown(int amount, const int durationMs) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::pressBack() */ bool pressBack(KeyRequestType type) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::pressHome() */ bool pressHome(KeyRequestType type) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::pressMenu() */ bool pressMenu(KeyRequestType type) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::pressVolUp() */ bool pressVolUp(KeyRequestType type) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::pressVolDown() */ bool pressVolDown(KeyRequestType type) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::pressPower() */ bool pressPower(KeyRequestType type) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::pressKeyCode() */ bool pressKeyCode(std::string keycode, KeyRequestType type) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::takeScreenshot() */ bool takeScreenshot(std::string path, float scale, int quality) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc IDevice::getSystemTime() */ long long getSystemTime(TimeRequestType type) override; protected: /** - * @brief TBD + * @brief Press and release given key during duration time. + * * @since_tizen 5.5 */ - bool strokeKeyCode(std::string keycode, unsigned int intv); + bool strokeKeyCode(std::string keycode, unsigned int durationMs); /** - * @brief TBD + * @brief Press given key. + * * @since_tizen 5.5 */ bool pressKeyCode(std::string keycode); /** - * @brief TBD + * @brief Release given key. + * * @since_tizen 5.5 */ bool releaseKeyCode(std::string keycode); /** - * @brief TBD + * @brief Increase touch count and return the number to manage touch count. + * * @since_tizen 5.5 */ int grabTouchSeqNumber(); /** - * @brief TBD + * @brief Delete given touch number. + * * @since_tizen 5.5 */ bool releaseTouchSeqNumber(int seq); private: /** - * @brief TBD + * @brief Timer utility. + * * @since_tizen 5.5 */ void startTimer(void); /** - * @brief TBD + * @brief Timer utility. + * * @since_tizen 5.5 */ int stopTimer(void); private: - /** - * @brief TBD - */ efl_util_inputgen_h mFakeTouchHandle; - - /** - * @brief TBD - */ efl_util_inputgen_h mFakeKeyboardHandle; - - /** - * @brief TBD - */ efl_util_inputgen_h mFakeWheelHandle; - - /** - * @brief TBD - */ static const int INTV_CLICK = 5; - - /** - * @brief TBD - */ static const int INTV_SHORTSTROKE = 100; - - /** - * @brief TBD - */ static const int INTV_LONGSTROKE = 2000; - - /** - * @brief TBD - */ static const int INTV_MINIMUM_DRAG_MS = 25; - - /** - * @brief TBD - */ static const int INTV_MINIMUM_USLEEP = 1000; - - /** - * @brief TBD - */ static const int MINIMUM_DURATION_DRAG = 100; - - /** - * @brief TBD - */ static const unsigned int MSEC_PER_SEC = 1000; - - /** - * @brief TBD - */ static const unsigned int MAX_FINGER_NUMBER = 2; - - /** - * @brief TBD - */ struct timespec tStart; - - /** - * @brief TBD - */ bool isTimerStarted; - - /** - * @brief TBD - */ std::set mTouchSeq; }; \ No newline at end of file diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index 84a93cd..ab8a058 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -5,137 +5,245 @@ #include /** - * @brief TimeRequestType enum class + * @brief TimeRequestType enum class. + * * @since_tizen 5.5 */ enum class TimeRequestType { - WALLCLOCK, - MONOTONIC, + WALLCLOCK, //Real time of system + MONOTONIC, //monotonic time of system }; /** - * @brief KeyRequestType enum class + * @brief KeyRequestType enum class. + * * @since_tizen 5.5 */ enum class KeyRequestType { - STROKE, - LONG_STROKE, - PRESS, - RELEASE, + STROKE, //Key press(100ms) and release + LONG_STROKE, //Key long press(2000ms) and release + PRESS, //Key press + RELEASE, //Key release }; /** - * @brief IDevice interface + * @brief IDevice interface. + * It defines common device controls such as touch, key events + * * @since_tizen 5.5 */ class IDevice { public: /** - * @brief TBD virtual dtor + * @brief IDevice Destructor. + * * @since_tizen 5.5 */ virtual ~IDevice() {} /** - * @brief TBD + * @brief Performs a click at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * + * @return true if the click succeeded else false + * * @since_tizen 5.5 */ virtual bool click(const int x, const int y) = 0; /** - * @brief TBD click method + * @brief Performs a click at arbitrary coordinates specified by the user during the specified time. + * + * @param x x coordinate + * @param y y coordinate + * @param durationMs total time to maintain down action + * + * @return true if the click succeeded else false + * * @since_tizen 5.5 */ - virtual bool click(const int x, const int y, const unsigned int intv) = 0; + virtual bool click(const int x, const int y, const unsigned int durationMs) = 0; /** - * @brief TBD + * @brief Performs a drag from one coordinate to another using the number of steps + * during the specified time. + * + * @param sx start x coordinate + * @param sy start y coordinate + * @param ex end x coordinate + * @param ey end y coordinate + * @param steps the number of move steps + * @param durationMs total time to drag event + * + * @return true if the drag succeeded else false + * * @since_tizen 5.5 */ virtual bool drag(const int sx, const int sy, const int ex, const int ey, const int steps, const int durationMs) = 0; /** - * @brief TBD + * @brief Performs a touch down at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * + * @return touch event number + * * @since_tizen 5.5 */ virtual int touchDown(const int x, const int y) = 0; /** - * @brief TBD + * @brief Performs a touch move at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * @param seq touch event number + * + * @return true if the touch move succeeded else false + * * @since_tizen 5.5 */ virtual bool touchMove(const int x, const int y, const int seq) = 0; /** - * @brief TBD + * @brief Performs a touch up at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * @param seq touch event number + * + * @return true if the touch up succeeded else false + * * @since_tizen 5.5 */ virtual bool touchUp(const int x, const int y, const int seq) = 0; /** - * @brief TBD + * @brief Performs a wheel up on device with event amount and duration. + * + * @param amount the number of wheel up event sent + * @param durationMs total time to wheel up event + * + * @return true if the wheel up succeeded else false + * * @since_tizen 5.5 */ - virtual bool wheelUp(int amount, const int durationMs) = 0; /** - * @brief TBD + * @brief Performs a wheel down on device with event amount and duration. + * + * @param amount the number of wheel down event sent + * @param durationMs total time to wheel down event + * + * @return true if the wheel down succeeded else false + * * @since_tizen 5.5 */ virtual bool wheelDown(int amount, const int durationMs) = 0; /** - * @brief TBD + * @brief Simulates a press on the back key. + * + * @param type one of @KeyRequestType + * + * @return true if the press back succeeded else false + * * @since_tizen 5.5 */ virtual bool pressBack(KeyRequestType type) = 0; /** - * @brief TBD + * @brief Simulates a press on the home key. + * + * @param type one of @KeyRequestType + * + * @return true if the press home succeeded else false + * * @since_tizen 5.5 */ virtual bool pressHome(KeyRequestType type) = 0; /** - * @brief TBD + * @brief Simulates a press on the menu key. + * + * @param type one of @KeyRequestType + * + * @return true if the press menu succeeded else false + * * @since_tizen 5.5 */ virtual bool pressMenu(KeyRequestType type) = 0; /** - * @brief TBD + * @brief Simulates a press on the volume up key. + * + * @param type one of @KeyRequestType + * + * @return true if the press volume up succeeded else false + * * @since_tizen 5.5 */ virtual bool pressVolUp(KeyRequestType type) = 0; /** - * @brief TBD + * @brief Simulates a press on the volume down key. + * + * @param type one of @KeyRequestType + * + * @return true if the press volume down succeeded else false + * * @since_tizen 5.5 */ virtual bool pressVolDown(KeyRequestType type) = 0; /** - * @brief TBD + * @brief Simulates a press on the power key. + * + * @param type one of @KeyRequestType + * + * @return true if the press power succeeded else false + * * @since_tizen 5.5 */ virtual bool pressPower(KeyRequestType type) = 0; /** - * @brief TBD + * @brief Simulates a press on the given keycode key. + * + * @param keycode keycode + * @param type one of @KeyRequestType + * + * @return true if the press keycode succeeded else false + * * @since_tizen 5.5 */ virtual bool pressKeyCode(std::string keycode, KeyRequestType type) = 0; /** - * @brief TBD + * @brief Take a screenshot of current window and store it as image file. + * + * @param path where the image file should be written to + * @param scale scale the screenshot down if needed; 1.0f for original size + * @param quality quality of the PNG compression; range: 0-100 + * + * @return true if screen shot is created successfully, false otherwise + * * @since_tizen 5.5 */ virtual bool takeScreenshot(std::string path, float scale, int quality) = 0; /** - * @brief TBD + * @brief Gets device system time. + * + * @param type one of @TimeRequestType + * + * @return utc time stamp + * * @since_tizen 5.5 */ virtual long long getSystemTime(TimeRequestType type) = 0; diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index 03cce46..ac2e642 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -18,110 +18,218 @@ #include /** - * @brief UiDevice class - * @since_tizen 5.5 + * @class UiDevice + * + * @ingroup aurum + * + * @brief UiDevice provides access to state information about the device. + * You can also use this class to simulate user actions on the device. */ class UiDevice : public IDevice, public ISearchable { public: /** - * @brief TBD + * @brief Performs a click at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * + * @return true if the click succeeded else false + * * @since_tizen 5.5 */ bool click(const int x, const int y) override; /** - * @brief TBD + * @brief Performs a click at arbitrary coordinates specified by the user during the specified time. + * + * @param x x coordinate + * @param y y coordinate + * @param durationMs total time to maintain down action + * + * @return true if the click succeeded else false + * * @since_tizen 5.5 */ - bool click(const int x, const int y, const unsigned int intv) override; - - /** - * @brief TBD + bool click(const int x, const int y, const unsigned int durationMs) override; + + /** + * @brief Performs a drag from one coordinate to another using the number of steps + * during the specified time. + * + * @param sx start x coordinate + * @param sy start y coordinate + * @param ex end x coordinate + * @param ey end y coordinate + * @param steps the number of move steps + * @param durationMs total time to drag event + * + * @return true if the drag succeeded else false + * * @since_tizen 5.5 */ bool drag(const int sx, const int sy, const int ex, const int ey, const int steps, const int durationMs) override; /** - * @brief TBD + * @brief Performs a touch down at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * + * @return touch event number + * * @since_tizen 5.5 */ int touchDown(const int x, const int y) override; /** - * @brief TBD + * @brief Performs a touch move at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * @param seq touch event number + * + * @return true if the touch move succeeded else false + * * @since_tizen 5.5 */ bool touchMove(const int x, const int y, const int seq) override; /** - * @brief TBD + * @brief Performs a touch up at arbitrary coordinates specified by the user. + * + * @param x x coordinate + * @param y y coordinate + * @param seq touch event number + * + * @return true if the touch up succeeded else false + * * @since_tizen 5.5 */ bool touchUp(const int x, const int y, const int seq) override; /** - * @brief TBD + * @brief Performs a wheel up on device with event amount and duration. + * + * @param amount the number of wheel up event sent + * @param durationMs total time to wheel up event + * + * @return true if the wheel up succeeded else false + * * @since_tizen 5.5 */ bool wheelUp(int amount, const int durationMs) override; /** - * @brief TBD + * @brief Performs a wheel down on device with event amount and duration. + * + * @param amount the number of wheel down event sent + * @param durationMs total time to wheel down event + * + * @return true if the wheel down succeeded else false + * * @since_tizen 5.5 */ bool wheelDown(int amount, const int durationMs) override; /** - * @brief TBD + * @brief Simulates a press on the back key. + * + * @param type one of @KeyRequestType + * + * @return true if the press back succeeded else false + * * @since_tizen 5.5 */ bool pressBack(KeyRequestType type) override; /** - * @brief TBD + * @brief Simulates a press on the home key. + * + * @param type one of @KeyRequestType + * + * @return true if the press home succeeded else false + * * @since_tizen 5.5 */ bool pressHome(KeyRequestType type) override; /** - * @brief TBD + * @brief Simulates a press on the menu key. + * + * @param type one of @KeyRequestType + * + * @return true if the press menu succeeded else false + * * @since_tizen 5.5 */ bool pressMenu(KeyRequestType type) override; /** - * @brief TBD + * @brief Simulates a press on the volume up key. + * + * @param type one of @KeyRequestType + * + * @return true if the press volume up succeeded else false + * * @since_tizen 5.5 */ bool pressVolUp(KeyRequestType type) override; /** - * @brief TBD + * @brief Simulates a press on the volume down key. + * + * @param type one of @KeyRequestType + * + * @return true if the press volume down succeeded else false + * * @since_tizen 5.5 */ bool pressVolDown(KeyRequestType type) override; /** - * @brief TBD + * @brief Simulates a press on the power key. + * + * @param type one of @KeyRequestType + * + * @return true if the press power succeeded else false + * * @since_tizen 5.5 */ bool pressPower(KeyRequestType type) override; /** - * @brief TBD + * @brief Simulates a press on the given keycode key. + * + * @param keycode keycode + * @param type one of @KeyRequestType + * + * @return true if the press keycode succeeded else false + * * @since_tizen 5.5 */ bool pressKeyCode(std::string keycode, KeyRequestType type) override; /** - * @brief TBD + * @brief Take a screenshot of current window and store it as image file. + * + * @param path where the image file should be written to + * @param scale scale the screenshot down if needed; 1.0f for original size + * @param quality quality of the PNG compression; range: 0-100 + * + * @return true if screen shot is created successfully, false otherwise + * * @since_tizen 5.5 */ bool takeScreenshot(std::string path, float scale, int quality) override; /** - * @brief TBD + * @brief Gets device system time. + * + * @param type one of @TimeRequestType + * + * @return utc time stamp + * * @since_tizen 5.5 */ long long getSystemTime(TimeRequestType type) override; @@ -129,102 +237,142 @@ public: public: /** - * @brief TBD + * @brief Checks that there is object that satisfied with the selector condition in the device. + * + * @param selector @UiSelector + * + * @return object exist or not + * * @since_tizen 5.5 */ bool hasObject(const std::shared_ptr selector) const override; /** - * @brief TBD + * @brief Finds that object that satisfied with the selector condition in the device. + * + * @param selector @UiSelector + * + * @return Found UiObject ptr + * * @since_tizen 5.5 */ std::shared_ptr findObject( const std::shared_ptr selector) const override; /** - * @brief TBD + * @brief Finds that objects that satisfied with the selector condition in the device. + * + * @param selector @UiSelector + * + * @return Found UiObject ptr vector + * * @since_tizen 5.5 */ std::vector> findObjects( const std::shared_ptr selector) const override; /** - * @brief TBD - * @since_tizen 5.5 + * TODO */ bool waitFor( const std::function condition) const; /** - * @brief TBD - * @since_tizen 5.5 + * TODO */ std::shared_ptr waitFor( const std::function(const ISearchable *)> condition) const; /** - * @brief TBD + * @brief Waits for a specific A11y Event for a some time by user set. + * + * @param type one of @A11yEvent + * @param timeout time(millisecond) to wait event occur + * + * @return true if event happened in time, otherwise false + * * @since_tizen 6.5 */ bool waitForEvents( const A11yEvent type, const int timeout) const; /** - * @brief TBD + * @brief Sends key event and Wait for a specific A11y Event for a some time by user set. + * + * @param keycode keycode + * @param type one of @A11yEvent + * @param timeout time(millisecond) to wait event occur + * + * @return true if event happened in time, otherwise false + * * @since_tizen 6.5 */ bool sendKeyAndWaitForEvents( const std::string keycode, const A11yEvent type, const int timeout) const; + /** + * @brief Runs command and Wait for a specific A11y Event for a some time by user set. + * + * @param cmd @Runnable + * @param type one of @A11yEvent + * @param timeout time(millisecond) to wait event occur + * + * @return true if event happened in time, otherwise false + * + * @since_tizen 6.5 + */ bool executeAndWaitForEvents( const Runnable *cmd, const A11yEvent type, const int timeout) const; public: /** - * @brief TBD + * @brief Gets UiDevice instance. + * + * @return UiDevice ptr + * * @since_tizen 5.5 */ static std::shared_ptr getInstance(IDevice *deviceImpl = nullptr); /** - * @brief TBD + * @brief Gets currently enabled applications root window. + * + * @return AccessibleNode ptr vector * @since_tizen 5.5 */ std::vector> getWindowRoot() const; private: /** - * @brief TBD + * @brief Waits process idle. + * * @since_tizen 5.5 */ bool waitForIdle() const; private: /** - * @brief TBD + * @brief UiDevice Consturctor. + * * @since_tizen 5.5 */ UiDevice(); /** - * @brief TBD + * @brief UiDevice Consturctor with IDevice. + * * @since_tizen 5.5 */ UiDevice(IDevice *impl); public: /** - * @brief TBD + * @brief UiDevice Destructor. + * * @since_tizen 5.5 */ virtual ~UiDevice(); private: - /** - * @brief TBD - */ IDevice *mDeviceImpl; - /** - * @brief TBD - */ const Waiter *mWaiter; }; diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index 15a77a9..e1561d8 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -286,7 +286,7 @@ public: * @brief TBD * @since_tizen 5.5 */ - void longClick(const unsigned int intv = LOGNCLICK_INTERVAL) const; + void longClick(const unsigned int durationMs = LOGNCLICK_INTERVAL) const; /** * @brief TBD diff --git a/libaurum/src/Impl/MockDeviceImpl.cc b/libaurum/src/Impl/MockDeviceImpl.cc index 855ceb3..2170536 100644 --- a/libaurum/src/Impl/MockDeviceImpl.cc +++ b/libaurum/src/Impl/MockDeviceImpl.cc @@ -34,11 +34,11 @@ bool MockDeviceImpl::click(const int x, const int y) return click(x, y, INTV_CLICK); } -bool MockDeviceImpl::click(const int x, const int y, const unsigned int intv) +bool MockDeviceImpl::click(const int x, const int y, const unsigned int durationMs) { int seq = touchDown(x, y); if (seq < 0) return false; - std::this_thread::sleep_for(std::chrono::milliseconds{intv}); + std::this_thread::sleep_for(std::chrono::milliseconds{durationMs}); return touchUp(x, y, seq); } diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index ea0792a..101cf06 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -40,13 +40,13 @@ bool TizenDeviceImpl::click(const int x, const int y) return click(x, y, INTV_CLICK); } -bool TizenDeviceImpl::click(const int x, const int y, const unsigned int intv) +bool TizenDeviceImpl::click(const int x, const int y, const unsigned int durationMs) { - LOGI("click %d %d , intv:%d", x, y, intv); + LOGI("click %d %d , durationMs:%d", x, y, durationMs); int seq = touchDown(x, y); if (seq < 0) return false; - usleep(intv * MSEC_PER_SEC); + usleep(durationMs * MSEC_PER_SEC); touchUp(x, y, seq); return true; @@ -221,10 +221,10 @@ bool TizenDeviceImpl::pressKeyCode(std::string keycode, KeyRequestType type) return false; } -bool TizenDeviceImpl::strokeKeyCode(std::string keycode, unsigned int intv) +bool TizenDeviceImpl::strokeKeyCode(std::string keycode, unsigned int durationMs) { pressKeyCode(keycode); - usleep(intv * 1000); + usleep(durationMs * 1000); releaseKeyCode(keycode); return true; } diff --git a/libaurum/src/UiDevice.cc b/libaurum/src/UiDevice.cc index b53d43d..2fdeb2e 100644 --- a/libaurum/src/UiDevice.cc +++ b/libaurum/src/UiDevice.cc @@ -148,9 +148,9 @@ bool UiDevice::click(const int x, const int y) return result; } -bool UiDevice::click(const int x, const int y, const unsigned int intv) +bool UiDevice::click(const int x, const int y, const unsigned int durationMs) { - bool result = mDeviceImpl->click(x, y, intv); + bool result = mDeviceImpl->click(x, y, durationMs); waitForIdle(); return result; } diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index e8f7cdd..2d4bda4 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -308,12 +308,12 @@ void UiObject::click() const mDevice->click(midPoint.x, midPoint.y); } -void UiObject::longClick(const unsigned int intv) const +void UiObject::longClick(const unsigned int durationMs) const { mNode->updateExtents(); const Rect rect = mNode->getScreenBoundingBox(); const Point2D midPoint = rect.midPoint(); - mDevice->click(midPoint.x, midPoint.y, intv); + mDevice->click(midPoint.x, midPoint.y, durationMs); } bool UiObject::DoAtspiActivate() const -- 2.7.4 From ffc4eeda44dcce645fcd012ab5d95bb502614e1d Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 10 Sep 2021 16:17:25 +0900 Subject: [PATCH 03/16] aurum: Add screen size getter and fix screen capture file naming rule gets screen size from system API. puts system date time for screenshot file name. Change-Id: I9a2ad8ebefd8f09421b2cb0de70ea0167d6feba3 --- libaurum/inc/Aurum.h | 1 + libaurum/inc/Impl/MockDeviceImpl.h | 11 ++++ libaurum/inc/Impl/TizenDeviceImpl.h | 14 +++++ libaurum/inc/Interface/IDevice.h | 12 ++++- libaurum/inc/Misc/Size2D.h | 63 ++++++++++++++++++++++ libaurum/inc/UiDevice.h | 8 +++ libaurum/meson.build | 1 + libaurum/src/Impl/MockDeviceImpl.cc | 7 +++ libaurum/src/Impl/TizenDeviceImpl.cc | 20 ++++--- libaurum/src/UiDevice.cc | 5 ++ .../src/Commands/TakeScreenshotCommand.cc | 15 +++++- 11 files changed, 148 insertions(+), 9 deletions(-) create mode 100644 libaurum/inc/Misc/Size2D.h diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h index ae9a89e..afa5568 100644 --- a/libaurum/inc/Aurum.h +++ b/libaurum/inc/Aurum.h @@ -36,6 +36,7 @@ #include "IDevice.h" #include "Accessible.h" #include "Point2D.h" +#include "Size2D.h" #include "Rect.h" #include "PartialMatch.h" #include "Comparer.h" diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index b2cd9f1..9c0968c 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -137,6 +137,12 @@ public: */ long long getSystemTime(TimeRequestType type) override; + /** + * @brief TBD + * @since_tizen 6.5 + */ + const Size2D getScreenSize() override; + protected: /** * @brief TBD @@ -263,4 +269,9 @@ public: * @brief TBD */ int mWheelDevice; + + /** + * @brief TBD + */ + Size2D mScreenSize; }; \ No newline at end of file diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index 79db52c..8245332 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -98,6 +98,15 @@ public: */ long long getSystemTime(TimeRequestType type) override; + /** + * @brief Gets device screen size. + * + * @return @Size2D + * + * @since_tizen 6.5 + */ + const Size2D getScreenSize() override; + protected: /** * @brief Press and release given key during duration time. @@ -164,4 +173,9 @@ private: struct timespec tStart; bool isTimerStarted; std::set mTouchSeq; + + /** + * @brief TBD + */ + Size2D mScreenSize; }; \ No newline at end of file diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index ab8a058..8affc50 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -1,7 +1,8 @@ #pragma once #include "config.h" - +#include "Rect.h" +#include "Size2D.h" #include /** @@ -247,4 +248,13 @@ public: * @since_tizen 5.5 */ virtual long long getSystemTime(TimeRequestType type) = 0; + + /** + * @brief Gets device screen size. + * + * @return @Size2D + * + * @since_tizen 6.5 + */ + virtual const Size2D getScreenSize() = 0; }; \ No newline at end of file diff --git a/libaurum/inc/Misc/Size2D.h b/libaurum/inc/Misc/Size2D.h new file mode 100644 index 0000000..746f47f --- /dev/null +++ b/libaurum/inc/Misc/Size2D.h @@ -0,0 +1,63 @@ +#pragma once + +/** + * @brief Size2D Class. + * This class for represent specific obejct's size as width and height. + * + * @since_tizen 6.5 + */ +template +class Size2D { +public: + /** + * @brief Size2D contructor with value. + * + * @since_tizen 6.5 + */ + Size2D() : width{0}, height{0} {} + + /** + * @brief Size2D contructor with source. + * + * @since_tizen 6.5 + */ + Size2D(const Size2D &src) + { + width = src.width; + height = src.height; + } + + /** + * @brief Size2D contructor with type. + * + * @since_tizen 6.5 + */ + Size2D(const T &width, const T &height) + { + this->width = width; + this->height = height; + } + + /** + * @brief Size2D operator for "==". + * + * @since_tizen 6.5 + */ + inline bool operator==(const Size2D& rhs) + { + return this->width == rhs.width && this->height == rhs.height; + } + + /** + * @brief Size2D operator for "!=". + * + * @since_tizen 6.5 + */ + inline bool operator!=(const Size2D& rhs) + { + return !(*this == rhs); + } + + T width; + T height; +}; diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index ac2e642..132f4cb 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -234,6 +234,14 @@ public: */ long long getSystemTime(TimeRequestType type) override; + /** + * @brief Gets device screen size. + * + * @return @Size2D + * + * @since_tizen 6.5 + */ + const Size2D getScreenSize() override; public: /** diff --git a/libaurum/meson.build b/libaurum/meson.build index d55c9ee..82deeee 100644 --- a/libaurum/meson.build +++ b/libaurum/meson.build @@ -15,6 +15,7 @@ libaurum_install_inc = [ './inc/Misc/bitmask.h', './inc/Misc/Point2D.h', './inc/Misc/Rect.h', + './inc/Misc/Size2D.h', './inc/Aurum.h', ] diff --git a/libaurum/src/Impl/MockDeviceImpl.cc b/libaurum/src/Impl/MockDeviceImpl.cc index 2170536..8a4ce23 100644 --- a/libaurum/src/Impl/MockDeviceImpl.cc +++ b/libaurum/src/Impl/MockDeviceImpl.cc @@ -1,3 +1,5 @@ +#include "Aurum.h" + #include "MockDeviceImpl.h" #include @@ -186,6 +188,11 @@ long long MockDeviceImpl::getSystemTime(TimeRequestType type) return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / MICRO_SEC); } +const Size2D MockDeviceImpl::getScreenSize() +{ + return mScreenSize; +} + bool MockDeviceImpl::strokeKeyCode(std::string keycode, unsigned int intv) { return false; diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index 101cf06..96846e1 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -26,6 +26,13 @@ TizenDeviceImpl::TizenDeviceImpl() obj->mFakeTouchHandle = efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); obj->mFakeKeyboardHandle = efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_KEYBOARD); + + int width = 0; + int height = 0; + system_info_get_platform_int("http://tizen.org/feature/screen.width", &width); + system_info_get_platform_int("http://tizen.org/feature/screen.height", &height); + + mScreenSize = Size2D{width, height}; } TizenDeviceImpl::~TizenDeviceImpl() @@ -248,12 +255,7 @@ bool TizenDeviceImpl::takeScreenshot(std::string path, float scale, int quality) efl_util_screenshot_h screenshot = NULL; tbm_surface_h tbm_surface = NULL; - int width = 0, height = 0; - if (system_info_get_platform_int("http://tizen.org/feature/screen.width", &width) || - system_info_get_platform_int("http://tizen.org/feature/screen.height", &height)) - return false; - - screenshot = efl_util_screenshot_initialize(width, height); + screenshot = efl_util_screenshot_initialize(mScreenSize.width, mScreenSize.height); if (screenshot) { tbm_surface = efl_util_screenshot_take_tbm_surface(screenshot); @@ -319,6 +321,12 @@ long long TizenDeviceImpl::getSystemTime(TimeRequestType type) } +const Size2D TizenDeviceImpl::getScreenSize() +{ + TizenDeviceImpl *obj = static_cast(this); + return obj->mScreenSize; +} + int TizenDeviceImpl::grabTouchSeqNumber() { for (unsigned int i = 0 ; i < MAX_FINGER_NUMBER; i++) { diff --git a/libaurum/src/UiDevice.cc b/libaurum/src/UiDevice.cc index 2fdeb2e..644d580 100644 --- a/libaurum/src/UiDevice.cc +++ b/libaurum/src/UiDevice.cc @@ -254,3 +254,8 @@ long long UiDevice::getSystemTime(TimeRequestType type) { return mDeviceImpl->getSystemTime(type); } + +const Size2D UiDevice::getScreenSize() +{ + return mDeviceImpl->getScreenSize(); +} diff --git a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc index e3cc296..a34b352 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc @@ -15,13 +15,24 @@ TakeScreenshotCommand::TakeScreenshotCommand( { LOGI("TakeScreenshot --------------- "); - std::string path = "/tmp/screenshot.png"; + struct tm timeinfo; + time_t now = time(0); + if (!localtime_r(&now, &timeinfo)) { + LOGE("fail to get localtime. Screenshot cancelled"); + return grpc::Status::CANCELLED; + } + + char name[128]; + std::snprintf(name, 128, "/tmp/screenshot-%d-%d-%d-%d:%d:%d.png", + (timeinfo.tm_year + 1900), (timeinfo.tm_mon + 1), timeinfo.tm_mday, + timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec); + std::string path(name); std::shared_ptr mDevice = UiDevice::getInstance(); mDevice->takeScreenshot(path, 1.0, 1); std::ifstream ifs(path, std::ifstream::binary); ::aurum::RspTakeScreenshot rsp; - int size = 1920 * 1080; + int size = mDevice->getScreenSize().width * mDevice->getScreenSize().height; char buf[size]; while (!ifs.eof()) { -- 2.7.4 From 6986e48ebb82dc6981ea08d9d472c01d903995e0 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 1 Oct 2021 11:13:27 +0900 Subject: [PATCH 04/16] aurum: Fix root permission not require in host 1. bootrap service app add in system 2. touch force enable by vconf API 3. Use sync API to avoid winfo command in host Change-Id: I72afd5f48677d5be7c4cc3114a8231c0d3950a67 --- libaurum/src/Impl/TizenDeviceImpl.cc | 4 +-- org.tizen.aurum-bootstrap/meson.build | 1 + org.tizen.aurum-bootstrap/src/BootstrapServer.cc | 40 +++++++++++++++++++++--- packaging/aurum.spec | 11 +------ protocol/resources/python/mobile/mobileSetup.py | 1 - protocol/resources/python/tv/tvSetup.py | 7 ----- 6 files changed, 40 insertions(+), 24 deletions(-) diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index 96846e1..d966fc0 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -23,9 +23,9 @@ TizenDeviceImpl::TizenDeviceImpl() { LOGI("device implementation init"); TizenDeviceImpl *obj = static_cast(this); - obj->mFakeTouchHandle = efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); + obj->mFakeTouchHandle = efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN, NULL); obj->mFakeKeyboardHandle = - efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_KEYBOARD); + efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_KEYBOARD, NULL); int width = 0; int height = 0; diff --git a/org.tizen.aurum-bootstrap/meson.build b/org.tizen.aurum-bootstrap/meson.build index 8bb2b35..e27c68a 100644 --- a/org.tizen.aurum-bootstrap/meson.build +++ b/org.tizen.aurum-bootstrap/meson.build @@ -56,6 +56,7 @@ bootstrap_svr_dep += [ dependency('capi-appfw-service-application'), dependency('capi-system-system-settings'), dependency('capi-base-utils-i18n'), + dependency('vconf'), ] endif diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc index 0ae861e..28b144a 100644 --- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc +++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc @@ -1,13 +1,13 @@ #include -#include -#include "bootstrap.h" - #include - #include #include #include +#include +#include +#include +#include "bootstrap.h" #include "AurumServiceImpl.h" #include "config.h" @@ -15,14 +15,43 @@ using namespace grpc; typedef struct _ServiceContext { std::unique_ptr server; + bool forceTouchEnabled; } ServiceContext; +static void _vconf_force_enable_touch_set(void *data, bool enable) +{ + ServiceContext *ctx = (ServiceContext *)data; + int ret; + + if (ctx->forceTouchEnabled == enable) return; + + ret = vconf_set_bool("memory/window_system/input/force_enable_touch", enable); + if (ret != VCONF_OK) { + LOGE("Fail to set touch enable via vconf"); + return; + } + + ctx->forceTouchEnabled = enable; +} + static bool _service_app_create(void *data) { ServiceContext *ctx = (ServiceContext *)data; std::string binding("0.0.0.0:50051"); aurumServiceImpl service; ServerBuilder builder; + char *value; + int ret; + + ctx->forceTouchEnabled = false; + ret = system_info_get_platform_string("http://tizen.org/feature/profile", &value); + if (ret != SYSTEM_INFO_ERROR_NONE) LOGE("Fail to get system profile infomation"); + else { + if (!strncmp("tv", value, 2)) + _vconf_force_enable_touch_set(ctx, true); + + free(value); + } LOGI("[T] Server Listening on %s", binding.c_str()); builder.AddListeningPort(binding, grpc::InsecureServerCredentials()); @@ -36,6 +65,9 @@ static bool _service_app_create(void *data) static void _service_app_terminate(void *data) { ServiceContext *ctx = (ServiceContext *)data; + + if (ctx->forceTouchEnabled) + _vconf_force_enable_touch_set(ctx, false); ctx->server->Shutdown(); } diff --git a/packaging/aurum.spec b/packaging/aurum.spec index 181fddb..73a6a95 100644 --- a/packaging/aurum.spec +++ b/packaging/aurum.spec @@ -29,6 +29,7 @@ BuildRequires: pkgconfig(capi-system-device) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(capi-system-system-settings) BuildRequires: pkgconfig(capi-base-utils-i18n) +BuildRequires: pkgconfig(vconf) %if 0%{?gendoc:1} BuildRequires: doxygen @@ -38,18 +39,10 @@ BuildRequires: doxygen BuildRequires: lcov %endif -%if "%{?profile}" == "tv" - %define __hash_signing 0 -%else - %define __hash_signing 1 -%endif - -%if 0%{?__hash_signing} BuildRequires: hash-signer %if 0%{?sec_product_feature_profile_wearable} Requires(post): signing-client %endif -%endif %description aurum is a project for testing ui. @@ -152,13 +145,11 @@ ninja \ %install -%if 0%{?__hash_signing} %define tizen_sign 1 %define tizen_sign_base /usr/apps/org.tizen.aurum-bootstrap %define tizen_sign_level platform %define tizen_author_sign 1 %define tizen_dist_sign 1 -%endif export DESTDIR=%{buildroot} ninja -C gbsbuild install diff --git a/protocol/resources/python/mobile/mobileSetup.py b/protocol/resources/python/mobile/mobileSetup.py index ca22373..8df3cbe 100644 --- a/protocol/resources/python/mobile/mobileSetup.py +++ b/protocol/resources/python/mobile/mobileSetup.py @@ -9,7 +9,6 @@ def run_command(command): output = stream.read() # Start scrip here -run_command("sdb root on") run_command("sdb forward tcp:50051 tcp:50051") run_command("sdb shell app_launcher -s org.tizen.aurum-bootstrap") # Wait 1 sec till bootstrap launched diff --git a/protocol/resources/python/tv/tvSetup.py b/protocol/resources/python/tv/tvSetup.py index a888f48..8df3cbe 100644 --- a/protocol/resources/python/tv/tvSetup.py +++ b/protocol/resources/python/tv/tvSetup.py @@ -9,13 +9,6 @@ def run_command(command): output = stream.read() # Start scrip here -run_command("sdb root on") -# To run bootstrap as command -run_command("sdb shell tpk-backend -y org.tizen.aurum-bootstrap --preload") -# TV need to enable touch -run_command("sdb shell vconftool set -f -t bool memory/window_system/input/force_enable_touch 1") -# Dut to input generator issue, temporarily do below command -run_command("sdb shell winfo -init_device --type=touch") run_command("sdb forward tcp:50051 tcp:50051") run_command("sdb shell app_launcher -s org.tizen.aurum-bootstrap") # Wait 1 sec till bootstrap launched -- 2.7.4 From eb0a0278acb873dd6ed723c68a07a06951f95e74 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 14 Oct 2021 10:26:06 +0900 Subject: [PATCH 05/16] libaurum: reset states data before update. Aurum managed state with bit operation for each state. But the state is not updated, if the exist state is changed. So i fixed it as reset bit before state update. Change-Id: I7ecf8b416a80baa7cd099b221c42b509267f87b6 --- libaurum/inc/Accessibility/AccessibleNode.h | 6 ++++++ libaurum/src/Accessibility/AccessibleNode.cc | 4 ++++ libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index c5dc2b5..81fb1c4 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -360,6 +360,12 @@ public: */ void setFeatureProperty(NodeFeatureProperties prop, bool has); + /** + * @brief TBD + * @since_tizen 6.5 + */ + void resetFeatureProperty(); + protected: /** * @brief TBD diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc index 740354d..73c0cdd 100644 --- a/libaurum/src/Accessibility/AccessibleNode.cc +++ b/libaurum/src/Accessibility/AccessibleNode.cc @@ -91,6 +91,10 @@ void AccessibleNode::setFeatureProperty(NodeFeatureProperties prop, bool has) mFeatureProperty &= ~static_cast(prop); } +void AccessibleNode::resetFeatureProperty() +{ + mFeatureProperty = 0; +} std::string AccessibleNode::getText() const { diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc index a8f1add..1c9b032 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc @@ -161,8 +161,9 @@ void AtspiAccessibleNode::updateAttributes() void AtspiAccessibleNode::updateStates() { - AtspiWrapper::Atspi_accessible_clear_cache(mNode); + resetFeatureProperty(); + AtspiWrapper::Atspi_accessible_clear_cache(mNode); AtspiStateSet *st = AtspiWrapper::Atspi_accessible_get_state_set(mNode); if (st) { GArray *states = AtspiWrapper::Atspi_state_set_get_states(st); -- 2.7.4 From c983ec55a3928be0c6ae4609f2bbf2ba01d26f14 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 14 Oct 2021 13:16:36 +0900 Subject: [PATCH 06/16] aurum: Add boilerplate Change-Id: I64b7669e9020d792a36aa9ca3839dc1238377c09 --- AUTHORS | 1 + NOTICE | 2 +- libaurum/inc/A11yEvent.h | 17 +++++++++++++++++ libaurum/inc/Accessibility/Accessible.h | 17 +++++++++++++++++ libaurum/inc/Accessibility/AccessibleApplication.h | 17 +++++++++++++++++ libaurum/inc/Accessibility/AccessibleNode.h | 17 +++++++++++++++++ libaurum/inc/Accessibility/AccessibleWatcher.h | 17 +++++++++++++++++ libaurum/inc/Accessibility/AccessibleWindow.h | 17 +++++++++++++++++ libaurum/inc/Accessibility/IEventConsumer.h | 17 +++++++++++++++++ libaurum/inc/Accessibility/IEventSource.h | 17 +++++++++++++++++ libaurum/inc/Aurum.h | 17 +++++++++++++++++ libaurum/inc/Comparer.h | 17 +++++++++++++++++ .../inc/Impl/Accessibility/AtspiAccessibleApplication.h | 17 +++++++++++++++++ libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h | 17 +++++++++++++++++ .../inc/Impl/Accessibility/AtspiAccessibleWatcher.h | 17 +++++++++++++++++ libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h | 17 +++++++++++++++++ libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 17 +++++++++++++++++ .../inc/Impl/Accessibility/MockAccessibleApplication.h | 17 +++++++++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleNode.h | 17 +++++++++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h | 17 +++++++++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h | 17 +++++++++++++++++ libaurum/inc/Impl/MockDeviceImpl.h | 17 +++++++++++++++++ libaurum/inc/Impl/TizenDeviceImpl.h | 17 +++++++++++++++++ libaurum/inc/Interface/IDevice.h | 17 +++++++++++++++++ libaurum/inc/Interface/ISearchable.h | 17 +++++++++++++++++ libaurum/inc/Misc/Point2D.h | 17 +++++++++++++++++ libaurum/inc/Misc/Rect.h | 17 +++++++++++++++++ libaurum/inc/Misc/Size2D.h | 17 +++++++++++++++++ libaurum/inc/Misc/bitmask.h | 17 +++++++++++++++++ libaurum/inc/PartialMatch.h | 17 +++++++++++++++++ libaurum/inc/Runnable/Runnable.h | 17 +++++++++++++++++ libaurum/inc/Runnable/Runnables.h | 17 +++++++++++++++++ libaurum/inc/Runnable/SendKeyRunnable.h | 17 +++++++++++++++++ libaurum/inc/Sel.h | 17 +++++++++++++++++ libaurum/inc/UiDevice.h | 17 +++++++++++++++++ libaurum/inc/UiObject.h | 17 +++++++++++++++++ libaurum/inc/UiScrollable.h | 17 +++++++++++++++++ libaurum/inc/UiSelector.h | 17 +++++++++++++++++ libaurum/inc/Waiter.h | 17 +++++++++++++++++ libaurum/src/A11yEvent.cc | 17 +++++++++++++++++ libaurum/src/Accessibility/AccessibleApplication.cc | 17 +++++++++++++++++ libaurum/src/Accessibility/AccessibleNode.cc | 17 +++++++++++++++++ libaurum/src/Accessibility/AccessibleWatcher.cc | 17 +++++++++++++++++ libaurum/src/Accessibility/AccessibleWindow.cc | 17 +++++++++++++++++ libaurum/src/Comparer.cc | 17 +++++++++++++++++ .../Impl/Accessibility/AtspiAccessibleApplication.cc | 17 +++++++++++++++++ libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc | 17 +++++++++++++++++ .../src/Impl/Accessibility/AtspiAccessibleWatcher.cc | 17 +++++++++++++++++ .../src/Impl/Accessibility/AtspiAccessibleWindow.cc | 17 +++++++++++++++++ libaurum/src/Impl/Accessibility/AtspiWrapper.cc | 17 +++++++++++++++++ .../src/Impl/Accessibility/MockAccessibleApplication.cc | 17 +++++++++++++++++ libaurum/src/Impl/Accessibility/MockAccessibleNode.cc | 17 +++++++++++++++++ .../src/Impl/Accessibility/MockAccessibleWatcher.cc | 17 +++++++++++++++++ libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc | 17 +++++++++++++++++ libaurum/src/Impl/MockDeviceImpl.cc | 17 +++++++++++++++++ libaurum/src/Impl/TizenDeviceImpl.cc | 17 +++++++++++++++++ libaurum/src/PartialMatch.cc | 17 +++++++++++++++++ libaurum/src/Runnable/SendKeyRunnable.cc | 17 +++++++++++++++++ libaurum/src/Sel.cc | 17 +++++++++++++++++ libaurum/src/UiDevice.cc | 17 +++++++++++++++++ libaurum/src/UiObject.cc | 17 +++++++++++++++++ libaurum/src/UiScrollable.cc | 17 +++++++++++++++++ libaurum/src/UiSelector.cc | 17 +++++++++++++++++ libaurum/src/Until.cc | 17 +++++++++++++++++ libaurum/src/Waiter.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h | 17 +++++++++++++++++ .../inc/Commands/CloseAppCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/Command.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/Commands.h | 17 +++++++++++++++++ .../inc/Commands/DumpObjectTreeCommand.h | 17 +++++++++++++++++ .../inc/Commands/FindElementCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h | 17 +++++++++++++++++ .../inc/Commands/GetAppInfoCommand.h | 17 +++++++++++++++++ .../inc/Commands/GetAttributeCommand.h | 17 +++++++++++++++++ .../inc/Commands/GetDeviceTimeCommand.h | 17 +++++++++++++++++ .../inc/Commands/GetLocationCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h | 17 +++++++++++++++++ .../inc/Commands/GetValueCommand.h | 17 +++++++++++++++++ .../inc/Commands/InstallAppCommand.h | 17 +++++++++++++++++ .../inc/Commands/KillServerCommand.h | 17 +++++++++++++++++ .../inc/Commands/LaunchAppCommand.h | 17 +++++++++++++++++ .../inc/Commands/LongClickCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h | 17 +++++++++++++++++ .../inc/Commands/RemoveAppCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h | 17 +++++++++++++++++ .../inc/Commands/SetValueCommand.h | 17 +++++++++++++++++ .../inc/Commands/TakeScreenshotCommand.h | 17 +++++++++++++++++ .../inc/Commands/TouchDownCommand.h | 17 +++++++++++++++++ .../inc/Commands/TouchMoveCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/ObjectMapper.h | 17 +++++++++++++++++ .../inc/Runnable/LaunchAppRunnable.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/inc/bootstrap.h | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/BootstrapServer.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc | 17 +++++++++++++++++ .../src/Commands/CloseAppCommand.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/Commands/Command.cc | 17 +++++++++++++++++ .../src/Commands/DumpObjectTreeCommand.cc | 17 +++++++++++++++++ .../src/Commands/FindElementCommand.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc | 17 +++++++++++++++++ .../src/Commands/GetAppInfoCommand.cc | 17 +++++++++++++++++ .../src/Commands/GetAttributeCommand.cc | 17 +++++++++++++++++ .../src/Commands/GetDeviceTimeCommand.cc | 17 +++++++++++++++++ .../src/Commands/GetLocationCommand.cc | 17 +++++++++++++++++ .../src/Commands/GetSizeCommand.cc | 17 +++++++++++++++++ .../src/Commands/GetValueCommand.cc | 17 +++++++++++++++++ .../src/Commands/InstallAppCommand.cc | 17 +++++++++++++++++ .../src/Commands/KillServerCommand.cc | 17 +++++++++++++++++ .../src/Commands/LaunchAppCommand.cc | 17 +++++++++++++++++ .../src/Commands/LongClickCommand.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc | 17 +++++++++++++++++ .../src/Commands/RemoveAppCommand.cc | 17 +++++++++++++++++ .../src/Commands/SendKeyCommand.cc | 17 +++++++++++++++++ .../src/Commands/SetValueCommand.cc | 17 +++++++++++++++++ .../src/Commands/TakeScreenshotCommand.cc | 17 +++++++++++++++++ .../src/Commands/TouchDownCommand.cc | 17 +++++++++++++++++ .../src/Commands/TouchMoveCommand.cc | 17 +++++++++++++++++ .../src/Commands/TouchUpCommand.cc | 17 +++++++++++++++++ org.tizen.aurum-bootstrap/src/ObjectMapper.cc | 17 +++++++++++++++++ .../src/Runnable/LaunchAppRunnable.cc | 17 +++++++++++++++++ 126 files changed, 2110 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index e183b0c..10d62dd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ Wonki Kim +Woochan Lee \ No newline at end of file diff --git a/NOTICE b/NOTICE index dcf3561..f108c19 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,3 @@ -Copyright (c) 2019 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) 2021 Samsung Electronics Co., Ltd. All rights reserved. Except as noted, this software is licensed under Apache License, Version 2. Please, see the COPYING file for Apache License terms and conditions. diff --git a/libaurum/inc/A11yEvent.h b/libaurum/inc/A11yEvent.h index 7a2a47a..02c0d5e 100644 --- a/libaurum/inc/A11yEvent.h +++ b/libaurum/inc/A11yEvent.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "bitmask.h" diff --git a/libaurum/inc/Accessibility/Accessible.h b/libaurum/inc/Accessibility/Accessible.h index df22041..f17b85f 100644 --- a/libaurum/inc/Accessibility/Accessible.h +++ b/libaurum/inc/Accessibility/Accessible.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleNode.h" diff --git a/libaurum/inc/Accessibility/AccessibleApplication.h b/libaurum/inc/Accessibility/AccessibleApplication.h index 5daa948..8021120 100644 --- a/libaurum/inc/Accessibility/AccessibleApplication.h +++ b/libaurum/inc/Accessibility/AccessibleApplication.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleWindow.h" diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index 81fb1c4..8bf51f8 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index c01654b..1a24025 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleApplication.h" diff --git a/libaurum/inc/Accessibility/AccessibleWindow.h b/libaurum/inc/Accessibility/AccessibleWindow.h index 9720557..92fb549 100644 --- a/libaurum/inc/Accessibility/AccessibleWindow.h +++ b/libaurum/inc/Accessibility/AccessibleWindow.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleNode.h" diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index 5240ecc..0af4ba4 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once enum class EventType { diff --git a/libaurum/inc/Accessibility/IEventSource.h b/libaurum/inc/Accessibility/IEventSource.h index 7d976c3..367a276 100644 --- a/libaurum/inc/Accessibility/IEventSource.h +++ b/libaurum/inc/Accessibility/IEventSource.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "IEventConsumer.h" diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h index afa5568..4a4e116 100644 --- a/libaurum/inc/Aurum.h +++ b/libaurum/inc/Aurum.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index 5ca1029..3792af6 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h index 413945a..49d59ad 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleApplication.h" diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index 7e08fea..23ee797 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleNode.h" diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index a089e4c..e9f0442 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleNode.h" diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h index 2613b28..4802a8d 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleWindow.h" diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index 0bd3b02..2b5739f 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h index f66a4d5..92e42e0 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleApplication.h" diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h index 0256798..9823d33 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleNode.h" diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index 5721722..cef48bf 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleNode.h" diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h index b31491d..dc0695b 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "AccessibleWindow.h" diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index 9c0968c..1e10b6a 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index 8245332..cac7a13 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index 8affc50..159ad5a 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h index d90bd30..b5437f8 100644 --- a/libaurum/inc/Interface/ISearchable.h +++ b/libaurum/inc/Interface/ISearchable.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/Misc/Point2D.h b/libaurum/inc/Misc/Point2D.h index 08a61d0..3d40ac9 100644 --- a/libaurum/inc/Misc/Point2D.h +++ b/libaurum/inc/Misc/Point2D.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once /** diff --git a/libaurum/inc/Misc/Rect.h b/libaurum/inc/Misc/Rect.h index 3976688..de6fb0f 100644 --- a/libaurum/inc/Misc/Rect.h +++ b/libaurum/inc/Misc/Rect.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "Point2D.h" diff --git a/libaurum/inc/Misc/Size2D.h b/libaurum/inc/Misc/Size2D.h index 746f47f..c48a751 100644 --- a/libaurum/inc/Misc/Size2D.h +++ b/libaurum/inc/Misc/Size2D.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once /** diff --git a/libaurum/inc/Misc/bitmask.h b/libaurum/inc/Misc/bitmask.h index 865d025..cbbc237 100644 --- a/libaurum/inc/Misc/bitmask.h +++ b/libaurum/inc/Misc/bitmask.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/libaurum/inc/PartialMatch.h b/libaurum/inc/PartialMatch.h index c06c3ad..56de3fc 100644 --- a/libaurum/inc/PartialMatch.h +++ b/libaurum/inc/PartialMatch.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/libaurum/inc/Runnable/Runnable.h b/libaurum/inc/Runnable/Runnable.h index 354c90f..7e2c146 100644 --- a/libaurum/inc/Runnable/Runnable.h +++ b/libaurum/inc/Runnable/Runnable.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once class Runnable diff --git a/libaurum/inc/Runnable/Runnables.h b/libaurum/inc/Runnable/Runnables.h index 1428466..1282d53 100644 --- a/libaurum/inc/Runnable/Runnables.h +++ b/libaurum/inc/Runnable/Runnables.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "SendKeyRunnable.h" diff --git a/libaurum/inc/Runnable/SendKeyRunnable.h b/libaurum/inc/Runnable/SendKeyRunnable.h index 57cf886..43081ac 100644 --- a/libaurum/inc/Runnable/SendKeyRunnable.h +++ b/libaurum/inc/Runnable/SendKeyRunnable.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/libaurum/inc/Sel.h b/libaurum/inc/Sel.h index e06dbc5..f375f77 100644 --- a/libaurum/inc/Sel.h +++ b/libaurum/inc/Sel.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index 132f4cb..2dfc31c 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index e1561d8..770b090 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/UiScrollable.h b/libaurum/inc/UiScrollable.h index d60e51e..3bca05c 100644 --- a/libaurum/inc/UiScrollable.h +++ b/libaurum/inc/UiScrollable.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "UiObject.h" diff --git a/libaurum/inc/UiSelector.h b/libaurum/inc/UiSelector.h index b9729be..90304ad 100644 --- a/libaurum/inc/UiSelector.h +++ b/libaurum/inc/UiSelector.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "config.h" diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index 9218a3d..0377d2f 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "ISearchable.h" diff --git a/libaurum/src/A11yEvent.cc b/libaurum/src/A11yEvent.cc index d4d0bed..b9f205b 100644 --- a/libaurum/src/A11yEvent.cc +++ b/libaurum/src/A11yEvent.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include diff --git a/libaurum/src/Accessibility/AccessibleApplication.cc b/libaurum/src/Accessibility/AccessibleApplication.cc index fdbb013..127e995 100644 --- a/libaurum/src/Accessibility/AccessibleApplication.cc +++ b/libaurum/src/Accessibility/AccessibleApplication.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc index 73c0cdd..5bd1a4f 100644 --- a/libaurum/src/Accessibility/AccessibleNode.cc +++ b/libaurum/src/Accessibility/AccessibleNode.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include diff --git a/libaurum/src/Accessibility/AccessibleWatcher.cc b/libaurum/src/Accessibility/AccessibleWatcher.cc index b41044b..77b571f 100644 --- a/libaurum/src/Accessibility/AccessibleWatcher.cc +++ b/libaurum/src/Accessibility/AccessibleWatcher.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #ifdef TIZEN diff --git a/libaurum/src/Accessibility/AccessibleWindow.cc b/libaurum/src/Accessibility/AccessibleWindow.cc index 2818edb..ea2315c 100644 --- a/libaurum/src/Accessibility/AccessibleWindow.cc +++ b/libaurum/src/Accessibility/AccessibleWindow.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" AccessibleWindow::AccessibleWindow(std::shared_ptr app, std::shared_ptr node) diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc index e12223e..dd96f10 100644 --- a/libaurum/src/Comparer.cc +++ b/libaurum/src/Comparer.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" Comparer::Comparer(const std::shared_ptr device, const std::shared_ptr selector, diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc index c458fa0..4cd1327 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "AtspiAccessibleApplication.h" #include "AtspiAccessibleWindow.h" #include "AtspiWrapper.h" diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc index 1c9b032..6a0575d 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include "AtspiAccessibleNode.h" diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index 4d8c6d6..9a6441e 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include "AtspiAccessibleWatcher.h" diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc index 247ea0d..6968cae 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "AtspiAccessibleWindow.h" #include "AtspiWrapper.h" diff --git a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc index 109d0cc..fdf6e26 100644 --- a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc +++ b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "AtspiWrapper.h" std::recursive_mutex AtspiWrapper::mMutex = std::recursive_mutex{}; diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc b/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc index ed89a5a..e01ee5c 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "MockAccessibleApplication.h" #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc index a4a3951..795c8e7 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "MockAccessibleNode.h" #include "AccessibleWatcher.h" diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc index 75f4048..05fec2f 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "MockAccessibleWatcher.h" #include "MockAccessibleWindow.h" #include "MockAccessibleApplication.h" diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc b/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc index 8059fc0..9941ac4 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "MockAccessibleWindow.h" #include "MockAccessibleApplication.h" #include "MockAccessibleNode.h" diff --git a/libaurum/src/Impl/MockDeviceImpl.cc b/libaurum/src/Impl/MockDeviceImpl.cc index 8a4ce23..e05ceee 100644 --- a/libaurum/src/Impl/MockDeviceImpl.cc +++ b/libaurum/src/Impl/MockDeviceImpl.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include "MockDeviceImpl.h" diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index d966fc0..a5ffd01 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include "TizenDeviceImpl.h" diff --git a/libaurum/src/PartialMatch.cc b/libaurum/src/PartialMatch.cc index 8edd3f6..c8be7da 100644 --- a/libaurum/src/PartialMatch.cc +++ b/libaurum/src/PartialMatch.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include diff --git a/libaurum/src/Runnable/SendKeyRunnable.cc b/libaurum/src/Runnable/SendKeyRunnable.cc index 61d3138..3044426 100644 --- a/libaurum/src/Runnable/SendKeyRunnable.cc +++ b/libaurum/src/Runnable/SendKeyRunnable.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" SendKeyRunnable::SendKeyRunnable(std::string keycode) diff --git a/libaurum/src/Sel.cc b/libaurum/src/Sel.cc index bf92244..34ada90 100644 --- a/libaurum/src/Sel.cc +++ b/libaurum/src/Sel.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include diff --git a/libaurum/src/UiDevice.cc b/libaurum/src/UiDevice.cc index 644d580..5643f3a 100644 --- a/libaurum/src/UiDevice.cc +++ b/libaurum/src/UiDevice.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #ifdef TIZEN diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index 2d4bda4..101f90f 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include diff --git a/libaurum/src/UiScrollable.cc b/libaurum/src/UiScrollable.cc index cae156d..9a2eb57 100644 --- a/libaurum/src/UiScrollable.cc +++ b/libaurum/src/UiScrollable.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" UiScrollable::UiScrollable(std::shared_ptr selector) diff --git a/libaurum/src/UiSelector.cc b/libaurum/src/UiSelector.cc index ae83625..70770b2 100644 --- a/libaurum/src/UiSelector.cc +++ b/libaurum/src/UiSelector.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include #include diff --git a/libaurum/src/Until.cc b/libaurum/src/Until.cc index 8fb8d85..c6951c5 100644 --- a/libaurum/src/Until.cc +++ b/libaurum/src/Until.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" std::function Until::hasObject( diff --git a/libaurum/src/Waiter.cc b/libaurum/src/Waiter.cc index 1990895..6b852d0 100644 --- a/libaurum/src/Waiter.cc +++ b/libaurum/src/Waiter.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include #include diff --git a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h index cbd4145..fadb148 100644 --- a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h +++ b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h index 21fc670..43ff82b 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h index 9d62d34..15e4f5a 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h index a3074ce..fffee04 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/Command.h b/org.tizen.aurum-bootstrap/inc/Commands/Command.h index 544c6fc..8aa2c97 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/Command.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/Command.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/Commands.h b/org.tizen.aurum-bootstrap/inc/Commands/Commands.h index 20a0dd8..1b465f6 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/Commands.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/Commands.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include "Commands/KillServerCommand.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h index e09bd7d..7856f4c 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h index 202ede2..1e76247 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h index ac3f177..9537e15 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h index 4e94c54..539ba5a 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h index 749156b..d9db9ed 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h index d261d2c..ffa85ab 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h index e153a43..c9e0263 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h index ad2a528..82a86c7 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h index 22ab0db..3f6874d 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h index 1c2e6b2..14fed9e 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h index 50ff081..2e807d1 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h index c994bf2..915df93 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h index 38e4a09..dc335c8 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h index 54ff0e2..534cd3a 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h index e2142de..6d99a35 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h index 4351629..6ec9909 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h index 4efb6d9..19e465d 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h index 7a37943..2ed3f3c 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h index d67c889..ab7fb3d 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h index b9c6b84..24dac7e 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h index b8f6e01..efe6eee 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h index 9210b31..3e255f4 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h index 7a1b33f..7342e77 100644 --- a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h +++ b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h b/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h index 528467f..b924474 100644 --- a/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h +++ b/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/inc/bootstrap.h b/org.tizen.aurum-bootstrap/inc/bootstrap.h index 6a4545b..46665e5 100644 --- a/org.tizen.aurum-bootstrap/inc/bootstrap.h +++ b/org.tizen.aurum-bootstrap/inc/bootstrap.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #pragma once #include diff --git a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc index 586bac5..51b0863 100644 --- a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc +++ b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "AurumServiceImpl.h" #include diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc index 28b144a..22b397c 100644 --- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc +++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include #include #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc index 2f77bb9..afec1b6 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "ClearCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc index cc7a30e..d5181f6 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "ClickCommand.h" #include "UiObject.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc index d1863d2..61f096e 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "CloseAppCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/Command.cc b/org.tizen.aurum-bootstrap/src/Commands/Command.cc index 8988bf7..efcc880 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/Command.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/Command.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Command.h" ::grpc::Status Command::executePost() diff --git a/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc index 52e74c0..f455f89 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "DumpObjectTreeCommand.h" #include "UiObject.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc index b317714..34606f2 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "FindElementCommand.h" #include "UiObject.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc index 14fcf66..1d2c0d8 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "FlickCommand.h" #include "UiDevice.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc index 4e155bb..420ff7a 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "GetAppInfoCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc index 65e1446..1afc58e 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "GetAttributeCommand.h" #include "UiObject.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc index 11b05e3..bf8e735 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "GetDeviceTimeCommand.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc index 303d763..bd38555 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "GetLocationCommand.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc index 68e97a6..dfada9c 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "GetSizeCommand.h" #include "UiObject.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc index 0faf103..0b4f257 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "GetValueCommand.h" #include "UiObject.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc index 9e1b0b2..3f9d5da 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "InstallAppCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc index c14297a..11aca7c 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "KillServerCommand.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc index 1d138d4..8f85d5b 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "LaunchAppCommand.h" #include "LaunchAppRunnable.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc index 3312c70..8830c43 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "LongClickCommand.h" #include "UiObject.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc index f9b39f0..302d360 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "PostCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc index 60142c6..e699b46 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "PreCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc index 3fe4c37..bc634dc 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "RemoveAppCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc index b2ba222..135f263 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "SendKeyCommand.h" #include "UiDevice.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc index 77ace73..1204eca 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "SetValueCommand.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc index a34b352..b9e5c0a 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "TakeScreenshotCommand.h" #include diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc index fa42062..02e4fe6 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "TouchDownCommand.h" #include "UiDevice.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc index 951e4de..a7389b0 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "TouchMoveCommand.h" #include "UiDevice.h" diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc index 432e972..a87c6c3 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "bootstrap.h" #include "TouchUpCommand.h" #include "UiDevice.h" diff --git a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc index 863297d..4f44032 100644 --- a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc +++ b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "ObjectMapper.h" #include #include "bootstrap.h" diff --git a/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc b/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc index b842b8d..1fc173d 100644 --- a/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc +++ b/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + #include "Aurum.h" #include "bootstrap.h" #include "LaunchAppCommand.h" -- 2.7.4 From 4eba9b40fa71a80676286e6e083af95d7d218dc5 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 15 Oct 2021 10:25:26 +0900 Subject: [PATCH 07/16] aurum: Change #pragma once to include guards pragma once works well but it may not work on older compiler. I changed it for stability and versatility. Change-Id: I6d44fb970a47345516106cc4dcf698d98de1be94 --- libaurum/inc/A11yEvent.h | 24 ++++++++++++---------- libaurum/inc/Accessibility/Accessible.h | 5 ++++- libaurum/inc/Accessibility/AccessibleApplication.h | 4 +++- libaurum/inc/Accessibility/AccessibleNode.h | 5 ++++- libaurum/inc/Accessibility/AccessibleWatcher.h | 5 ++++- libaurum/inc/Accessibility/AccessibleWindow.h | 7 +++++-- libaurum/inc/Accessibility/IEventConsumer.h | 5 ++++- libaurum/inc/Accessibility/IEventSource.h | 5 ++++- libaurum/inc/Aurum.h | 5 ++++- libaurum/inc/Comparer.h | 7 +++++-- .../Accessibility/AtspiAccessibleApplication.h | 7 +++++-- .../inc/Impl/Accessibility/AtspiAccessibleNode.h | 5 ++++- .../Impl/Accessibility/AtspiAccessibleWatcher.h | 5 ++++- .../inc/Impl/Accessibility/AtspiAccessibleWindow.h | 7 +++++-- libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 5 ++++- .../Impl/Accessibility/MockAccessibleApplication.h | 7 +++++-- .../inc/Impl/Accessibility/MockAccessibleNode.h | 5 ++++- .../inc/Impl/Accessibility/MockAccessibleWatcher.h | 5 ++++- .../inc/Impl/Accessibility/MockAccessibleWindow.h | 7 +++++-- libaurum/inc/Impl/MockDeviceImpl.h | 7 +++++-- libaurum/inc/Impl/TizenDeviceImpl.h | 7 +++++-- libaurum/inc/Interface/IDevice.h | 7 +++++-- libaurum/inc/Interface/ISearchable.h | 7 +++++-- libaurum/inc/Misc/Point2D.h | 5 ++++- libaurum/inc/Misc/Rect.h | 5 ++++- libaurum/inc/Misc/Size2D.h | 5 ++++- libaurum/inc/Misc/bitmask.h | 4 +++- libaurum/inc/PartialMatch.h | 7 +++++-- libaurum/inc/Runnable/Runnable.h | 8 +++++--- libaurum/inc/Runnable/Runnables.h | 5 ++++- libaurum/inc/Runnable/SendKeyRunnable.h | 7 +++++-- libaurum/inc/Sel.h | 8 ++++++-- libaurum/inc/UiDevice.h | 5 ++++- libaurum/inc/UiObject.h | 5 ++++- libaurum/inc/UiScrollable.h | 7 +++++-- libaurum/inc/UiSelector.h | 7 +++++-- libaurum/inc/Until.h | 24 ++++++++++++++++++++-- libaurum/inc/Waiter.h | 7 +++++-- org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h | 5 ++++- .../inc/Commands/ClearCommand.h | 2 -- .../inc/Commands/ClickCommand.h | 3 +-- .../inc/Commands/CloseAppCommand.h | 2 -- org.tizen.aurum-bootstrap/inc/Commands/Command.h | 5 ++++- org.tizen.aurum-bootstrap/inc/Commands/Commands.h | 2 -- .../inc/Commands/DumpObjectTreeCommand.h | 1 - .../inc/Commands/FindElementCommand.h | 2 -- .../inc/Commands/FlickCommand.h | 2 -- .../inc/Commands/GetAppInfoCommand.h | 2 -- .../inc/Commands/GetAttributeCommand.h | 2 -- .../inc/Commands/GetDeviceTimeCommand.h | 2 -- .../inc/Commands/GetLocationCommand.h | 2 -- .../inc/Commands/GetSizeCommand.h | 2 -- .../inc/Commands/GetValueCommand.h | 2 -- .../inc/Commands/InstallAppCommand.h | 2 -- .../inc/Commands/KillServerCommand.h | 2 -- .../inc/Commands/LaunchAppCommand.h | 2 -- .../inc/Commands/LongClickCommand.h | 2 -- .../inc/Commands/PostCommand.h | 2 -- .../inc/Commands/PreCommand.h | 2 -- .../inc/Commands/RemoveAppCommand.h | 2 -- .../inc/Commands/SendKeyCommand.h | 2 -- .../inc/Commands/SetValueCommand.h | 2 -- .../inc/Commands/TakeScreenshotCommand.h | 2 -- .../inc/Commands/TouchDownCommand.h | 2 -- .../inc/Commands/TouchMoveCommand.h | 2 -- .../inc/Commands/TouchUpCommand.h | 2 -- org.tizen.aurum-bootstrap/inc/ObjectMapper.h | 5 ++++- .../inc/Runnable/LaunchAppRunnable.h | 2 -- org.tizen.aurum-bootstrap/inc/bootstrap.h | 5 ++++- 69 files changed, 212 insertions(+), 124 deletions(-) diff --git a/libaurum/inc/A11yEvent.h b/libaurum/inc/A11yEvent.h index 02c0d5e..3ed5d07 100644 --- a/libaurum/inc/A11yEvent.h +++ b/libaurum/inc/A11yEvent.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _A11Y_EVENT_H_ +#define _A11Y_EVENT_H_ #include "bitmask.h" #include @@ -48,19 +49,20 @@ enableEnumClassBitfield(A11yEvent); class A11yEventInfo { public: - A11yEventInfo(); - A11yEventInfo(A11yEvent event, std::string name = "", std::string pkg = ""); - A11yEventInfo(std::string event, std::string name = "", std::string pkg = ""); - ~A11yEventInfo(); + A11yEventInfo(); + A11yEventInfo(A11yEvent event, std::string name = "", std::string pkg = ""); + A11yEventInfo(std::string event, std::string name = "", std::string pkg = ""); + ~A11yEventInfo(); public: - A11yEvent getEvent(); + A11yEvent getEvent(); A11yEvent getEvent(std::string event); - std::string getName(); - std::string getPkg(); + std::string getName(); + std::string getPkg(); protected: - const A11yEvent mEvent; - const std::string mName; - const std::string mPkg; + const A11yEvent mEvent; + const std::string mName; + const std::string mPkg; }; +#endif diff --git a/libaurum/inc/Accessibility/Accessible.h b/libaurum/inc/Accessibility/Accessible.h index f17b85f..2d2c456 100644 --- a/libaurum/inc/Accessibility/Accessible.h +++ b/libaurum/inc/Accessibility/Accessible.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ACCESSIBLE_H_ +#define _ACCESSIBLE_H_ #include "AccessibleNode.h" #include "AccessibleWatcher.h" @@ -23,3 +24,5 @@ #include "AccessibleWindow.h" #include "IEventConsumer.h" #include "IEventSource.h" + +#endif diff --git a/libaurum/inc/Accessibility/AccessibleApplication.h b/libaurum/inc/Accessibility/AccessibleApplication.h index 8021120..9701b30 100644 --- a/libaurum/inc/Accessibility/AccessibleApplication.h +++ b/libaurum/inc/Accessibility/AccessibleApplication.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ACCESSIBLE_APPLICATION_H_ +#define _ACCESSIBLE_APPLICATION_H_ #include "AccessibleWindow.h" #include "AccessibleNode.h" @@ -40,3 +41,4 @@ private: std::shared_ptr mNode; }; +#endif diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index 8bf51f8..cf80129 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ACCESSIBLE_NODE_H_ +#define _ACCESSIBLE_NODE_H_ #include #include @@ -450,3 +451,5 @@ private: */ mutable std::mutex mLock; }; + +#endif \ No newline at end of file diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index 1a24025..6c77556 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ACCESSIBLE_WATCHER_H_ +#define _ACCESSIBLE_WATCHER_H_ #include "AccessibleApplication.h" #include "AccessibleWindow.h" @@ -123,3 +124,5 @@ private: */ std::mutex mLock; }; + +#endif \ No newline at end of file diff --git a/libaurum/inc/Accessibility/AccessibleWindow.h b/libaurum/inc/Accessibility/AccessibleWindow.h index 92fb549..751a774 100644 --- a/libaurum/inc/Accessibility/AccessibleWindow.h +++ b/libaurum/inc/Accessibility/AccessibleWindow.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ACCESSIBLE_WINDOW_H_ +#define _ACCESSIBLE_WINDOW_H_ #include "AccessibleNode.h" @@ -79,4 +80,6 @@ private: * @brief TBD */ std::shared_ptr mNode; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index 0af4ba4..fe4b7d8 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _IEVENT_CONSUMER_H_ +#define _IEVENT_CONSUMER_H_ enum class EventType { none = 0, @@ -33,3 +34,5 @@ public: virtual ~IEventConsumer() {}; virtual void notify(int type, int type2, void *src) = 0; }; + +#endif diff --git a/libaurum/inc/Accessibility/IEventSource.h b/libaurum/inc/Accessibility/IEventSource.h index 367a276..cdb2196 100644 --- a/libaurum/inc/Accessibility/IEventSource.h +++ b/libaurum/inc/Accessibility/IEventSource.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _IEVENT_SOURCE_H_ +#define _IEVENT_SOURCE_H_ #include "IEventConsumer.h" #include @@ -28,3 +29,5 @@ public: virtual void detach(std::shared_ptr source) = 0; virtual void notifyAll(int type, int type2, void *src) = 0; }; + +#endif diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h index 4a4e116..52bb8b2 100644 --- a/libaurum/inc/Aurum.h +++ b/libaurum/inc/Aurum.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _AURUM_H_ +#define _AURUM_H_ #include @@ -59,3 +60,5 @@ #include "Comparer.h" #include "A11yEvent.h" #include "Runnables.h" + +#endif diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index 3792af6..fe93d4d 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _COMPARER_H_ +#define _COMPARER_H_ #include "config.h" @@ -95,4 +96,6 @@ private: * @brief TBD */ bool mEarlyReturn; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h index 49d59ad..626abb9 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ATSPI_ACCESSIBLE_APPLICATION_H_ +#define _ATSPI_ACCESSIBLE_APPLICATION_H_ #include "AccessibleApplication.h" @@ -48,4 +49,6 @@ public: * @since_tizen 6.0 */ std::string getPackageName(void) override; -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index 23ee797..2f3da1d 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ATSPI_ACCESSIBLE_NODE_H_ +#define _ATSPI_ACCESSIBLE_NODE_H_ #include "AccessibleNode.h" #include @@ -153,3 +154,5 @@ private: */ AtspiAccessible *mNode; }; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index e9f0442..e53dc38 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ATSPI_ACCESSIBLE_WATCHER_H_ +#define _ATSPI_ACCESSIBLE_WATCHER_H_ #include "AccessibleNode.h" #include "AccessibleWatcher.h" @@ -193,3 +194,5 @@ private: static std::mutex mMutex; }; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h index 4802a8d..a303bc0 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ATSPI_ACCESSIBLE_WINDOW_H_ +#define _ATSPI_ACCESSIBLE_WINDOW_H_ #include "AccessibleWindow.h" @@ -33,4 +34,6 @@ public: */ ~AtspiAccessibleWindow(); -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index 2b5739f..9ff87f6 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ATSPI_WRAPPER_H_ +#define _ATSPI_WRAPPER_H_ #include #include @@ -50,3 +51,5 @@ private: static std::recursive_mutex mMutex; //static std::unique_lock mLock; }; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h index 92e42e0..c2e03e8 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _MOCK_ACCESSIBLE_APPLICATION_H_ +#define _MOCK_ACCESSIBLE_APPLICATION_H_ #include "AccessibleApplication.h" #include "MockAccessibleWindow.h" @@ -80,4 +81,6 @@ private: * @brief TBD */ std::vector> mWindowList; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h index 9823d33..67cde40 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _MOCK_ACCESSIBLE_NODE_H_ +#define _MOCK_ACCESSIBLE_NODE_H_ #include "AccessibleNode.h" @@ -200,3 +201,5 @@ private: */ std::mutex mLock; }; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index cef48bf..18dd60d 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _MOCK_ACCESSIBLE_WATCHER_H_ +#define _MOCK_ACCESSIBLE_WATCHER_H_ #include "AccessibleNode.h" #include "AccessibleWatcher.h" @@ -89,3 +90,5 @@ private: std::map> mActiveAppMap; }; + +#endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h index dc0695b..a978089 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _MOCK_ACCESSIBLE_WINDOW_H_ +#define _MOCK_ACCESSIBLE_WINDOW_H_ #include "AccessibleWindow.h" #include "MockAccessibleNode.h" @@ -48,4 +49,6 @@ private: * @brief TBD */ std::shared_ptr mMockNode; -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index 1e10b6a..93705c1 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _MOCK_DEVICE_IMPL_H_ +#define _MOCK_DEVICE_IMPL_H_ #include "config.h" #include "IDevice.h" @@ -291,4 +292,6 @@ public: * @brief TBD */ Size2D mScreenSize; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index cac7a13..0bcbff9 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _TIZEN_DEVICE_IMPL_H_ +#define _TIZEN_DEVICE_IMPL_H_ #include "config.h" #include "IDevice.h" @@ -195,4 +196,6 @@ private: * @brief TBD */ Size2D mScreenSize; -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index 159ad5a..cef931c 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _IDEVICE_H_ +#define _IDEVICE_H_ #include "config.h" #include "Rect.h" @@ -274,4 +275,6 @@ public: * @since_tizen 6.5 */ virtual const Size2D getScreenSize() = 0; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h index b5437f8..04df60f 100644 --- a/libaurum/inc/Interface/ISearchable.h +++ b/libaurum/inc/Interface/ISearchable.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _ISEARCHABLE_H_ +#define _ISEARCHABLE_H_ #include "config.h" @@ -57,4 +58,6 @@ public: */ virtual std::vector> findObjects( const std::shared_ptr selector) const = 0; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Misc/Point2D.h b/libaurum/inc/Misc/Point2D.h index 3d40ac9..ee4f18a 100644 --- a/libaurum/inc/Misc/Point2D.h +++ b/libaurum/inc/Misc/Point2D.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _POINT2D_H_ +#define _POINT2D_H_ /** * @brief Point2d Class @@ -78,3 +79,5 @@ public: */ T y; }; + +#endif diff --git a/libaurum/inc/Misc/Rect.h b/libaurum/inc/Misc/Rect.h index de6fb0f..590206b 100644 --- a/libaurum/inc/Misc/Rect.h +++ b/libaurum/inc/Misc/Rect.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _RECT_H_ +#define _RECT_H_ #include "Point2D.h" @@ -110,3 +111,5 @@ public: */ Point2D mBottomRight; }; + +#endif diff --git a/libaurum/inc/Misc/Size2D.h b/libaurum/inc/Misc/Size2D.h index c48a751..c8e1459 100644 --- a/libaurum/inc/Misc/Size2D.h +++ b/libaurum/inc/Misc/Size2D.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _SIZE2D_H_ +#define _SIZE2D_H_ /** * @brief Size2D Class. @@ -78,3 +79,5 @@ public: T width; T height; }; + +#endif diff --git a/libaurum/inc/Misc/bitmask.h b/libaurum/inc/Misc/bitmask.h index cbbc237..bcbca84 100644 --- a/libaurum/inc/Misc/bitmask.h +++ b/libaurum/inc/Misc/bitmask.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _BITMASK_H_ +#define _BITMASK_H_ #include @@ -88,3 +89,4 @@ operator^=(E& lhs,E rhs){ return lhs; } +#endif diff --git a/libaurum/inc/PartialMatch.h b/libaurum/inc/PartialMatch.h index 56de3fc..28f430e 100644 --- a/libaurum/inc/PartialMatch.h +++ b/libaurum/inc/PartialMatch.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _PARTIAL_MATCH_H_ +#define _PARTIAL_MATCH_H_ #include #include @@ -118,4 +119,6 @@ private: * @brief TBD */ std::list> mPartialMatches; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Runnable/Runnable.h b/libaurum/inc/Runnable/Runnable.h index 7e2c146..5ecd0de 100644 --- a/libaurum/inc/Runnable/Runnable.h +++ b/libaurum/inc/Runnable/Runnable.h @@ -15,12 +15,14 @@ * */ -#pragma once +#ifndef _RUNNABLE_H_ +#define _RUNNABLE_H_ class Runnable { public: - virtual ~Runnable() { } - virtual void run() const = 0; + virtual ~Runnable() { } + virtual void run() const = 0; }; +#endif diff --git a/libaurum/inc/Runnable/Runnables.h b/libaurum/inc/Runnable/Runnables.h index 1282d53..29f9326 100644 --- a/libaurum/inc/Runnable/Runnables.h +++ b/libaurum/inc/Runnable/Runnables.h @@ -15,6 +15,9 @@ * */ -#pragma once +#ifndef _RUNNABLES_H_ +#define _RUNNABLES_H_ #include "SendKeyRunnable.h" + +#endif diff --git a/libaurum/inc/Runnable/SendKeyRunnable.h b/libaurum/inc/Runnable/SendKeyRunnable.h index 43081ac..4fcd77c 100644 --- a/libaurum/inc/Runnable/SendKeyRunnable.h +++ b/libaurum/inc/Runnable/SendKeyRunnable.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _SEND_KEY_RUNNABLE_H_ +#define _SEND_KEY_RUNNABLE_H_ #include @@ -23,9 +24,11 @@ class SendKeyRunnable : public Runnable { protected: - std::string mKeycode; + std::string mKeycode; public: SendKeyRunnable(std::string keycode); void run() const override; }; + +#endif diff --git a/libaurum/inc/Sel.h b/libaurum/inc/Sel.h index f375f77..0338b38 100644 --- a/libaurum/inc/Sel.h +++ b/libaurum/inc/Sel.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _SEL_H_ +#define _SEL_H_ #include "config.h" @@ -23,6 +24,7 @@ #include #include "UiSelector.h" + /** * @brief Sel class * @since_tizen 5.5 @@ -52,4 +54,6 @@ public: * @since_tizen 5.5 */ static std::shared_ptr depth(int depth); -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index 2dfc31c..9b91475 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _UI_DEVICE_H_ +#define _UI_DEVICE_H_ #include "config.h" @@ -401,3 +402,5 @@ private: IDevice *mDeviceImpl; const Waiter *mWaiter; }; + +#endif diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index 770b090..5699b7d 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _UI_OBJECT_H_ +#define _UI_OBJECT_H_ #include "config.h" @@ -397,3 +398,5 @@ private: */ static const unsigned int LOGNCLICK_INTERVAL = 500; }; + +#endif diff --git a/libaurum/inc/UiScrollable.h b/libaurum/inc/UiScrollable.h index 3bca05c..090e746 100644 --- a/libaurum/inc/UiScrollable.h +++ b/libaurum/inc/UiScrollable.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _UI_SCROLLABLE_H_ +#define _UI_SCROLLABLE_H_ #include "UiObject.h" #include @@ -93,4 +94,6 @@ private: * @brief TBD */ int mScrollStep; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/UiSelector.h b/libaurum/inc/UiSelector.h index 90304ad..227feb8 100644 --- a/libaurum/inc/UiSelector.h +++ b/libaurum/inc/UiSelector.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _UI_SELECTOR_H_ +#define _UI_SELECTOR_H_ #include "config.h" @@ -380,4 +381,6 @@ public: * @since_tizen 5.5 */ std::shared_ptr mParent; -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Until.h b/libaurum/inc/Until.h index bc06896..eddef7b 100644 --- a/libaurum/inc/Until.h +++ b/libaurum/inc/Until.h @@ -1,4 +1,22 @@ -#pragma once +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + +#ifndef _UTIL_H_ +#define _UTIL_H_ #include #include "ISearchable.h" @@ -61,4 +79,6 @@ public: */ static std::function checkable( const bool isCheckable); -}; \ No newline at end of file +}; + +#endif diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index 0377d2f..82a9e4a 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _WAITER_H_ +#define _WAITER_H_ #include "ISearchable.h" @@ -85,4 +86,6 @@ private: * @since_tizen 5.5 */ const int WAIT_TIMEOUT_MS; -}; \ No newline at end of file +}; + +#endif diff --git a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h index fadb148..e7d348a 100644 --- a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h +++ b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _AURUM_SERVICE_IMPL_H_ +#define _AURUM_SERVICE_IMPL_H_ #include #include "Commands/Command.h" @@ -107,3 +108,5 @@ public: const ::aurum::ReqDumpObjectTree *request, ::aurum::RspDumpObjectTree *response) override; }; + +#endif diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h index 43ff82b..cef1deb 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h index 15e4f5a..8f7a465 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h @@ -15,14 +15,13 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" #include "ObjectMapper.h" #include #include "config.h" + class ClickCommand : public Command { protected: const ::aurum::ReqClick *mRequest; diff --git a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h index fffee04..5222364 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/Command.h b/org.tizen.aurum-bootstrap/inc/Commands/Command.h index 8aa2c97..634edbe 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/Command.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/Command.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _COMMAND_H_ +#define _COMMAND_H_ #include #include @@ -31,3 +32,5 @@ public: virtual ::grpc::Status executePost(); virtual ::grpc::Status executePre(); }; + +#endif diff --git a/org.tizen.aurum-bootstrap/inc/Commands/Commands.h b/org.tizen.aurum-bootstrap/inc/Commands/Commands.h index 1b465f6..1311895 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/Commands.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/Commands.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include "Commands/KillServerCommand.h" #include "Commands/FindElementCommand.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h index 7856f4c..da5ec04 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h @@ -15,7 +15,6 @@ * */ -#pragma once #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h index 1e76247..1e2f3f0 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h index 9537e15..e4ea276 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h index 539ba5a..b62cb20 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h index d9db9ed..94ef0a9 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h index ffa85ab..9112f14 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h index c9e0263..ef21777 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h index 82a86c7..78fb8ca 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h index 3f6874d..50cb6b7 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h index 14fed9e..a241697 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h index 2e807d1..04032d4 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h index 915df93..c8f62f8 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h index dc335c8..2e1ccbf 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h index 534cd3a..2683a7b 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/PostCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h index 6d99a35..13eccee 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/PreCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h index 6ec9909..648f25a 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h index 19e465d..b7a9c86 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h index 2ed3f3c..4ab2a2e 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h index ab7fb3d..0355350 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h index 24dac7e..54bbebd 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h index efe6eee..c319ecd 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h index 3e255f4..8d2bf08 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include #include "Commands/Command.h" diff --git a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h index 7342e77..8326266 100644 --- a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h +++ b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _OBJECT_MAPPER_H_ +#define _OBJECT_MAPPER_H_ #include #include @@ -40,3 +41,5 @@ public: bool removeElement(const std::string elementId); void cleanUp(); }; + +#endif diff --git a/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h b/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h index b924474..b951681 100644 --- a/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h +++ b/org.tizen.aurum-bootstrap/inc/Runnable/LaunchAppRunnable.h @@ -15,8 +15,6 @@ * */ -#pragma once - #include #include "Runnable.h" diff --git a/org.tizen.aurum-bootstrap/inc/bootstrap.h b/org.tizen.aurum-bootstrap/inc/bootstrap.h index 46665e5..c5b9bc5 100644 --- a/org.tizen.aurum-bootstrap/inc/bootstrap.h +++ b/org.tizen.aurum-bootstrap/inc/bootstrap.h @@ -15,7 +15,8 @@ * */ -#pragma once +#ifndef _BOOT_STRAP_H_ +#define _BOOT_STRAP_H_ #include @@ -42,3 +43,5 @@ __FILE__, __func__, __LINE__, ##arg); \ } while (0); }) #endif + +#endif -- 2.7.4 From e0bfcd93abe7ec49a8eed45768d41cb1d71f3672 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Mon, 25 Oct 2021 20:22:15 +0900 Subject: [PATCH 08/16] libaurum: Fix doc for Device class Change-Id: I6c6fce04f2eeeb3cc89e022fd9f2d5da311e2e6a --- libaurum/inc/Interface/IDevice.h | 70 +++++++++++++++--------------- libaurum/inc/UiDevice.h | 92 ++++++++++++++++++++-------------------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index cef931c..85b213e 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -63,8 +63,8 @@ public: /** * @brief Performs a click at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate + * @param[in] x x coordinate + * @param[in] y y coordinate * * @return true if the click succeeded else false * @@ -75,9 +75,9 @@ public: /** * @brief Performs a click at arbitrary coordinates specified by the user during the specified time. * - * @param x x coordinate - * @param y y coordinate - * @param durationMs total time to maintain down action + * @param[in] x x coordinate + * @param[in] y y coordinate + * @param[in] durationMs total time to maintain down action * * @return true if the click succeeded else false * @@ -89,12 +89,12 @@ public: * @brief Performs a drag from one coordinate to another using the number of steps * during the specified time. * - * @param sx start x coordinate - * @param sy start y coordinate - * @param ex end x coordinate - * @param ey end y coordinate - * @param steps the number of move steps - * @param durationMs total time to drag event + * @param[in] sx start x coordinate + * @param[in] sy start y coordinate + * @param[in] ex end x coordinate + * @param[in] ey end y coordinate + * @param[in] steps the number of move steps + * @param[in] durationMs total time to drag event * * @return true if the drag succeeded else false * @@ -106,8 +106,8 @@ public: /** * @brief Performs a touch down at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate + * @param[in] x x coordinate + * @param[in] y y coordinate * * @return touch event number * @@ -118,9 +118,9 @@ public: /** * @brief Performs a touch move at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate - * @param seq touch event number + * @param[in] x x coordinate + * @param[in] y y coordinate + * @param[in] seq touch event number * * @return true if the touch move succeeded else false * @@ -131,9 +131,9 @@ public: /** * @brief Performs a touch up at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate - * @param seq touch event number + * @param[in] x x coordinate + * @param[in] y y coordinate + * @param[in] seq touch event number * * @return true if the touch up succeeded else false * @@ -144,8 +144,8 @@ public: /** * @brief Performs a wheel up on device with event amount and duration. * - * @param amount the number of wheel up event sent - * @param durationMs total time to wheel up event + * @param[in] amount the number of wheel up event sent + * @param[in] durationMs total time to wheel up event * * @return true if the wheel up succeeded else false * @@ -156,8 +156,8 @@ public: /** * @brief Performs a wheel down on device with event amount and duration. * - * @param amount the number of wheel down event sent - * @param durationMs total time to wheel down event + * @param[in] amount the number of wheel down event sent + * @param[in] durationMs total time to wheel down event * * @return true if the wheel down succeeded else false * @@ -168,7 +168,7 @@ public: /** * @brief Simulates a press on the back key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press back succeeded else false * @@ -179,7 +179,7 @@ public: /** * @brief Simulates a press on the home key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press home succeeded else false * @@ -190,7 +190,7 @@ public: /** * @brief Simulates a press on the menu key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press menu succeeded else false * @@ -201,7 +201,7 @@ public: /** * @brief Simulates a press on the volume up key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press volume up succeeded else false * @@ -212,7 +212,7 @@ public: /** * @brief Simulates a press on the volume down key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press volume down succeeded else false * @@ -223,7 +223,7 @@ public: /** * @brief Simulates a press on the power key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press power succeeded else false * @@ -234,8 +234,8 @@ public: /** * @brief Simulates a press on the given keycode key. * - * @param keycode keycode - * @param type one of @KeyRequestType + * @param[in] keycode keycode + * @param[in] type one of @KeyRequestType * * @return true if the press keycode succeeded else false * @@ -246,9 +246,9 @@ public: /** * @brief Take a screenshot of current window and store it as image file. * - * @param path where the image file should be written to - * @param scale scale the screenshot down if needed; 1.0f for original size - * @param quality quality of the PNG compression; range: 0-100 + * @param[in] path where the image file should be written to + * @param[in] scale scale the screenshot down if needed; 1.0f for original size + * @param[in] quality quality of the PNG compression; range: 0-100 * * @return true if screen shot is created successfully, false otherwise * @@ -259,7 +259,7 @@ public: /** * @brief Gets device system time. * - * @param type one of @TimeRequestType + * @param[in] type one of @TimeRequestType * * @return utc time stamp * diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index 9b91475..dc40632 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -48,8 +48,8 @@ public: /** * @brief Performs a click at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate + * @param[in] x x coordinate + * @param[in] y y coordinate * * @return true if the click succeeded else false * @@ -60,9 +60,9 @@ public: /** * @brief Performs a click at arbitrary coordinates specified by the user during the specified time. * - * @param x x coordinate - * @param y y coordinate - * @param durationMs total time to maintain down action + * @param[in] x x coordinate + * @param[in] y y coordinate + * @param[in] durationMs total time to maintain down action * * @return true if the click succeeded else false * @@ -74,12 +74,12 @@ public: * @brief Performs a drag from one coordinate to another using the number of steps * during the specified time. * - * @param sx start x coordinate - * @param sy start y coordinate - * @param ex end x coordinate - * @param ey end y coordinate - * @param steps the number of move steps - * @param durationMs total time to drag event + * @param[in] sx start x coordinate + * @param[in] sy start y coordinate + * @param[in] ex end x coordinate + * @param[in] ey end y coordinate + * @param[in] steps the number of move steps + * @param[in] durationMs total time to drag event * * @return true if the drag succeeded else false * @@ -91,8 +91,8 @@ public: /** * @brief Performs a touch down at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate + * @param[in] x x coordinate + * @param[in] y y coordinate * * @return touch event number * @@ -103,9 +103,9 @@ public: /** * @brief Performs a touch move at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate - * @param seq touch event number + * @param[in] x x coordinate + * @param[in] y y coordinate + * @param[in] seq touch event number * * @return true if the touch move succeeded else false * @@ -116,9 +116,9 @@ public: /** * @brief Performs a touch up at arbitrary coordinates specified by the user. * - * @param x x coordinate - * @param y y coordinate - * @param seq touch event number + * @param[in] x x coordinate + * @param[in] y y coordinate + * @param[in] seq touch event number * * @return true if the touch up succeeded else false * @@ -129,8 +129,8 @@ public: /** * @brief Performs a wheel up on device with event amount and duration. * - * @param amount the number of wheel up event sent - * @param durationMs total time to wheel up event + * @param[in] amount the number of wheel up event sent + * @param[in] durationMs total time to wheel up event * * @return true if the wheel up succeeded else false * @@ -141,8 +141,8 @@ public: /** * @brief Performs a wheel down on device with event amount and duration. * - * @param amount the number of wheel down event sent - * @param durationMs total time to wheel down event + * @param[in] amount the number of wheel down event sent + * @param[in] durationMs total time to wheel down event * * @return true if the wheel down succeeded else false * @@ -153,7 +153,7 @@ public: /** * @brief Simulates a press on the back key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press back succeeded else false * @@ -164,7 +164,7 @@ public: /** * @brief Simulates a press on the home key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press home succeeded else false * @@ -175,7 +175,7 @@ public: /** * @brief Simulates a press on the menu key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press menu succeeded else false * @@ -186,7 +186,7 @@ public: /** * @brief Simulates a press on the volume up key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press volume up succeeded else false * @@ -197,7 +197,7 @@ public: /** * @brief Simulates a press on the volume down key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press volume down succeeded else false * @@ -208,7 +208,7 @@ public: /** * @brief Simulates a press on the power key. * - * @param type one of @KeyRequestType + * @param[in] type one of @KeyRequestType * * @return true if the press power succeeded else false * @@ -219,8 +219,8 @@ public: /** * @brief Simulates a press on the given keycode key. * - * @param keycode keycode - * @param type one of @KeyRequestType + * @param[in] keycode keycode + * @param[in] type one of @KeyRequestType * * @return true if the press keycode succeeded else false * @@ -231,9 +231,9 @@ public: /** * @brief Take a screenshot of current window and store it as image file. * - * @param path where the image file should be written to - * @param scale scale the screenshot down if needed; 1.0f for original size - * @param quality quality of the PNG compression; range: 0-100 + * @param[in] path where the image file should be written to + * @param[in] scale scale the screenshot down if needed; 1.0f for original size + * @param[in] quality quality of the PNG compression; range: 0-100 * * @return true if screen shot is created successfully, false otherwise * @@ -244,7 +244,7 @@ public: /** * @brief Gets device system time. * - * @param type one of @TimeRequestType + * @param[in] type one of @TimeRequestType * * @return utc time stamp * @@ -265,7 +265,7 @@ public: /** * @brief Checks that there is object that satisfied with the selector condition in the device. * - * @param selector @UiSelector + * @param[in] selector @UiSelector * * @return object exist or not * @@ -276,7 +276,7 @@ public: /** * @brief Finds that object that satisfied with the selector condition in the device. * - * @param selector @UiSelector + * @param[in] selector @UiSelector * * @return Found UiObject ptr * @@ -288,7 +288,7 @@ public: /** * @brief Finds that objects that satisfied with the selector condition in the device. * - * @param selector @UiSelector + * @param[in] selector @UiSelector * * @return Found UiObject ptr vector * @@ -313,8 +313,8 @@ public: /** * @brief Waits for a specific A11y Event for a some time by user set. * - * @param type one of @A11yEvent - * @param timeout time(millisecond) to wait event occur + * @param[in] type one of @A11yEvent + * @param[in] timeout time(millisecond) to wait event occur * * @return true if event happened in time, otherwise false * @@ -326,9 +326,9 @@ public: /** * @brief Sends key event and Wait for a specific A11y Event for a some time by user set. * - * @param keycode keycode - * @param type one of @A11yEvent - * @param timeout time(millisecond) to wait event occur + * @param[in] keycode keycode + * @param[in] type one of @A11yEvent + * @param[in] timeout time(millisecond) to wait event occur * * @return true if event happened in time, otherwise false * @@ -340,9 +340,9 @@ public: /** * @brief Runs command and Wait for a specific A11y Event for a some time by user set. * - * @param cmd @Runnable - * @param type one of @A11yEvent - * @param timeout time(millisecond) to wait event occur + * @param[in] cmd @Runnable + * @param[in] type one of @A11yEvent + * @param[in] timeout time(millisecond) to wait event occur * * @return true if event happened in time, otherwise false * -- 2.7.4 From 4340140e4f617ec4a0d303c9fb8722fa565924c1 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Wed, 20 Oct 2021 15:49:30 +0900 Subject: [PATCH 09/16] libaurum: Add doc for Object(Node) classes Change-Id: I6c2272926e6b3f2e0faa5bfc613170af37f66586 --- libaurum/inc/Accessibility/AccessibleNode.h | 242 ++++++++---------- .../inc/Impl/Accessibility/AtspiAccessibleNode.h | 73 +++--- libaurum/inc/UiDevice.h | 2 +- libaurum/inc/UiObject.h | 280 ++++++++++++++------- 4 files changed, 335 insertions(+), 262 deletions(-) diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index cf80129..a6956a4 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -30,6 +30,7 @@ /** * @brief AccessibleNodeInterface enum class + * * @since_tizen 5.5 */ enum class AccessibleNodeInterface { @@ -53,6 +54,7 @@ enum class AccessibleNodeInterface { /** * @brief NodeFeatureProperties enum class + * * @since_tizen 5.5 */ enum class NodeFeatureProperties { @@ -75,381 +77,351 @@ enum class NodeFeatureProperties { }; /** - * @brief AccessibleNode Class + * @brief AccessibleNode Class that provides the abstracted object information to uses. + * * @since_tizen 5.5 */ class AccessibleNode : public std::enable_shared_from_this, public IEventConsumer { public: /** - * @brief TBD + * @brief AccessibleNode constructor. + * * @since_tizen 5.5 */ AccessibleNode(); /** - * @brief TBD + * @brief AccessibleNode desctructor. + * * @since_tizen 5.5 */ virtual ~AccessibleNode(); /** - * @brief TBD + * @brief Gets Node information as string. + * + * @return string + * * @since_tizen 5.5 */ std::string description(); public: /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getChildCount() */ virtual int getChildCount() const = 0; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getChildAt() */ virtual std::shared_ptr getChildAt(int index) const = 0; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getChildren() */ virtual std::vector> getChildren() const = 0; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getParent() */ virtual std::shared_ptr getParent() const = 0; /** - * @brief TBD + * @brief Called by @AccessibleWatcher::notifyAll. + * Changes Node property If it's @EventType, @ObjectEventType are matches. + * + * @param[in] type @EventType + * @param[in] type2 @ObjectEventType + * @param[in] src Atspi Node ptr + * * @since_tizen 5.5 */ void notify(int type, int type2, void *src) override; /** - * @brief TBD + * @brief Changes Node state to invalidate. + * * @since_tizen 5.5 */ void invalidate(); public: /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getText() */ std::string getText() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getPkg() */ std::string getPkg() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getId() */ std::string getId() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getAutomationId() */ std::string getAutomationId() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getRole() */ std::string getRole() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getType() */ std::string getType() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getStyle() */ std::string getStyle() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getScreenBoundingBox() */ Rect getScreenBoundingBox() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getWindowBoundingBox() */ Rect getWindowBoundingBox() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isCheckable() */ bool isCheckable() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isChecked() */ bool isChecked() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isClickable() */ bool isClickable() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isEnabled() */ bool isEnabled() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isFocusable() */ bool isFocusable() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isFocused() */ bool isFocused() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isLongClickable() */ bool isLongClickable() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isScrollable() */ bool isScrollable() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isSelectable() */ bool isSelectable() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isSelected() */ bool isSelected() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isVisible() */ bool isVisible() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isShowing() */ bool isShowing() const; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::isActive() */ bool isActive() const; public: /** - * @brief TBD + * @brief Print Node information. + * + * @param[in] int depth + * * @since_tizen 5.5 */ void print(int); /** - * @brief TBD + * @brief Print Node information. + * + * @param[in] int depth + * @param[in] int maxdepth + * * @since_tizen 5.5 */ void print(int, int); /** - * @brief TBD + * @brief Gets matched Atspi node ptr. + * + * @return Atspi node ptr + * * @since_tizen 5.5 */ virtual void* getRawHandler(void) const = 0; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateRoleName() */ virtual void updateRoleName() = 0; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateUniqueId() */ virtual void updateUniqueId() = 0; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateName() */ virtual void updateName() = 0; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateApplication() */ virtual void updateApplication() = 0; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateAttributes() */ virtual void updateAttributes() = 0; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateStates() */ virtual void updateStates() = 0; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateExtents() */ virtual void updateExtents() = 0; /** - * @brief TBD + * @brief Updates Node information from atspi server. + * * @since_tizen 5.5 */ virtual void refresh() = 0; /** - * @brief TBD + * @brief Gets available atspi action name. + * + * @return string vector + * * @since_tizen 5.5 */ virtual std::vector getActions() const = 0; /** - * @brief TBD + * @brief Do atspi action. + * + * @param[in] action name of action + * + * @return true if success, else false + * * @since_tizen 5.5 */ virtual bool doAction(std::string action) = 0; /** - * @brief TBD + * @brief Sets Node's value. + * + * @param[in] text string + * * @since_tizen 5.5 */ virtual void setValue(std::string text) = 0; /** - * @brief TBD + * @brief Check object valid or not. + * + * @return true if valid, else false + * * @since_tizen 5.5 */ virtual bool isValid() const; public: /** - * @brief TBD + * @brief Check Node support given interface or not. + * + * @param[in] thisIface @AccessibleNodeInterface + * + * @return true if supporting, else false + * * @since_tizen 5.5 */ bool isSupporting(AccessibleNodeInterface thisIface) const; /** - * @brief TBD + * @brief Check Node has given property or not. + * + * @param[in] prop @NodeFeatureProperties + * + * @return true if has, else false + * * @since_tizen 5.5 */ bool hasFeatureProperty(NodeFeatureProperties prop) const; /** - * @brief TBD + * @brief Sets Node's property. + * + * @param[in] prop @NodeFeatureProperties + * @param[in] has Node has given property ot not + * * @since_tizen 5.5 */ void setFeatureProperty(NodeFeatureProperties prop, bool has); /** - * @brief TBD + * @brief Resets all the property value on Node. + * * @since_tizen 6.5 */ void resetFeatureProperty(); protected: - /** - * @brief TBD - */ std::string mText; - - /** - * @brief TBD - */ std::string mPkg; - - /** - * @brief TBD - */ std::string mRole; - - /** - * @brief TBD - */ std::string mId; - - /** - * @brief TBD - */ std::string mAutomationId; - - /** - * @brief TBD - */ std::string mType; - - /** - * @brief TBD - */ std::string mStyle; - - /** - * @brief TBD - */ Rect mScreenBoundingBox; - - /** - * @brief TBD - */ Rect mWindowBoundingBox; - - /** - * @brief TBD - */ int mSupportingIfaces; - - /** - * @brief TBD - */ int mFeatureProperty; private: - /** - * @brief TBD - */ bool mValid; - - /** - * @brief TBD - */ mutable std::mutex mLock; }; -#endif \ No newline at end of file +#endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index 2f3da1d..b916c1b 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -21,137 +21,126 @@ #include "AccessibleNode.h" #include +/** + * @brief AtspiAccessibleNode is inherited from AccessibleNode class. + * It manages object informations which from atspi server. + * + * @since_tizen 5.5 + */ class AtspiAccessibleNode : public AccessibleNode { public: /** - * @brief TBD + * @brief AtspiAccessibleNode constructor. + * + * @param[in] node AtspiAccessible ptr + * * @since_tizen 5.5 */ AtspiAccessibleNode(AtspiAccessible *node); /** - * @brief TBD + * @brief AtspiAccessibleNode desctructor. + * * @since_tizen 5.5 */ ~AtspiAccessibleNode() override; public: /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getChildCount() */ int getChildCount() const override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getChildAt() */ std::shared_ptr getChildAt(int index) const override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getChildren() */ std::vector> getChildren() const override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc UiObject::getParent() */ std::shared_ptr getParent() const override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc AccessibleNode::isValid() */ bool isValid() const override; public: /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc AccessibleNode::getRawHandler() */ void* getRawHandler(void) const override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateRoleName() */ void updateRoleName() override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateUniqueId() */ void updateUniqueId() override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateName() */ void updateName() override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateApplication() */ void updateApplication() override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateAttributes() */ void updateAttributes() override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateStates() */ void updateStates() override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc UiObject::updateExtents() */ void updateExtents() override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc AccessibleNode::refresh() */ void refresh() override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc AccessibleNode::getActions() */ std::vector getActions() const override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc AccessibleNode::doAction() */ bool doAction(std::string action) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc AccessibleNode::setValue() */ void setValue(std::string text) override; private: using AccessibleNode::setFeatureProperty; + /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc AccessibleNode::setFeatureProperty() */ void setFeatureProperty(AtspiStateType type); private: - /** - * @brief TBD - * @since_tizen 5.5 - */ AtspiAccessible *mNode; }; diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index dc40632..f3ddcbb 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -41,7 +41,7 @@ * @ingroup aurum * * @brief UiDevice provides access to state information about the device. - * You can also use this class to simulate user actions on the device. + * You can also use this class to simulate user actions on the device. */ class UiDevice : public IDevice, public ISearchable { public: diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index 5699b7d..b725b7d 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -30,6 +30,9 @@ class UiDevice; +/** + * @brief This class keep object's descendant tree. + */ class Node : public std::enable_shared_from_this { public: Node(std::shared_ptr node, std::vector> children) @@ -40,362 +43,471 @@ public: }; /** - * @brief UiObject class - * @since_tizen 5.5 + * @class UiObject + * + * @ingroup aurum + * + * @brief A UiObject is a representation of a actual object in view. + * As a class that abstracts the actual object, it has the information of the object + * such as object's properties, states, geometry information. + * also user can send and receive event via this class. */ class UiObject : public ISearchable , public std::enable_shared_from_this { public: /** - * @brief TBD + * @brief UiObject constructor with device, selector, node pointer. + * * @since_tizen 5.5 */ UiObject(const std::shared_ptr device, const std::shared_ptr selector, const AccessibleNode *node); /** - * @brief TBD + * @brief UiObject constructor with device, selector, node. + * * @since_tizen 5.5 */ UiObject(const std::shared_ptr device, const std::shared_ptr selector, std::shared_ptr node); -// UiObject(const UiObject &src); // copy constroctur /** - * @brief TBD + * @brief UiObject constructor with object source. + * * @since_tizen 5.5 */ - UiObject(UiObject &&src); // move constructor + UiObject(UiObject &&src); /** - * @brief TBD + * @brief UiObject constructor. (default constructor) + * * @since_tizen 5.5 */ UiObject(); /** - * @brief TBD + * @brief UiObject destructor. + * * @since_tizen 5.5 */ virtual ~UiObject(); /** - * @brief TBD + * @brief Gets selector. + * + * @return UiSelector pointer + * * @since_tizen 5.5 */ std::shared_ptr getSelector(); /** - * @brief TBD + * @brief Checks that there is object that satisfied with the selector condition in the object tree. + * + * @param[in] selector @UiSelector + * + * @return true if object exist, otherwise false + * * @since_tizen 5.5 */ bool hasObject(const std::shared_ptr selector) const override; /** - * @brief TBD + * @brief Finds that object that satisfied with the selector condition in the object tree. + * + * @param[in] selector @UiSelector + * + * @return Found UiObject pointer + * * @since_tizen 5.5 */ std::shared_ptr findObject( const std::shared_ptr selector) const override; /** - * @brief TBD + * @brief Finds that objects that satisfied with the selector condition in the object tree. + * + * @param[in] selector @UiSelector + * + * @return the list of found UiObject pointer vector + * * @since_tizen 5.5 */ std::vector> findObjects( const std::shared_ptr selector) const override; /** - * @brief TBD - * @since_tizen 5.5 + * TODO */ bool waitFor( const std::function condition) const; /** - * @brief TBD - * @since_tizen 5.5 + * TODO */ std::shared_ptr waitFor( const std::function(const ISearchable *)> condition) const; /** - * @brief TBD - * @since_tizen 5.5 + * TODO */ bool waitFor(const std::function condition) const; public: /** - * @brief TBD + * @brief Gets object's parent. + * + * @return UiObject pointer + * * @since_tizen 5.5 */ - UiObject * getParent() const; + UiObject *getParent() const; /** - * @brief TBD + * @brief Gets object's child count. + * + * @return number of child + * * @since_tizen 5.5 */ - int getChildCount() const; + int getChildCount() const; /** - * @brief TBD + * @brief Gets object's children. + * + * @return UiObject pointer vector + * * @since_tizen 5.5 */ std::vector> getChildren() const; /** - * @brief TBD + * @brief Gets object's child at specific index. + * + * @return UiObject pointer + * * @since_tizen 5.5 */ std::shared_ptr getChildAt(int index) const; /** - * @brief TBD + * @brief Gets object's Descendant tree . + * + * @return Node pointer vector + * * @since_tizen 5.5 */ std::shared_ptr getDescendant(); /** - * @brief TBD + * @brief Gets object's package name. + * + * @return string + * * @since_tizen 5.5 */ std::string getApplicationPackage() const; /** - * @brief TBD + * @brief Gets object's Id. + * + * @return string + * * @since_tizen 5.5 */ std::string getId() const; /** - * @brief TBD + * @brief Gets object's automation Id. + * + * @return string + * * @since_tizen 5.5 */ std::string getAutomationId() const; /** - * @brief TBD + * @brief Gets object's type. + * + * @return string + * * @since_tizen 5.5 */ std::string getElementType() const; /** - * @brief TBD + * @brief Gets object's style. + * + * @return string + * * @since_tizen 5.5 */ std::string getElementStyle() const; /** - * @brief TBD + * @brief Gets object's text. + * + * @return string + * * @since_tizen 5.5 */ std::string getText() const; /** - * @brief TBD + * @brief Gets object's role. + * + * @return string + * * @since_tizen 5.5 */ std::string getRole() const; /** - * @brief TBD + * @brief Sets object's text. + * + * @param[in] text string + * + * @return string + * * @since_tizen 5.5 */ void setText(std::string text); /** - * @brief TBD + * @brief Gets object's geometry of the screen. + * + * @return @Rect + * * @since_tizen 5.5 */ const Rect getScreenBoundingBox() const; /** - * @brief TBD - * @since_tizen 6.5 + * @brief Gets object's geometry of the window. + * + * @return @Rect + * + * @since_tizen 5.5 */ const Rect getWindowBoundingBox() const; /** - * @brief TBD + * @brief Gets object's checkable property. + * + * @return true if checkable else false + * * @since_tizen 5.5 */ bool isCheckable() const; /** - * @brief TBD + * @brief Gets object's checked property. + * + * @return true if checked else false + * * @since_tizen 5.5 */ bool isChecked() const; /** - * @brief TBD + * @brief Gets object's clickable property. + * + * @return true if clickable else false + * * @since_tizen 5.5 */ bool isClickable() const; /** - * @brief TBD + * @brief Gets object's enabled property. (to get object enabled. disabled state) + * + * @return true if enabled else false + * * @since_tizen 5.5 */ bool isEnabled() const; /** - * @brief TBD + * @brief Gets object's focusable property. + * + * @return true if focusable else false + * * @since_tizen 5.5 */ bool isFocusable() const; /** - * @brief TBD + * @brief Gets object's focused property. + * + * @return true if focused else false + * * @since_tizen 5.5 */ bool isFocused() const; /** - * @brief TBD + * @brief Gets object's longclickable property. + * + * @return true if longclickable else false + * * @since_tizen 5.5 */ bool isLongClickable() const; /** - * @brief TBD + * @brief Gets object's scrollable property. + * + * @return true if scrollable else false + * * @since_tizen 5.5 */ bool isScrollable() const; /** - * @brief TBD + * @brief Gets object's selectable property. + * + * @return true if selectable else false + * * @since_tizen 5.5 */ bool isSelectable() const; /** - * @brief TBD + * @brief Gets object's selected property. + * + * @return true if selected else false + * * @since_tizen 5.5 */ bool isSelected() const; /** - * @brief TBD + * @brief Gets object's visible property. + * + * @return true if visible else false + * * @since_tizen 5.5 */ bool isVisible() const; /** - * @brief TBD + * @brief Gets object's showing property. + * + * @return true if showing else false + * * @since_tizen 5.5 */ bool isShowing() const; /** - * @brief TBD + * @brief Gets object's active property. + * + * @return true if active else false + * * @since_tizen 5.5 */ bool isActive() const; /** - * @brief TBD + * @brief Performs a click action on object. + * * @since_tizen 5.5 */ void click() const; /** - * @brief TBD + * @brief Performs a long click action on object. + * + * @param[in] durationMs total time to maintain down action (default = 500ms) + * * @since_tizen 5.5 */ void longClick(const unsigned int durationMs = LOGNCLICK_INTERVAL) const; /** - * @brief TBD - * @since_tizen 5.5 + * TODO */ bool DoAtspiActivate() const; /** - * @brief TBD + * @brief Updates object's role name information from atspi server. + * * @since_tizen 6.5 */ void updateRoleName() const; /** - * @brief TBD + * @brief Updates object's Id information from atspi server. + * * @since_tizen 6.5 */ void updateUniqueId() const; /** - * @brief TBD + * @brief Updates object's name information from atspi server. + * * @since_tizen 6.5 */ void updateName() const; /** - * @brief TBD + * @brief Updates object's application name information from atspi server. + * * @since_tizen 6.5 */ void updateApplication() const; /** - * @brief TBD + * @brief Updates object's attributes information from atspi server. + * * @since_tizen 6.5 */ void updateAttributes() const; /** - * @brief TBD + * @brief Updates object's states information from atspi server. + * * @since_tizen 6.5 */ void updateStates() const; /** - * @brief TBD + * @brief Updates object's geometry information from atspi server. + * * @since_tizen 6.5 */ void updateExtents() const; /** - * @brief TBD - * @since_tizen 5.5 + * @brief Updates object's information from atspi server. + * + * @since_tizen 6.5 */ void refresh() const; /** - * @brief TBD + * @brief Checks object is valid or not. + * + * @return true if valid else false + * * @since_tizen 5.5 */ bool isValid() const; /** - * @brief TBD + * @brief Gets object's AccessibleNode class + * + * @return AccessibleNode pointer + * * @since_tizen 5.5 */ std::shared_ptr getAccessibleNode() const; private: - /** - * @brief TBD - */ std::shared_ptr mDevice; - - /** - * @brief TBD - */ std::shared_ptr mSelector; - - /** - * @brief TBD - */ std::shared_ptr mNode; - - /** - * @brief TBD - */ const Waiter *mWaiter; - - /** - * @brief TBD - */ static const unsigned int LOGNCLICK_INTERVAL = 500; }; -- 2.7.4 From f499de5bc476bed8ec7ac61be192db9b6c3354dd Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Mon, 25 Oct 2021 19:37:43 +0900 Subject: [PATCH 10/16] libaurum: Add doc for Accessible, AtspiAccessible classes Change-Id: I3ddc06de57dea697a2a522c6750beeed6b576e08 --- libaurum/inc/Accessibility/AccessibleApplication.h | 57 +++++++++ libaurum/inc/Accessibility/AccessibleWatcher.h | 73 +++++++----- libaurum/inc/Accessibility/AccessibleWindow.h | 51 +++++--- libaurum/inc/Accessibility/IEventConsumer.h | 38 +++++- libaurum/inc/Accessibility/IEventSource.h | 40 ++++++- .../Accessibility/AtspiAccessibleApplication.h | 26 +++-- .../Impl/Accessibility/AtspiAccessibleWatcher.h | 128 ++++++++------------- .../inc/Impl/Accessibility/AtspiAccessibleWindow.h | 22 +++- libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 11 +- libaurum/src/Accessibility/AccessibleNode.cc | 4 +- libaurum/src/Accessibility/AccessibleWatcher.cc | 4 +- .../Impl/Accessibility/AtspiAccessibleWatcher.cc | 4 +- 12 files changed, 314 insertions(+), 144 deletions(-) diff --git a/libaurum/inc/Accessibility/AccessibleApplication.h b/libaurum/inc/Accessibility/AccessibleApplication.h index 9701b30..097d141 100644 --- a/libaurum/inc/Accessibility/AccessibleApplication.h +++ b/libaurum/inc/Accessibility/AccessibleApplication.h @@ -23,18 +23,75 @@ #include +/** + * @class AccessibleApplication + * + * @ingroup aurum + * + * @brief Class that matches atspi Application Node. + * It provides information such as active window, application name. + */ class AccessibleApplication { public: + /** + * @brief AccessibleApplication constructor. + * + * @since_tizen 5.5 + */ AccessibleApplication(std::shared_ptr node); + + /** + * @brief AccessibleApplication destructor. + * + * @since_tizen 5.5 + */ virtual ~AccessibleApplication(); public: + /** + * @brief Gets matched @AccessibleNode. + * + * @return @AccessibleNode + * + * @since_tizen 5.5 + */ std::shared_ptr getAccessibleNode(); + + /** + * @brief Checks this active or not. + * + * @return true if it actives, else false + * + * @since_tizen 5.5 + */ bool isActive(void); public: + /** + * @brief Gets application's window. + * + * @return @AccessibleWindow vector + * + * @since_tizen 5.5 + */ virtual std::vector> getWindows(void) = 0; + + /** + * @brief Gets currently active window. + * + * @return @AccessibleWindow vector + * + * @since_tizen 5.5 + */ virtual std::vector> getActiveWindows(void); + + /** + * @brief Gets application package name. + * + * @return string + * + * @since_tizen 5.5 + */ virtual std::string getPackageName(void) = 0; private: diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index 6c77556..d2977f2 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -34,95 +34,116 @@ #include "config.h" /** - * @brief AccessibleWatcher class - * @since_tizen 5.5 + * @class AccessibleWatcher + * + * @ingroup aurum + * + * @brief Class that communicates with the atspi sever and generates an event, + * and generates a node that matches with atspi node. */ class AccessibleWatcher : public IEventSource { public: /** - * @brief TBD + * @brief AccessibleWatcher constructor. + * * @since_tizen 5.5 */ AccessibleWatcher(); /** - * @brief TBD + * @brief AccessibleWatcher destructor. + * * @since_tizen 5.5 */ virtual ~AccessibleWatcher(); /** - * @brief TBD + * @brief Gets @AccessibleWatcher instance. + * * @since_tizen 5.5 */ static AccessibleWatcher *getInstance(AccessibleWatcher *watcherImpl = nullptr); public: /** - * @brief TBD + * @brief Gets current running application count in device. + * + * @return application count + * * @since_tizen 5.5 */ virtual int getApplicationCount(void) const = 0; /** - * @brief TBD + * @brief Gets application class at specific index. + * + * @param[in] index application index + * + * @return @AccessibleApplication ptr + * * @since_tizen 5.5 */ virtual std::shared_ptr getApplicationAt(int index) const = 0; /** - * @brief TBD + * @brief Gets application node vector. + * + * @return @AccessibleApplication vector + * * @since_tizen 5.5 */ virtual std::vector> getApplications(void) const = 0; /** - * @brief TBD + * @brief Executes runnable command and wait given event. + * + * @param[in] cmd @Runnable + * @param[in] type @A11yEvent + * @param[in] timeout time(millisecond) to wait event occur + * + * @return true if event occur in time, else false + * * @since_tizen 6.5 */ virtual bool executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) = 0; /** - * @brief TBD + * @brief Gets active application map. + * + * @return map (pure Atspi Node ptr(@AtspiAccessible), @AccessibleApplication) * @since_tizen 6.5 */ virtual std::map> getActiveAppMap(void) = 0; public: /** - * @brief TBD + * @brief Gets active application vector. + * + * @return @AccessibleApplication vector + * * @since_tizen 5.5 */ virtual std::vector> getActiveApplications(void) const; + public: /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc @IEventSource::attach() */ void attach(std::shared_ptr source) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc @IEventSource::detach() */ void detach(std::shared_ptr source) override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc @IEventSource::notifyAll() */ - void notifyAll(int type, int type2, void *src) override; + void notifyAll(int type1, int type2, void *src) override; private: - /** - * @brief TBD - */ std::set> mSources; - - /** - * @brief TBD - */ std::mutex mLock; }; -#endif \ No newline at end of file +#endif diff --git a/libaurum/inc/Accessibility/AccessibleWindow.h b/libaurum/inc/Accessibility/AccessibleWindow.h index 751a774..f422d68 100644 --- a/libaurum/inc/Accessibility/AccessibleWindow.h +++ b/libaurum/inc/Accessibility/AccessibleWindow.h @@ -25,60 +25,81 @@ class AccessibleApplication; +/** + * @class AccessibleWindow + * + * @ingroup aurum + * + * @brief Class that matches atspi Window Node. + * It provides information such as window title, window properties. + */ class AccessibleWindow { public: /** - * @brief TBD + * @brief AccessibleWindow constructor. + * + * @param[in] app @AccessibleApplication + * @param[in] node @AccessibleNode + * * @since_tizen 6.0 */ AccessibleWindow(std::shared_ptr app, std::shared_ptr node); /** - * @brief TBD + * @brief AccessibleWindow destructor. + * * @since_tizen 6.0 */ virtual ~AccessibleWindow(); public: /** - * @brief TBD + * @brief Gets window title. + * + * @return string + * * @since_tizen 6.0 */ std::string getTitle(void); /** - * @brief TBD + * @brief Checks current window showing or not. + * + * @return true if it is showing, else false + * * @since_tizen 6.0 */ bool isShowing(); /** - * @brief TBD + * @brief Checks current window active or not. + * + * @return true if it actives, else false + * * @since_tizen 6.0 */ bool isActive(); /** - * @brief TBD + * @brief Gets the application node that this window belongs. + * + * @return @AccessibleApplication ptr + * * @since_tizen 6.0 */ std::shared_ptr getApplication(void); /** - * @brief TBD - * @since_tizen 6.0 + * @brief Gets matched @AccessibleNode. + * + * @return @AccessibleNode + * + * @since_tizen 5.5 */ std::shared_ptr getAccessibleNode(void); private: - /** - * @brief TBD - */ std::shared_ptr mApp; - - /** - * @brief TBD - */ std::shared_ptr mNode; }; diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index fe4b7d8..d8cd29a 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -18,21 +18,57 @@ #ifndef _IEVENT_CONSUMER_H_ #define _IEVENT_CONSUMER_H_ +/** + * @class EventType + * + * @ingroup aurum + * + * @brief Enum class for Event Type. + */ enum class EventType { none = 0, Object = 1, }; +/** + * @class ObjectEventType + * + * @ingroup aurum + * + * @brief Enum class for Object Event Type. + */ enum class ObjectEventType { none = 0, ObjectStateDefunct = 1, }; +/** + * @class IEventConsumer + * + * @ingroup aurum + * + * @brief Class for Event generate. + */ class IEventConsumer { public: + /** + * @brief IEventConsumer destructor. + * + * @since_tizen 5.5 + */ virtual ~IEventConsumer() {}; - virtual void notify(int type, int type2, void *src) = 0; + + /** + * @brief Notifies event to source node. + * + * @param[in] type1 @EventType + * @param[in] type2 @ObjectEventType + * @param[in] src source Node ptr + * + * @since_tizen 5.5 + */ + virtual void notify(int type1, int type2, void *src) = 0; }; #endif diff --git a/libaurum/inc/Accessibility/IEventSource.h b/libaurum/inc/Accessibility/IEventSource.h index cdb2196..d1f6ce4 100644 --- a/libaurum/inc/Accessibility/IEventSource.h +++ b/libaurum/inc/Accessibility/IEventSource.h @@ -21,13 +21,51 @@ #include "IEventConsumer.h" #include +/** + * @class IEventSource + * + * @ingroup aurum + * + * @brief Class for Event generate. + */ class IEventSource { public: + /** + * @brief IEventSource destructor. + * + * @since_tizen 5.5 + */ virtual ~IEventSource() {}; + + /** + * @brief Attaches event source. + * + * @param[in] source @IEventConsumer + * + * @since_tizen 5.5 + */ virtual void attach(std::shared_ptr source) = 0; + + /** + * @brief Detaches event source. + * + * @param[in] source @IEventConsumer + * + * @since_tizen 5.5 + */ virtual void detach(std::shared_ptr source) = 0; - virtual void notifyAll(int type, int type2, void *src) = 0; + + /** + * @brief Notifies all attached event. + * + * @param[in] type1 @EventType + * @param[in] type2 @ObjectEventType + * @param[in] src source Node ptr + * + * @since_tizen 5.5 + */ + virtual void notifyAll(int type1, int type2, void *src) = 0; }; #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h index 626abb9..a6cdb80 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h @@ -23,32 +23,44 @@ #include #include +/** + * @internal + * + * @class AtspiAccessibleApplication + * + * @ingroup aurum + * + * @brief Class that matches atspi Application Node. + * It provides information such as active window, application name. + */ class AtspiAccessibleApplication : public AccessibleApplication, public std::enable_shared_from_this { public: /** - * @brief TBD + * @brief AtspiAccessibleApplication constructor. + * + * @param[in] node @AccessibleNode + * * @since_tizen 6.0 */ AtspiAccessibleApplication(std::shared_ptr node); /** - * @brief TBD + * @brief AtspiAccessibleApplication destructor. + * * @since_tizen 6.0 */ virtual ~AtspiAccessibleApplication(); public: /** - * @brief TBD - * @since_tizen 6.0 + * @copydoc @AccessibleApplication::getWindows() */ std::vector> getWindows(void) override; /** - * @brief TBD - * @since_tizen 6.0 + * @copydoc @AccessibleApplication::getPackageName() */ std::string getPackageName(void) override; }; -#endif \ No newline at end of file +#endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index e53dc38..f4ed61f 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -33,7 +33,10 @@ #include /** - * @brief WindowActivateInfoType enum class + * @internal + * + * @brief WindowActivateInfoType enum class. + * * @since_tizen 5.5 */ enum class WindowActivateInfoType { @@ -44,6 +47,8 @@ enum class WindowActivateInfoType { }; /** + * @internal + * * @brief IAtspiEvents Interface * @since_tizen 5.5 */ @@ -62,7 +67,16 @@ public: virtual void onObjectDefunct(AtspiAccessible *node) = 0; }; - +/** + * @internal + * + * @class AtspiAccessibleWatcher + * + * @ingroup aurum + * + * @brief Class that communicates with the atspi sever and generates an event, + * and generates a node that matches with atspi node. + */ class AtspiAccessibleWatcher : public AccessibleWatcher, public IAtspiEvents { public: AtspiAccessibleWatcher(); @@ -70,128 +84,76 @@ public: public: /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc @AccessibleWatcher::getApplicationCount() */ virtual int getApplicationCount(void) const override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc @AccessibleWatcher::getApplicationAt() */ virtual std::shared_ptr getApplicationAt(int index) const override; /** - * @brief TBD - * @since_tizen 5.5 + * @copydoc @AccessibleWatcher::getApplications() */ virtual std::vector> getApplications(void) const override; /** - * @brief TBD - * @since_tizen 6.5 + * @copydoc @AccessibleWatcher::executeAndWaitForEvents() */ virtual bool executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) override; + /** + * @copydoc @AccessibleWatcher::getActiveAppMap() + */ virtual std::map> getActiveAppMap(void) override; public: /** - * @brief TBD + * @brief Listen atspi events. + * + * @param[in] event AtspiEvent + * @param[in] watcher @AtspiAccessibleWatcher + * * @since_tizen 5.5 */ - static void onAtspiEvents(AtspiEvent *event, void *user_data); + static void onAtspiEvents(AtspiEvent *event, void *watcher); /** - * @brief TBD + * @brief Notifies when object defunct. + * + * @param[in] node @AtspiAccessible + * * @since_tizen 5.5 */ void onObjectDefunct(AtspiAccessible *node) override; /** - * @brief TBD + * @brief AtspiEvent listener. + * + * @param[in] event AtspiEvent + * @param[in] user_data data for event by user + * * @since_tizen 6.5 */ static void onEventListener(AtspiEvent *event, void *user_data); private: - /** - * @brief TBD - * @since_tizen 5.5 - */ + /** Private methods for Mock Test **/ bool removeFromActivatedList(AtspiAccessible *node); - - /** - * @brief TBD - * @since_tizen 5.5 - */ bool addToActivatedList(AtspiAccessible *node); - - /** - * @brief TBD - * @since_tizen 5.5 - */ bool removeFromWindowSet(AtspiAccessible *node); - - /** - * @brief TBD - * @since_tizen 5.5 - */ bool addToWindowSet(AtspiAccessible *node); - - /** - * @brief TBD - * @since_tizen 6.5 - */ void addEventListener(AtspiEventListener *listener, A11yEvent type); - - /** - * @brief TBD - * @since_tizen 6.5 - */ void removeEventListener(AtspiEventListener *listener, A11yEvent type); -public: - /** - * @brief TBD - */ - static guint timeoutId; - private: - /** - * @brief TBD - */ - GDBusProxy * mDbusProxy; - - /** - * @brief TBD - */ - std::list mActivatedWindowList; - - /** - * @brief TBD - */ - std::list mActivatedApplicationList; - - /** - * @brief TBD - */ - std::set mWindowSet; - - /** - * @brief TBD - */ + GDBusProxy *mDbusProxy; + std::list mActivatedWindowList; + std::list mActivatedApplicationList; + std::set mWindowSet; std::map> mActiveAppMap; - - /** - * @brief TBD - */ - static GThread * mEventThread; - - /** - * @brief TBD - */ - static std::vector> mEventQueue; - + static GThread *mEventThread; + static std::vector> mEventQueue; static std::mutex mMutex; }; diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h index a303bc0..e9d6f71 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h @@ -20,17 +20,31 @@ #include "AccessibleWindow.h" +/** + * @internal + * + * @class AtspiAccessibleWindow + * + * @ingroup aurum + * + * @brief Class that matches atspi Window Node. + */ class AtspiAccessibleWindow : public AccessibleWindow { public: /** - * @brief TBD - * @since_tizen 6.0 + * @brief AtspiAccessibleWindow constructor. + * + * @param[in] app @AccessibleApplication + * @param[in] node @AccessibleNode + * + * @since_tizen 5.5 */ AtspiAccessibleWindow(std::shared_ptr app, std::shared_ptr node); /** - * @brief TBD - * @since_tizen 6.0 + * @brief AtspiAccessibleWindow desturctor. + * + * @since_tizen 5.5 */ ~AtspiAccessibleWindow(); diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index 9ff87f6..ee603d6 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -21,8 +21,18 @@ #include #include +/** + * @internal + * + * @class AtspiWrapper + * + * @ingroup aurum + * + * @brief Class that matches atspi Window Node. + */ class AtspiWrapper { public: + /** Wrapper methods for Atspi APIs **/ static GArray *Atspi_state_set_get_states(AtspiStateSet *set); static GArray *Atspi_accessible_get_interfaces(AtspiAccessible *node); static gchar *Atspi_accessible_get_name(AtspiAccessible *node, GError **error); @@ -49,7 +59,6 @@ public: private: static std::recursive_mutex mMutex; - //static std::unique_lock mLock; }; #endif diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc index 5bd1a4f..45c3993 100644 --- a/libaurum/src/Accessibility/AccessibleNode.cc +++ b/libaurum/src/Accessibility/AccessibleNode.cc @@ -50,11 +50,11 @@ std::string AccessibleNode::description() { return ss.str(); } -void AccessibleNode::notify(int type, int type2, void *src) +void AccessibleNode::notify(int type1, int type2, void *src) { void *handler = getRawHandler(); - if ((EventType)type == EventType::Object && (ObjectEventType)type2 == ObjectEventType::ObjectStateDefunct) { + if ((EventType)type1 == EventType::Object && (ObjectEventType)type2 == ObjectEventType::ObjectStateDefunct) { if (handler == src) invalidate(); } } diff --git a/libaurum/src/Accessibility/AccessibleWatcher.cc b/libaurum/src/Accessibility/AccessibleWatcher.cc index 77b571f..5b6bc3a 100644 --- a/libaurum/src/Accessibility/AccessibleWatcher.cc +++ b/libaurum/src/Accessibility/AccessibleWatcher.cc @@ -88,10 +88,10 @@ void AccessibleWatcher::detach(std::shared_ptr source) } } -void AccessibleWatcher::notifyAll(int type, int type2, void *src) +void AccessibleWatcher::notifyAll(int type1, int type2, void *src) { std::unique_lock lock(mLock); std::for_each(mSources.begin(), mSources.end(), [&](auto source){ - source->notify(type, type2, src); + source->notify(type1, type2, src); }); } diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index 9a6441e..a167104 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -155,14 +155,14 @@ AtspiAccessibleWatcher::~AtspiAccessibleWatcher() atspi_exit(); } -void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *user_data) +void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *watcher) { if (!event->source) { return; } char *name = NULL, *pkg = NULL; - AtspiAccessibleWatcher *instance = (AtspiAccessibleWatcher *)user_data; + AtspiAccessibleWatcher *instance = (AtspiAccessibleWatcher *)watcher; name = AtspiWrapper::Atspi_accessible_get_name(event->source, NULL); AtspiAccessible *app = AtspiWrapper::Atspi_accessible_get_application(event->source, NULL); -- 2.7.4 From d254d94ba8d3f511e641d51627a2c0d110c6e53f Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 21 Oct 2021 17:26:04 +0900 Subject: [PATCH 11/16] libaurum: Add doc for Public classes It includes performance improve feature. - Using the unique_ptr variable, the phenomenon of continuous memory reference occured is that it has improved performance through a variable static declaration. Change-Id: I1f3a42c73136e9c0e9843b1a13e31eb7f19994f7 --- libaurum/inc/A11yEvent.h | 83 +++++- libaurum/inc/Comparer.h | 75 ++++-- libaurum/inc/Interface/ISearchable.h | 33 ++- libaurum/inc/Misc/Point2D.h | 42 ++- libaurum/inc/Misc/Rect.h | 65 +++-- libaurum/inc/PartialMatch.h | 108 +++++--- libaurum/inc/Runnable/Runnable.h | 18 ++ libaurum/inc/Runnable/SendKeyRunnable.h | 18 ++ libaurum/inc/Sel.h | 40 ++- libaurum/inc/UiSelector.h | 456 ++++++++++++++++---------------- libaurum/inc/Until.h | 58 +++- libaurum/inc/Waiter.h | 54 ++-- libaurum/src/Comparer.cc | 4 +- libaurum/src/PartialMatch.cc | 62 +++-- libaurum/src/Sel.cc | 8 +- libaurum/src/UiSelector.cc | 172 ++++++------ tests/Test_UiSelector.cc | 4 +- 17 files changed, 811 insertions(+), 489 deletions(-) diff --git a/libaurum/inc/A11yEvent.h b/libaurum/inc/A11yEvent.h index 3ed5d07..f7b23bd 100644 --- a/libaurum/inc/A11yEvent.h +++ b/libaurum/inc/A11yEvent.h @@ -21,6 +21,13 @@ #include "bitmask.h" #include +/** + * @class A11yEvent + * + * @ingroup aurum + * + * @brief Enum class for A11y Event. + */ enum class A11yEvent { EVENT_NONE = 0x00000, EVENT_WINDOW_CREATE = 0x00001, @@ -47,16 +54,88 @@ enum class A11yEvent { enableEnumClassBitfield(A11yEvent); +/** + * @class A11yEventInfo + * + * @ingroup aurum + * + * @brief Class that defines the methods for matching the actual A11y Event with an enum value. + */ class A11yEventInfo { public: + /** + * @brief A11yEventInfo constructor. + * + * @since_tizen 5.5 + */ A11yEventInfo(); - A11yEventInfo(A11yEvent event, std::string name = "", std::string pkg = ""); - A11yEventInfo(std::string event, std::string name = "", std::string pkg = ""); + + /** + * @brief A11yEventInfo constructor with event as enum value, name, package. + * + * @param[in] event @A11yEvent + * @param[in] name name of the ATSPI event + * @param[in] package event occured package name + * + * @since_tizen 5.5 + */ + A11yEventInfo(A11yEvent event, std::string name = "", std::string package = ""); + + /** + * @brief A11yEventInfo constructor with event as string value, name, package. + * + * @param[in] event name of the event + * @param[in] name name of the ATSPI event + * @param[in] package event occured package name + * + * @since_tizen 5.5 + */ + A11yEventInfo(std::string event, std::string name = "", std::string package = ""); + + /** + * @brief A11yEventInfo destructor. + * + * @since_tizen 5.5 + */ ~A11yEventInfo(); + public: + /** + * @brief Gets A11yEvent. + * + * @return @A11yEvent + * + * @since_tizen 5.5 + */ A11yEvent getEvent(); + + /** + * @brief Gets matched A11yEvent. + * + * @param[in] event name of event + * + * @return @A11yEvent + * + * @since_tizen 5.5 + */ A11yEvent getEvent(std::string event); + + /** + * @brief Gets event name of event. + * + * @return name string + * + * @since_tizen 5.5 + */ std::string getName(); + + /** + * @brief Gets package name of event. + * + * @return package name string + * + * @since_tizen 5.5 + */ std::string getPkg(); protected: diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index fe93d4d..ae1ccab 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -31,35 +31,62 @@ #include /** - * @brief Comparer class - * @since_tizen 5.5 + * @class Comparer + * + * @ingroup aurum + * + * @brief Class that traverses the object tree and finds an object that match the givin condition. */ class Comparer { private: /** - * @brief TBD + * @brief Comparer constructor with device, selector, early return flag. + * + * @param[in] device @UiDevice + * @param[in] selector @UiSelctor + * @param[in] earlyReturn flag for early return + * * @since_tizen 5.5 */ Comparer(const std::shared_ptr device, const std::shared_ptr selector, const bool &earlyReturn); /** - * @brief TBD + * @brief Comparer destructor. + * * @since_tizen 5.5 */ ~Comparer(); public: /** - * @brief TBD + * @brief find object from device. + * it finds focused window then start to find object as it root. + * + * @param[in] device @UiDevice + * @param[in] selector @UiSelector + * @param[in] root @AccessibleNode root object(focused window on current state) + * + * @return AccessibleNode if found, else nulltpr + * * @since_tizen 5.5 */ - static std::shared_ptr findObject(const std::shared_ptr device, - const std::shared_ptr selector, - const std::shared_ptr root); + static std::shared_ptr findObject(const std::shared_ptr device, + const std::shared_ptr selector, + const std::shared_ptr root); /** - * @brief TBD + * @brief find object from device. + * it finds focused window then start to find object as it root. + * Finds all objects to the end of tree. + * + * @param[in] device @UiDevice + * @param[in] selector @UiSelector + * @param[in] root @AccessibleNode root object(focused window on current state) + * @param[in] earlyReturn find all object or not (default = false) + * + * @return AccessibleNode if found, else nulltpr + * * @since_tizen 5.5 */ static std::vector> findObjects( @@ -68,13 +95,26 @@ public: private: /** - * @brief TBD + * @internal + * + * @brief Starts find object from root. + * + * @param[in] root @AccessibleNode + * * @since_tizen 5.5 */ std::vector> findObjects(const std::shared_ptr root); /** - * @brief TBD + * @internal + * + * @brief It updates all partialMatches and traverse tree till given depth to find objects + * + * @param[in] root @AccessibleNode + * @param[in] index node index + * @param[in] depth tree depth + * @param[in] partialMatches @PartialMatch list + * * @since_tizen 5.5 */ std::vector> findObjects( @@ -82,20 +122,9 @@ private: std::list> &partialMatches); private: - /** - * @brief TBD - */ const std::shared_ptr mDevice; - - /** - * @brief TBD - */ const std::shared_ptr mSelector; - - /** - * @brief TBD - */ - bool mEarlyReturn; + bool mEarlyReturn; }; #endif diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h index 04df60f..fe25b09 100644 --- a/libaurum/inc/Interface/ISearchable.h +++ b/libaurum/inc/Interface/ISearchable.h @@ -26,34 +26,53 @@ #include class UiObject; + /** - * @brief ISearchable interface - * @since_tizen 5.5 + * @class ISearchable + * + * @ingroup aurum + * + * @brief ISearchable interface that defines a methods for the behavior search object in ui layout hierarchy. */ class ISearchable { public: - /** - * @brief TBD + * @brief ISearchable Destructor. + * * @since_tizen 5.5 */ virtual ~ISearchable() {} /** - * @brief TBD + * @brief Checks that there is an object that are satisfied with selector condition. + * + * @param[in] selector @UiSelctor + * + * @return true if object has, else false + * * @since_tizen 5.5 */ virtual bool hasObject(const std::shared_ptr selector) const = 0; /** - * @brief TBD + * @brief Finds object that is satisfied with selector condition. + * + * @param[in] selector @UiSelctor + * + * @return UiObject if succeed, else nulltpr + * * @since_tizen 5.5 */ virtual std::shared_ptr findObject( const std::shared_ptr selector) const = 0; /** - * @brief TBD + * @brief Finds objects that are satisfied with selector condition. + * + * @param[in] selector @UiSelctor + * + * @return UiObject vector if succeed, else nulltpr + * * @since_tizen 5.5 */ virtual std::vector> findObjects( diff --git a/libaurum/inc/Misc/Point2D.h b/libaurum/inc/Misc/Point2D.h index ee4f18a..1baddb9 100644 --- a/libaurum/inc/Misc/Point2D.h +++ b/libaurum/inc/Misc/Point2D.h @@ -19,20 +19,27 @@ #define _POINT2D_H_ /** - * @brief Point2d Class - * @since_tizen 5.5 + * @class Point2D + * + * @ingroup aurum + * + * @brief Class for X, Y coordinate expression and operation. */ template class Point2D { public: /** - * @brief TBD + * @brief Point2D constructor. + * * @since_tizen 5.5 */ Point2D() : x{0}, y{0} {} /** - * @brief TBD + * @brief Point2D constructor with Point2D source. + * + * @param[in] src Point2D source + * * @since_tizen 5.5 */ Point2D(const Point2D &src) @@ -42,7 +49,11 @@ public: } /** - * @brief TBD + * @brief Point2D constructor with template. + * + * @param[in] x x coordinate + * @param[in] y y coordinate + * * @since_tizen 5.5 */ Point2D(const T &x, const T &y) @@ -52,7 +63,12 @@ public: } /** - * @brief TBD + * @brief Checks given coordinate is same as this or not. + * + * @param[in] rhs @Point2D + * + * @return true if same, else false + * * @since_tizen 5.5 */ inline bool operator==(const Point2D& rhs) @@ -61,7 +77,12 @@ public: } /** - * @brief TBD + * @brief Checks given coordinate is not same as this or not. + * + * @param[in] rhs @Point2D + * + * @return true if same, else false + * * @since_tizen 5.5 */ inline bool operator!=(const Point2D& rhs) @@ -69,14 +90,7 @@ public: return !(*this == rhs); } - /** - * @brief TBD - */ T x; - - /** - * @brief TBD - */ T y; }; diff --git a/libaurum/inc/Misc/Rect.h b/libaurum/inc/Misc/Rect.h index 590206b..5984670 100644 --- a/libaurum/inc/Misc/Rect.h +++ b/libaurum/inc/Misc/Rect.h @@ -21,20 +21,28 @@ #include "Point2D.h" /** - * @brief Rect Class - * @since_tizen 5.5 + * @class Rect + * + * @ingroup aurum + * + * @brief Class for Rect expression and operation. */ template class Rect { public: /** - * @brief TBD + * @brief Rect constructor. + * * @since_tizen 5.5 */ Rect() : mTopLeft{0, 0}, mBottomRight{0, 0} {} /** - * @brief TBD + * @brief Rect constructor with top topleft point, bottom right point + * + * @param[in] tl top left @Point2D + * @param[in] br bottom right @Point2D + * * @since_tizen 5.5 */ Rect(const Point2D &tl, const Point2D &br) @@ -43,7 +51,13 @@ public: } /** - * @brief TBD + * @brief Rect constructor with top left, top right, bottom left, bottom right coordinates. + * + * @param[in] x1 top left x coordinate + * @param[in] y1 top left y coordinate + * @param[in] x2 bottom right x coordinate + * @param[in] y2 bottom right y coordinate + * * @since_tizen 5.5 */ Rect(const T &x1, const T &y1, const T &x2, const T &y2) @@ -52,7 +66,10 @@ public: } /** - * @brief TBD + * @brief Rect constructor with Rect source. + * + * @param[in] src Rect source + * * @since_tizen 5.5 */ Rect(const Rect &src) @@ -63,7 +80,10 @@ public: } /** - * @brief TBD + * @brief Gets middle point of Rect. + * + * @return Point2D + * * @since_tizen 5.5 */ Point2D midPoint() const @@ -73,19 +93,30 @@ public: } /** - * @brief TBD + * @brief Gets width value of Rect. + * + * @return width value + * * @since_tizen 5.5 */ T width() const { return mBottomRight.x - mTopLeft.x; } /** - * @brief TBD + * @brief Gets height value of Rect. + * + * @return height value + * * @since_tizen 5.5 */ T height() const { return mBottomRight.y - mTopLeft.y; } /** - * @brief TBD + * @brief Checks given Rect is same as this or not. + * + * @param[in] rhs @Rect + * + * @return true if same, else false + * * @since_tizen 5.5 */ inline bool operator==(const Rect& rhs) @@ -94,21 +125,19 @@ public: } /** - * @brief TBD + * @brief Checks given Rect is not same as this or not. + * + * @param[in] rhs @Rect + * + * @return true if same, else false + * * @since_tizen 5.5 */ inline bool operator!=(const Rect& rhs){ return !(*this == rhs); } - /** - * @brief TBD - */ Point2D mTopLeft; - - /** - * @brief TBD - */ Point2D mBottomRight; }; diff --git a/libaurum/inc/PartialMatch.h b/libaurum/inc/PartialMatch.h index 28f430e..bb8fb44 100644 --- a/libaurum/inc/PartialMatch.h +++ b/libaurum/inc/PartialMatch.h @@ -24,52 +24,95 @@ #include "AccessibleNode.h" #include "UiSelector.h" + /** - * @brief PartialMatch class - * @since_tizen 5.5 + * @class PartialMatch + * + * @ingroup aurum + * + * @brief Class that defines a methods to perform multiple condition of search object. + * It works like helper class for @Comparer. */ class PartialMatch { private: /** - * @brief TBD + * @brief PartialMatch constructor. + * * @since_tizen 5.5 */ PartialMatch(); public: /** - * @brief TBD + * @brief PartialMatch constructor with selector, absolute depth. + * + * @param[in][in] absolute depth(start from root) value + * * @since_tizen 5.5 */ PartialMatch(const std::shared_ptr selector, const int absDepth); public: /** - * @brief TBD + * @brief Updates all PartialMatches class. + * + * @param[in] node target @AssessibleNode + * @param[in] index node index + * @param[in] depth next depth + * @param[in] partialMatches @PartialMatch list + * * @since_tizen 5.5 */ void update(const std::shared_ptr node, int index, int depth, std::list> &partialMatches); /** - * @brief TBD + * @brief Checks the matching finished or not. If so, saves match result if found. + * + * @return true if matched child exist, else false + * * @since_tizen 5.5 */ bool finalizeMatch(); /** - * @brief TBD + * @brief Prints selector information. + * * @since_tizen 5.5 */ std::string debugPrint(); public: + + /** + * @brief It determine current given depth accatable and check criteria, + * It checks selector's min, max depth in relative depth, and check criteria. + * + * @param[in] node target @AccessibleNode + * @param[in] selector @UiSelector + * @param[in] index node index + * @param[in] depth searching depth from ui layout hierarchy + * + * @return @PartialMatch + * + * @since_tizen 5.5 + */ static std::shared_ptr accept(const std::shared_ptr node, const std::shared_ptr selector, int index, int depth); /** - * @brief TBD + * @brief It determine current given depth accatable and check criteria, + * It checks selector's min, max depth in relative depth, and check criteria. + * + * @param[in] node target @AccessibleNode + * @param[in] selector @UiSelector + * @param[in] index node index + * @param[in] absoluteDepth absolute depth + * @param[in] relativeDepth relative depth + * + * @return @PartialMatch + * * @since_tizen 5.5 */ static std::shared_ptr accept(const std::shared_ptr node, @@ -77,47 +120,48 @@ public: int index, int absoluteDepth, int relativeDepth); - /** - * @brief TBD - * @since_tizen 5.5 - */ private: - static bool checkCriteria(const std::shared_ptr selector, - const std::shared_ptr node); /** - * @brief TBD + * @brief Checks given node's search criteria are satisfied or not. + * + * @param[in] selector @UiSelector + * @param[in] node @AccessibleNode target node + * + * @return ture if satisfied, else false + * * @since_tizen 5.5 */ - - static bool checkCriteria(const std::string *textA, const std::string textB); + static bool checkCriteria(const std::shared_ptr selector, + const std::shared_ptr node); /** - * @brief TBD + * @brief Checks text matched or not. + * + * @param[in] textA string + * @param[in] textB string + * + * @return ture if matched, else false + * * @since_tizen 5.5 */ - static bool checkCriteria(const std::string *textA, const std::string textB, const bool *match); + static bool checkCriteria(const std::string textA, const std::string textB); /** - * @brief TBD + * @brief Checks boolean value matched or not. + * + * @param[in] boolA bool + * @param[in] boolA bool + * + * @return ture if matched, else false + * * @since_tizen 5.5 */ - static bool checkCriteria(const bool *boolA, const bool boolB); + static bool checkCriteria(const bool boolA, const bool boolB); private: - /** - * @brief TBD - */ const std::shared_ptr mSelector; - - /** - * @brief TBD - */ const int mDepth; - - /** - * @brief TBD - */ std::list> mPartialMatches; }; diff --git a/libaurum/inc/Runnable/Runnable.h b/libaurum/inc/Runnable/Runnable.h index 5ecd0de..22b7723 100644 --- a/libaurum/inc/Runnable/Runnable.h +++ b/libaurum/inc/Runnable/Runnable.h @@ -18,10 +18,28 @@ #ifndef _RUNNABLE_H_ #define _RUNNABLE_H_ +/** + * @class Runnable + * + * @ingroup aurum + * + * @brief Class to run UI automation function and get results. + */ class Runnable { public: + /** + * @brief Runnable destructor. + * + * @since_tizen 5.5 + */ virtual ~Runnable() { } + + /** + * @brief Do given action. + * + * @since_tizen 5.5 + */ virtual void run() const = 0; }; diff --git a/libaurum/inc/Runnable/SendKeyRunnable.h b/libaurum/inc/Runnable/SendKeyRunnable.h index 4fcd77c..91f80dc 100644 --- a/libaurum/inc/Runnable/SendKeyRunnable.h +++ b/libaurum/inc/Runnable/SendKeyRunnable.h @@ -22,12 +22,30 @@ #include "Runnable.h" +/** + * @class SendKeyRunnable + * + * @ingroup aurum + * + * @brief Class to send key event and wait a result. + */ class SendKeyRunnable : public Runnable { protected: std::string mKeycode; public: + /** + * @brief SendKeyRunnable constructor with keycode. + * + * @param[in] keycode keycode string + * + * @since_tizen 5.5 + */ SendKeyRunnable(std::string keycode); + + /** + * @copydoc Runnable::run() + */ void run() const override; }; diff --git a/libaurum/inc/Sel.h b/libaurum/inc/Sel.h index 0338b38..9d75ab0 100644 --- a/libaurum/inc/Sel.h +++ b/libaurum/inc/Sel.h @@ -26,31 +26,55 @@ #include "UiSelector.h" /** - * @brief Sel class - * @since_tizen 5.5 + * @class Sel + * + * @ingroup aurum + * + * @brief Helper class for use @UiSelctor easily. + * This class using in Aurum feature UTC in cpp test code. */ class Sel { public: /** - * @brief TBD + * @brief Sets the search criteria to match the object's text. + * + * @param[in] text object text + * + * @return @UiSelector + * * @since_tizen 5.5 */ static std::shared_ptr text(std::string text); /** - * @brief TBD + * @brief Sets the search criteria to match the object's type. + * + * @param[in] type object type + * + * @return @UiSelector + * * @since_tizen 5.5 */ - static std::shared_ptr type(std::string text); + static std::shared_ptr type(std::string type); /** - * @brief TBD + * @brief Sets the search criteria to match the object's style. + * + * @param[in] style object style + * + * @return @UiSelector + * * @since_tizen 5.5 */ - static std::shared_ptr style(std::string text); + static std::shared_ptr style(std::string style); /** - * @brief TBD + * @brief Sets the depth of the selector. + * + * @param[in] depth tree depth from root + * + * @return @UiSelector + * * @since_tizen 5.5 */ static std::shared_ptr depth(int depth); diff --git a/libaurum/inc/UiSelector.h b/libaurum/inc/UiSelector.h index 227feb8..37ade0c 100644 --- a/libaurum/inc/UiSelector.h +++ b/libaurum/inc/UiSelector.h @@ -23,363 +23,363 @@ #include #include #include + /** - * @brief UiSelector class - * @since_tizen 5.5 + * @class UiSelector + * + * @ingroup aurum + * + * @brief Specifies the elements in the layout hierarchy for tests to target, + * filtered by properties such as text value, + * content-description, class name, and state information. + * User can also target an element by its location in a layout hierarchy. */ class UiSelector { public: /** - * @brief TBD + * @brief UiSelector constructor. + * * @since_tizen 5.5 */ UiSelector(); /** - * @brief TBD + * @brief UiSelector constructor with selector. * @since_tizen 5.5 */ UiSelector(UiSelector &selector); - // UiSelector(const UiSelector &src); - // UiSelector &operator= (const UiSelector& src); - /** - * @brief TBD + * @brief Gets Selector information as string. + * * @since_tizen 5.5 */ std::string description(); public: /** - * @brief TBD + * @brief Sets the search criteria to match the object's Id. + * + * @param[in] text object Id + * + * @return UiSelector pointer + * * @since_tizen 5.5 */ - UiSelector *id(std::string text, bool match = true); + UiSelector *id(std::string text); /** - * @brief TBD + * @brief Sets the search criteria to match the object's automationid. + * + * @param[in] text object automationid + * + * @return UiSelector pointer + * * @since_tizen 5.5 */ - UiSelector *automationid(std::string text, bool match = true); + UiSelector *automationid(std::string text); /** - * @brief TBD + * @brief Sets the search criteria to match the object's text. + * + * @param[in] text object text + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *text(std::string text, bool match = true); + UiSelector *text(std::string text); /** - * @brief TBD + * @brief Sets the search criteria to match the object's package name. + * + * @param[in] text object package name + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *pkg(std::string text, bool match = true); + UiSelector *pkg(std::string text); /** - * @brief TBD + * @brief Sets the search criteria to match the object's role. + * + * @param[in] text object role name + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *role(std::string text, bool match = true); + UiSelector *role(std::string text); /** - * @brief TBD + * @brief Sets the search criteria to match the object's type. + * + * @param[in] text object type name + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *type(std::string text, bool match = true); + UiSelector *type(std::string text); /** - * @brief TBD + * @brief Sets the search criteria to match the object's style. + * + * @param[in] text object style name + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *style(std::string text, bool match = true); + UiSelector *style(std::string text); /** - * @brief TBD + * @brief Sets the depth of the selector. + * + * @param[in] depth depth + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ UiSelector *depth(int depth); /** - * @brief TBD + * @brief Sets the min and max depth of the selector. + * + * @param[in] minDepth min depth + * @param[in] maxDepth max depth + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ UiSelector *depth(int minDepth, int maxDepth); /** - * @brief TBD + * @brief Sets the min depth of the selector. + * + * @param[in] depth min depth + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ UiSelector *minDepth(int depth); /** - * @brief TBD + * @brief Sets the max depth of the selector. + * + * @param[in] depth max depth + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ UiSelector *maxDepth(int depth); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is currently checked. + * + * @param[in] condition object's checked condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isChecked(bool cond); + UiSelector *isChecked(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is checkable. + * + * @param[in] condition object's checkable condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isCheckable(bool cond); + UiSelector *isCheckable(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is clickable. + * + * @param[in] condition object's clickable condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isClickable(bool cond); + UiSelector *isClickable(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is currently checked. + * + * @param[in] condition object's checked condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isEnabled(bool cond); + UiSelector *isEnabled(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is currently focused. + * + * @param[in] condition object's focused condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isFocused(bool cond); + UiSelector *isFocused(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is focusable. + * + * @param[in] condition object's focusable condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isFocusable(bool cond); + UiSelector *isFocusable(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is scrollable. + * + * @param[in] condition object's scrollable condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isScrollable(bool cond); + UiSelector *isScrollable(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is currently selected. + * + * @param[in] condition object's selected condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isSelected(bool cond); + UiSelector *isSelected(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is showing. + * + * @param[in] condition object's showing condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isShowing(bool cond); + UiSelector *isShowing(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is currently active. + * + * @param[in] condition object's active condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isActive(bool cond); + UiSelector *isActive(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is currently visible. + * + * @param[in] condition object's visible condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isVisible(bool cond); + UiSelector *isVisible(bool condition); /** - * @brief TBD + * @brief Sets the search criteria to match the object that is selectable. + * + * @param[in] condition object's selectable condition + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ - UiSelector *isSelectable(bool cond); + UiSelector *isSelectable(bool condition); /** - * @brief TBD + * @brief Sets the child selector. + * + * @param[in] child @UiSelector + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ UiSelector *hasChild(std::shared_ptr child); /** - * @brief TBD + * @brief Sets the parent selector. + * + * @param[in] parent @UiSelector + * + * @return UiSelector class instance + * * @since_tizen 5.5 */ UiSelector *fromParent(std::shared_ptr parent); public: - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mId; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mAutomationId; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mRole; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mText; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mPkg; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mType; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mStyle; + std::string mId; + std::string mAutomationId; + std::string mRole; + std::string mText; + std::string mPkg; + std::string mType; + std::string mStyle; + + bool mMatchId; + bool mMatchAutomationId; + bool mMatchRole; + bool mMatchText; + bool mMatchPkg; + bool mMatchType; + bool mMatchStyle; + + bool mMatchChecked; + bool mMatchCheckable; + bool mMatchClickable; + bool mMatchEnabled; + bool mMatchFocused; + bool mMatchFocusable; + bool mMatchScrollable; + bool mMatchSelected; + bool mMatchShowing; + bool mMatchActive; + bool mMatchVisible; + bool mMatchSelectable; + + int mMinDepth; + int mMaxDepth; + + bool mIschecked; + bool mIscheckable; + bool mIsclickable; + bool mIsenabled; + bool mIsfocused; + bool mIsfocusable; + bool mIsscrollable; + bool mIsselected; + bool mIsshowing; + bool mIsactive; + bool mIsvisible; + bool mIsselectable; - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMatchId; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMatchAutomationId; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMatchRole; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMatchText; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMatchPkg; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMatchType; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMatchStyle; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMinDepth; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mMaxDepth; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIschecked; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIscheckable; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsclickable; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsenabled; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsfocused; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsfocusable; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsscrollable; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsselected; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsshowing; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsactive; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsvisible; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - std::unique_ptr mIsselectable; - - /** - * @brief TBD - * @since_tizen 5.5 - */ std::vector> mChild; - - /** - * @brief TBD - * @since_tizen 5.5 - */ std::shared_ptr mParent; }; diff --git a/libaurum/inc/Until.h b/libaurum/inc/Until.h index eddef7b..a67e45f 100644 --- a/libaurum/inc/Until.h +++ b/libaurum/inc/Until.h @@ -15,66 +15,100 @@ * */ -#ifndef _UTIL_H_ -#define _UTIL_H_ +#ifndef _UNTIL_H_ +#define _UNTIL_H_ #include #include "ISearchable.h" #include "UiSelector.h" + /** - * @brief Until class - * @since_tizen 5.5 + * @class Until + * + * @ingroup Aurum + * + * @brief Class for use in a @Waiter class waiting for a particular object to find + * or waiting for a state change. */ class Until { private: /** - * @brief TBD + * @brief Until constructor. + * * @since_tizen 5.5 */ Until(); /** - * @brief TBD + * @brief Until constructor with selector. + * + * @param[in] selector @UiSelector + * * @since_tizen 5.5 */ Until(const std::shared_ptr selector); /** - * @brief TBD + * @brief UiSelector constructor with source. + * + * @param[in] src reference of Until source + * * @since_tizen 5.5 */ Until(const Until &src); /** - * @brief TBD + * @brief UiSelector constructor with source. + * + * @param[in] src Rvalue reference of Util source + * * @since_tizen 5.5 */ Until(const Until &&src); public: /** - * @brief TBD + * @brief UiSelector destructor. + * * @since_tizen 5.5 */ ~Until(); public: /** - * @brief TBD + * @brief Checks that there is an object that are satisfied with selector condition. + * + * @param[in] selector @UiSelctor + * + * @return function that performs hasObject + * returned function will return true if object has, else false + * * @since_tizen 5.5 */ static std::function hasObject( const std::shared_ptr selector); /** - * @brief TBD + * @brief Checks that there is an object that are satisfied with selector condition. + * + * @param[in] selector @UiSelctor + * + * @return function that performs findObject + * returned function will return obj if succeed, else nulltpr + * * @since_tizen 5.5 */ static std::function(const ISearchable *)> findObject(const std::shared_ptr selector); /** - * @brief TBD + * @brief Checks the given object on checkable state. + * + * @param[in] isCheckable checkable or not + * + * @return function that check checkable + * returned function will return true if checkable, else false + * * @since_tizen 5.5 */ static std::function checkable( diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index 82a9e4a..5c0c935 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -21,70 +21,72 @@ #include "ISearchable.h" #include + /** - * @brief Waiter class - * @since_tizen 5.5 + * @class Waiter + * + * @ingroup Aurum + * + * @brief Class waiting for a particular object to find or waiting for a state change. + * check interval = 500ms, wait timeout = 5000ms. */ class Waiter { private: /** - * @brief TBD + * @brief Waiter constructor. + * * @since_tizen 5.5 */ Waiter(); public: /** - * @brief TBD + * @brief Waiter constructor with searchable, object. + * + * @param[in] searchableObject ISearchable pointer + * @param[in] uiObject UiObject pointer + * * @since_tizen 5.5 */ Waiter(const ISearchable *searchableObject, const UiObject *uiObject = nullptr); /** - * @brief TBD + * @brief Waiter destructor. + * * @since_tizen 5.5 */ ~Waiter(); public: /** - * @brief TBD + * @brief wait for condition satisfied. + * + * @param[in] condisiton @ISearchable + * + * @return template + * * @since_tizen 5.5 */ template R waitFor(const std::function condition) const; /** - * @brief TBD + * @brief wait for object's condition satisfied. + * + * @param[in] object @UiObject + * + * @return template + * * @since_tizen 5.5 */ template R waitFor(const std::function object) const; private: - /** - * @brief TBD - * @since_tizen 5.5 - */ const ISearchable *mSearchableObject; - - /** - * @brief TBD - * @since_tizen 5.5 - */ const UiObject *mUiObject; - - /** - * @brief TBD - * @since_tizen 5.5 - */ const int WAIT_INTERVAL_MS; - - /** - * @brief TBD - * @since_tizen 5.5 - */ const int WAIT_TIMEOUT_MS; }; diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc index dd96f10..f5ebdf2 100644 --- a/libaurum/src/Comparer.cc +++ b/libaurum/src/Comparer.cc @@ -79,7 +79,7 @@ std::vector> Comparer::findObjects( PartialMatch::accept(root, mSelector, index, depth); if (currentMatch) partialMatches.push_front(currentMatch); - if (!(mSelector->mMaxDepth && (depth+1 > *(mSelector->mMaxDepth)))) { + if (!(mSelector->mMaxDepth && (depth+1 > mSelector->mMaxDepth))) { int childCnt = root->getChildCount(); for (int i = 0; i < childCnt; i++) { std::shared_ptr childNode = root->getChildAt(i); @@ -95,7 +95,7 @@ std::vector> Comparer::findObjects( } } } else { - LOGI("Abort searching! No need to search children(maxDepth limit overflow, %d < %d < %d)", mSelector->mMinDepth? * (mSelector->mMinDepth): -1, depth, mSelector->mMaxDepth?*(mSelector->mMaxDepth):9999999); + LOGI("Abort searching! No need to search children(maxDepth limit overflow, %d < %d < %d)", mSelector->mMinDepth? mSelector->mMinDepth: -1, depth, mSelector->mMaxDepth?(mSelector->mMaxDepth):9999999); } if (currentMatch && currentMatch->finalizeMatch()){ diff --git a/libaurum/src/PartialMatch.cc b/libaurum/src/PartialMatch.cc index c8be7da..3b3e4eb 100644 --- a/libaurum/src/PartialMatch.cc +++ b/libaurum/src/PartialMatch.cc @@ -22,18 +22,16 @@ #include #include -bool PartialMatch::checkCriteria(const std::string *textA, const std::string textB) +bool PartialMatch::checkCriteria(const std::string textA, const std::string textB) { - if (!textA) return false; - std::regex re(*textA); + std::regex re(textA); bool rst = !(!!std::regex_match(textB, re) == true); return rst; } -bool PartialMatch::checkCriteria(const bool *boolA, const bool boolB) +bool PartialMatch::checkCriteria(const bool boolA, const bool boolB) { - if (!boolA) return false; - return *boolA != boolB; + return boolA != boolB; } std::string PartialMatch::debugPrint() @@ -44,40 +42,40 @@ std::string PartialMatch::debugPrint() bool PartialMatch::checkCriteria(const std::shared_ptr selector, const std::shared_ptr node) { - if (selector->mMatchText.get()) { + if (selector->mMatchText) { node->updateName(); - if (checkCriteria(selector->mText.get(), node->getText())) return false; + if (checkCriteria(selector->mText, node->getText())) return false; } - if (selector->mMatchId.get()) { + if (selector->mMatchId) { node->updateUniqueId(); - if (checkCriteria(selector->mId.get(), node->getId())) return false; + if (checkCriteria(selector->mId, node->getId())) return false; } - if (selector->mMatchType.get() || selector->mMatchAutomationId.get() || selector->mMatchStyle.get()) { + if (selector->mMatchType || selector->mMatchAutomationId || selector->mMatchStyle) { node->updateAttributes(); - if (checkCriteria(selector->mAutomationId.get(), node->getAutomationId())) return false; - if (checkCriteria(selector->mType.get(), node->getType())) return false; - if (checkCriteria(selector->mStyle.get(), node->getStyle())) return false; + if (checkCriteria(selector->mAutomationId, node->getAutomationId())) return false; + if (checkCriteria(selector->mType, node->getType())) return false; + if (checkCriteria(selector->mStyle, node->getStyle())) return false; } - if (selector->mMatchPkg.get()) { + if (selector->mMatchPkg) { node->updateApplication(); - if (checkCriteria(selector->mPkg.get(), node->getPkg())) return false; + if (checkCriteria(selector->mPkg, node->getPkg())) return false; } - if (selector->mMatchRole.get()) { + if (selector->mMatchRole) { node->updateRoleName(); - if (checkCriteria(selector->mRole.get(), node->getRole())) return false; + if (checkCriteria(selector->mRole, node->getRole())) return false; } - if (checkCriteria(selector->mIschecked.get(), node->isChecked())) return false; - if (checkCriteria(selector->mIscheckable.get(), node->isCheckable())) return false; - if (checkCriteria(selector->mIsclickable.get(), node->isClickable())) return false; - if (checkCriteria(selector->mIsenabled.get(), node->isEnabled())) return false; - if (checkCriteria(selector->mIsfocused.get(), node->isFocused())) return false; - if (checkCriteria(selector->mIsfocusable.get(), node->isFocusable())) return false; - if (checkCriteria(selector->mIsscrollable.get(), node->isScrollable())) return false; - if (checkCriteria(selector->mIsselected.get(), node->isSelected())) return false; - if (checkCriteria(selector->mIsshowing.get(), node->isShowing())) return false; - if (checkCriteria(selector->mIsactive.get(), node->isActive())) return false; - if (checkCriteria(selector->mIsvisible.get(), node->isVisible())) return false; - if (checkCriteria(selector->mIsselectable.get(), node->isSelectable())) return false; + if (selector->mMatchChecked && checkCriteria(selector->mIschecked, node->isChecked())) return false; + if (selector->mMatchCheckable && checkCriteria(selector->mIscheckable, node->isCheckable())) return false; + if (selector->mMatchClickable && checkCriteria(selector->mIsclickable, node->isClickable())) return false; + if (selector->mMatchEnabled && checkCriteria(selector->mIsenabled, node->isEnabled())) return false; + if (selector->mMatchFocused && checkCriteria(selector->mIsfocused, node->isFocused())) return false; + if (selector->mMatchFocusable && checkCriteria(selector->mIsfocusable, node->isFocusable())) return false; + if (selector->mMatchScrollable && checkCriteria(selector->mIsscrollable, node->isScrollable())) return false; + if (selector->mMatchSelected && checkCriteria(selector->mIsselected, node->isSelected())) return false; + if (selector->mMatchShowing && checkCriteria(selector->mIsshowing, node->isShowing())) return false; + if (selector->mMatchActive && checkCriteria(selector->mIsactive, node->isActive())) return false; + if (selector->mMatchVisible && checkCriteria(selector->mIsvisible, node->isVisible())) return false; + if (selector->mMatchSelectable && checkCriteria(selector->mIsselectable, node->isSelectable())) return false; return true; } @@ -105,8 +103,8 @@ std::shared_ptr PartialMatch::accept(const std::shared_ptrmMinDepth && (relativeDepth < *(selector->mMinDepth))) || - (selector->mMaxDepth && (relativeDepth > *(selector->mMaxDepth)))) { + if ((selector->mMinDepth && relativeDepth < selector->mMinDepth) || + (selector->mMaxDepth && relativeDepth > selector->mMaxDepth)) { return std::shared_ptr(nullptr); } if (PartialMatch::checkCriteria(selector, node)) diff --git a/libaurum/src/Sel.cc b/libaurum/src/Sel.cc index 34ada90..484ffca 100644 --- a/libaurum/src/Sel.cc +++ b/libaurum/src/Sel.cc @@ -25,17 +25,17 @@ std::shared_ptr Sel::text(std::string text) return sel; } -std::shared_ptr Sel::type(std::string text) +std::shared_ptr Sel::type(std::string type) { std::shared_ptr sel = std::make_shared(); - sel->type(text); + sel->type(type); return sel; } -std::shared_ptr Sel::style(std::string text) +std::shared_ptr Sel::style(std::string style) { std::shared_ptr sel = std::make_shared(); - sel->style(text); + sel->style(style); return sel; } diff --git a/libaurum/src/UiSelector.cc b/libaurum/src/UiSelector.cc index 70770b2..9f7b9bd 100644 --- a/libaurum/src/UiSelector.cc +++ b/libaurum/src/UiSelector.cc @@ -22,6 +22,8 @@ UiSelector::UiSelector() : mId{}, mAutomationId{}, mRole{}, mText{}, mPkg{}, mType{}, mStyle{}, mMatchId{}, mMatchAutomationId{}, mMatchRole{}, mMatchText{}, mMatchPkg{}, mMatchType{}, mMatchStyle{}, + mMatchChecked{}, mMatchCheckable{}, mMatchClickable{}, mMatchEnabled{}, mMatchFocused{}, mMatchFocusable{}, + mMatchScrollable{}, mMatchSelected{}, mMatchShowing{}, mMatchActive{}, mMatchVisible{}, mMatchSelectable{}, mMinDepth{}, mMaxDepth{}, mIschecked{}, mIscheckable{}, mIsclickable{}, mIsenabled{}, mIsfocused{}, mIsfocusable{}, mIsscrollable{}, mIsselected{}, mIsshowing{}, mIsactive{}, mIsvisible{}, mIsselectable{}, @@ -33,34 +35,34 @@ std::string UiSelector::description() { std::stringstream ss{}; ss << "{"; - if(this->mId) ss << "\"mId\":\"" << *this->mId << "\", "; - if(this->mAutomationId) ss << "\"mAutomationId\":\"" << *this->mAutomationId << "\", "; - if(this->mRole) ss << "\"mRole\":\"" << *this->mRole << "\", "; - if(this->mText) ss << "\"mText\":\"" << *this->mText << "\", "; - if(this->mPkg) ss << "\"mPkg\":\"" << *this->mPkg << "\", "; - if(this->mType) ss << "\"mType\":\"" << *this->mType << "\", "; - if(this->mStyle) ss << "\"mStyle\":\"" << *this->mStyle << "\", "; - if(this->mMatchId) ss << "\"mMatchId\":\"" << ((*this->mMatchId)?"true":"false") << "\", "; - if(this->mMatchAutomationId) ss << "\"mMatchAutomationId\":\"" << ((*this->mMatchAutomationId)?"true":"false") << "\", "; - if(this->mMatchRole) ss << "\"mMatchRole\":\"" << ((*this->mMatchRole)?"true":"false") << "\", "; - if(this->mMatchText) ss << "\"mMatchText\":\"" << ((*this->mMatchText)?"true":"false") << "\", "; - if(this->mMatchPkg) ss << "\"mMatchPkg\":\"" << ((*this->mMatchPkg)?"true":"false") << "\", "; - if(this->mMatchType) ss << "\"mMatchType\":\"" << ((*this->mMatchType)?"true":"false") << "\", "; - if(this->mMatchStyle) ss << "\"mMatchStyle\":\"" << ((*this->mMatchStyle)?"true":"false" )<< "\", "; - if(this->mMinDepth) ss << "\"mMinDepth\":\"" << *this->mMinDepth << "\", "; - if(this->mMaxDepth) ss << "\"mMaxDepth\":\"" << *this->mMaxDepth << "\", "; - if(this->mIschecked) ss << "\"mIschecked\":\"" << ((*this->mIschecked)?"true":"false") << "\", "; - if(this->mIscheckable) ss << "\"mIscheckable\":\"" << ((*this->mIscheckable)?"true":"false") << "\", "; - if(this->mIsclickable) ss << "\"mIsclickable\":\"" << ((*this->mIsclickable)?"true":"false") << "\", "; - if(this->mIsenabled) ss << "\"mIsenabled\":\"" << ((*this->mIsenabled)?"true":"false") << "\", "; - if(this->mIsfocused) ss << "\"mIsfocused\":\"" << ((*this->mIsfocused)?"true":"false") << "\", "; - if(this->mIsfocusable) ss << "\"mIsfocusable\":\"" << ((*this->mIsfocusable)?"true":"false") << "\", "; - if(this->mIsscrollable) ss << "\"mIsscrollable\":\"" << ((*this->mIsscrollable)?"true":"false") << "\", "; - if(this->mIsselected) ss << "\"mIsselected\":\"" << ((*this->mIsselected)?"true":"false") << "\", "; - if(this->mIsshowing) ss << "\"mIsshowing\":\"" << ((*this->mIsshowing)?"true":"false") << "\", "; - if(this->mIsactive) ss << "\"mIsactive\":\"" << ((*this->mIsactive)?"true":"false") << "\", "; - if(this->mIsvisible) ss << "\"mIsvisible\":\"" << ((*this->mIsvisible)?"true":"false") << "\", "; - if(this->mIsselectable) ss << "\"mIsselectable\":\"" << ((*this->mIsselectable)?"true":"false") << "\", "; + if(!this->mId.empty()) ss << "\"mId\":\"" << this->mId << "\", "; + if(!this->mAutomationId.empty()) ss << "\"mAutomationId\":\"" << this->mAutomationId << "\", "; + if(!this->mRole.empty()) ss << "\"mRole\":\"" << this->mRole << "\", "; + if(!this->mText.empty()) ss << "\"mText\":\"" << this->mText << "\", "; + if(!this->mPkg.empty()) ss << "\"mPkg\":\"" << this->mPkg << "\", "; + if(!this->mType.empty()) ss << "\"mType\":\"" << this->mType << "\", "; + if(!this->mStyle.empty()) ss << "\"mStyle\":\"" << this->mStyle << "\", "; + if(this->mMatchId) ss << "\"mMatchId\":\"" << ((this->mMatchId)?"true":"false") << "\", "; + if(this->mMatchAutomationId) ss << "\"mMatchAutomationId\":\"" << ((this->mMatchAutomationId)?"true":"false") << "\", "; + if(this->mMatchRole) ss << "\"mMatchRole\":\"" << ((this->mMatchRole)?"true":"false") << "\", "; + if(this->mMatchText) ss << "\"mMatchText\":\"" << ((this->mMatchText)?"true":"false") << "\", "; + if(this->mMatchPkg) ss << "\"mMatchPkg\":\"" << ((this->mMatchPkg)?"true":"false") << "\", "; + if(this->mMatchType) ss << "\"mMatchType\":\"" << ((this->mMatchType)?"true":"false") << "\", "; + if(this->mMatchStyle) ss << "\"mMatchStyle\":\"" << ((this->mMatchStyle)?"true":"false" )<< "\", "; + if(this->mMinDepth) ss << "\"mMinDepth\":\"" << this->mMinDepth << "\", "; + if(this->mMaxDepth) ss << "\"mMaxDepth\":\"" << this->mMaxDepth << "\", "; + if(this->mMatchChecked) ss << "\"mMatchChecked\":\"" << ((this->mMatchChecked)?"true":"false") << "\", "; + if(this->mMatchCheckable) ss << "\"mMatchCheckable\":\"" << ((this->mMatchCheckable)?"true":"false") << "\", "; + if(this->mMatchClickable) ss << "\"mMatchClickable\":\"" << ((this->mMatchClickable)?"true":"false") << "\", "; + if(this->mMatchEnabled) ss << "\"mMatchEnabled\":\"" << ((this->mMatchEnabled)?"true":"false") << "\", "; + if(this->mMatchFocused) ss << "\"mMatchFocused\":\"" << ((this->mMatchFocused)?"true":"false") << "\", "; + if(this->mMatchFocusable) ss << "\"mMatchFocusable\":\"" << ((this->mMatchFocusable)?"true":"false") << "\", "; + if(this->mMatchScrollable) ss << "\"mMatchScrollable\":\"" << ((this->mMatchScrollable)?"true":"false") << "\", "; + if(this->mMatchSelected) ss << "\"mMatchSelected\":\"" << ((this->mMatchSelected)?"true":"false") << "\", "; + if(this->mMatchShowing) ss << "\"mMatchShowing\":\"" << ((this->mMatchShowing)?"true":"false") << "\", "; + if(this->mMatchActive) ss << "\"mMatchActive\":\"" << ((this->mMatchActive)?"true":"false") << "\", "; + if(this->mMatchVisible) ss << "\"mMatchVisible\":\"" << ((this->mMatchVisible)?"true":"false") << "\", "; + if(this->mMatchSelectable) ss << "\"mMatchSelectable\":\"" << ((this->mMatchSelectable)?"true":"false") << "\", "; if(this->mParent) { ss << "\"mParent\":" << this->mParent->description(); } @@ -75,150 +77,162 @@ std::string UiSelector::description() return ss.str(); } -UiSelector *UiSelector::text(std::string text, bool match) +UiSelector *UiSelector::text(std::string text) { - this->mText = std::make_unique(text); - this->mMatchText = std::make_unique(match); + this->mText = text; + this->mMatchText = true; return this; } -UiSelector *UiSelector::pkg(std::string text, bool match) +UiSelector *UiSelector::pkg(std::string text) { - this->mPkg = std::make_unique(text); - this->mMatchPkg = std::make_unique(match); + this->mPkg = text; + this->mMatchPkg = true; return this; } -UiSelector *UiSelector::id(std::string text, bool match) +UiSelector *UiSelector::id(std::string text) { - this->mId = std::make_unique(text); - this->mMatchId = std::make_unique(match); + this->mId = text; + this->mMatchId = true; return this; } -UiSelector *UiSelector::automationid(std::string text, bool match) +UiSelector *UiSelector::automationid(std::string text) { - this->mAutomationId = std::make_unique(text); - this->mMatchAutomationId = std::make_unique(match); + this->mAutomationId = text; + this->mMatchAutomationId = true; return this; } -UiSelector *UiSelector::role(std::string text, bool match) +UiSelector *UiSelector::role(std::string text) { - this->mRole = std::make_unique(text); - this->mMatchRole = std::make_unique(match); + this->mRole = text; + this->mMatchRole = true; return this; } -UiSelector *UiSelector::type(std::string text, bool match) +UiSelector *UiSelector::type(std::string text) { - this->mType = std::make_unique(text); - this->mMatchType = std::make_unique(match); + this->mType = text; + this->mMatchType = true; return this; } -UiSelector *UiSelector::style(std::string text, bool match) +UiSelector *UiSelector::style(std::string text) { - this->mStyle = std::make_unique(text); - this->mMatchStyle = std::make_unique(match); + this->mStyle = text; + this->mMatchStyle = true; return this; } UiSelector *UiSelector::depth(int depth) { - this->mMinDepth = std::make_unique(depth); - this->mMaxDepth = std::make_unique(depth); + this->mMinDepth = depth; + this->mMaxDepth = depth; return this; } UiSelector *UiSelector::depth(int minDepth, int maxDepth) { - this->mMinDepth = std::make_unique(minDepth); - this->mMaxDepth = std::make_unique(maxDepth); + this->mMinDepth = minDepth; + this->mMaxDepth = maxDepth; return this; } UiSelector *UiSelector::minDepth(int depth) { - this->mMinDepth = std::make_unique(depth); + this->mMinDepth = depth; return this; } UiSelector *UiSelector::maxDepth(int depth) { - this->mMaxDepth = std::make_unique(depth); + this->mMaxDepth = depth; return this; } -UiSelector *UiSelector::isChecked(bool cond) +UiSelector *UiSelector::isChecked(bool condition) { - this->mIschecked = std::make_unique(cond); + this->mIschecked = condition; + this->mMatchChecked = true; return this; } -UiSelector *UiSelector::isCheckable(bool cond) +UiSelector *UiSelector::isCheckable(bool condition) { - this->mIscheckable = std::make_unique(cond); + this->mIscheckable = condition; + this->mMatchCheckable = true; return this; } -UiSelector *UiSelector::isClickable(bool cond) +UiSelector *UiSelector::isClickable(bool condition) { - this->mIsclickable = std::make_unique(cond); + this->mIsclickable = condition; + this->mMatchClickable = true; return this; } -UiSelector *UiSelector::isEnabled(bool cond) +UiSelector *UiSelector::isEnabled(bool condition) { - this->mIsenabled = std::make_unique(cond); + this->mIsenabled = condition; + this->mMatchEnabled = true; return this; } -UiSelector *UiSelector::isFocused(bool cond) +UiSelector *UiSelector::isFocused(bool condition) { - this->mIsfocused = std::make_unique(cond); + this->mIsfocused = condition; + this->mMatchFocused = true; return this; } -UiSelector *UiSelector::isFocusable(bool cond) +UiSelector *UiSelector::isFocusable(bool condition) { - this->mIsfocusable = std::make_unique(cond); + this->mIsfocusable = condition; + this->mMatchFocusable = true; return this; } -UiSelector *UiSelector::isScrollable(bool cond) +UiSelector *UiSelector::isScrollable(bool condition) { - this->mIsscrollable = std::make_unique(cond); + this->mIsscrollable = condition; + this->mMatchScrollable = true; return this; } -UiSelector *UiSelector::isSelected(bool cond) +UiSelector *UiSelector::isSelected(bool condition) { - this->mIsselected = std::make_unique(cond); + this->mIsselected = condition; + this->mMatchSelected = true; return this; } -UiSelector *UiSelector::isShowing(bool cond) +UiSelector *UiSelector::isShowing(bool condition) { - this->mIsshowing = std::make_unique(cond); + this->mIsshowing = condition; + this->mMatchShowing = true; return this; } -UiSelector *UiSelector::isActive(bool cond) +UiSelector *UiSelector::isActive(bool condition) { - this->mIsactive = std::make_unique(cond); + this->mIsactive = condition; + this->mMatchActive = true; return this; } -UiSelector *UiSelector::isVisible(bool cond) +UiSelector *UiSelector::isVisible(bool condition) { - this->mIsvisible = std::make_unique(cond); + this->mIsvisible = condition; + this->mMatchVisible = true; return this; } -UiSelector *UiSelector::isSelectable(bool cond) +UiSelector *UiSelector::isSelectable(bool condition) { - this->mIsselectable = std::make_unique(cond); + this->mIsselectable = condition; + this->mMatchSelectable = true; return this; } diff --git a/tests/Test_UiSelector.cc b/tests/Test_UiSelector.cc index 9f76683..3e2c79c 100644 --- a/tests/Test_UiSelector.cc +++ b/tests/Test_UiSelector.cc @@ -231,7 +231,7 @@ TEST_F(AurumTestUiSelector, Selector_Parent_P1) selpp->text("win1"); auto selp = std::make_shared(); - selp->text("node4", true)->fromParent(selpp); + selp->text("node4")->fromParent(selpp); auto sel = std::make_shared(); sel->text("node5")->fromParent(selp); @@ -244,7 +244,7 @@ TEST_F(AurumTestUiSelector, Selector_Parent_P1) TEST_F(AurumTestUiSelector, Selector_Parent_N2) { auto selpp = std::make_shared(); - selpp->text("win1", false)->role("window"); + selpp->text("win1")->role("window"); auto selp = std::make_shared(); selp->text("node4")->fromParent(selpp); -- 2.7.4 From 467611a21ab3293a161e686626ec956167609de1 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Mon, 18 Oct 2021 16:28:04 +0900 Subject: [PATCH 12/16] aurum: Use Aurum namespace This is for prepare Aurum 1.0 version release. namespaces - Aurum for public classes AurumInternal for internal headers such as atspi, impl classes AurumInternal::Mock for Mock wrapper. We will add more namespace if we added other back-end instead of ATSPI, or other Node type needed. Change-Id: Ia47ff40387d322e3e0932b3b0cda45b0d4a5f19a --- libaurum/inc/A11yEvent.h | 4 ++++ libaurum/inc/Accessibility/AccessibleApplication.h | 4 ++++ libaurum/inc/Accessibility/AccessibleNode.h | 4 ++++ libaurum/inc/Accessibility/AccessibleWatcher.h | 4 ++++ libaurum/inc/Accessibility/AccessibleWindow.h | 4 ++++ libaurum/inc/Accessibility/IEventConsumer.h | 4 ++++ libaurum/inc/Accessibility/IEventSource.h | 4 ++++ libaurum/inc/Comparer.h | 4 ++++ libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h | 6 ++++++ libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h | 6 ++++++ libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h | 6 ++++++ libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h | 6 ++++++ libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 4 ++++ libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h | 10 ++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleNode.h | 10 ++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h | 10 ++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h | 10 ++++++++++ libaurum/inc/Impl/MockDeviceImpl.h | 10 ++++++++++ libaurum/inc/Impl/TizenDeviceImpl.h | 6 ++++++ libaurum/inc/Interface/IDevice.h | 5 ++++- libaurum/inc/Interface/ISearchable.h | 4 ++++ libaurum/inc/Misc/Point2D.h | 4 ++++ libaurum/inc/Misc/Rect.h | 4 ++++ libaurum/inc/Misc/Size2D.h | 4 ++++ libaurum/inc/Misc/bitmask.h | 4 ++++ libaurum/inc/PartialMatch.h | 4 ++++ libaurum/inc/Runnable/Runnable.h | 4 ++++ libaurum/inc/Runnable/SendKeyRunnable.h | 4 ++++ libaurum/inc/Sel.h | 4 ++++ libaurum/inc/UiDevice.h | 4 ++++ libaurum/inc/UiObject.h | 4 ++++ libaurum/inc/UiScrollable.h | 5 +++++ libaurum/inc/UiSelector.h | 4 ++++ libaurum/inc/Until.h | 4 ++++ libaurum/inc/Waiter.h | 4 ++++ libaurum/src/A11yEvent.cc | 2 ++ libaurum/src/Accessibility/AccessibleApplication.cc | 2 ++ libaurum/src/Accessibility/AccessibleNode.cc | 2 ++ libaurum/src/Accessibility/AccessibleWatcher.cc | 3 +++ libaurum/src/Accessibility/AccessibleWindow.cc | 2 ++ libaurum/src/Comparer.cc | 2 ++ libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc | 3 +++ libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc | 3 +++ libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc | 3 +++ libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc | 3 +++ libaurum/src/Impl/Accessibility/AtspiWrapper.cc | 2 ++ libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc | 3 +++ libaurum/src/Impl/Accessibility/MockAccessibleNode.cc | 3 +++ libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc | 3 +++ libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc | 3 +++ libaurum/src/Impl/MockDeviceImpl.cc | 3 +++ libaurum/src/Impl/TizenDeviceImpl.cc | 3 +++ libaurum/src/PartialMatch.cc | 2 ++ libaurum/src/Runnable/SendKeyRunnable.cc | 2 ++ libaurum/src/Sel.cc | 2 ++ libaurum/src/UiDevice.cc | 3 +++ libaurum/src/UiObject.cc | 2 ++ libaurum/src/UiScrollable.cc | 3 ++- libaurum/src/UiSelector.cc | 2 ++ libaurum/src/Until.cc | 2 ++ libaurum/src/Waiter.cc | 2 ++ org.tizen.aurum-bootstrap/inc/ObjectMapper.h | 2 ++ tests/Test_Misc.cc | 1 - tests/Test_Sel.cc | 2 ++ tests/Test_UiDevice.cc | 2 ++ tests/Test_UiObject.cc | 2 ++ tests/Test_UiSelector.cc | 4 ++-- 67 files changed, 255 insertions(+), 5 deletions(-) diff --git a/libaurum/inc/A11yEvent.h b/libaurum/inc/A11yEvent.h index f7b23bd..c557979 100644 --- a/libaurum/inc/A11yEvent.h +++ b/libaurum/inc/A11yEvent.h @@ -21,6 +21,8 @@ #include "bitmask.h" #include +namespace Aurum { + /** * @class A11yEvent * @@ -144,4 +146,6 @@ protected: const std::string mPkg; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleApplication.h b/libaurum/inc/Accessibility/AccessibleApplication.h index 097d141..3a6daa0 100644 --- a/libaurum/inc/Accessibility/AccessibleApplication.h +++ b/libaurum/inc/Accessibility/AccessibleApplication.h @@ -23,6 +23,8 @@ #include +namespace Aurum { + /** * @class AccessibleApplication * @@ -98,4 +100,6 @@ private: std::shared_ptr mNode; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index a6956a4..b8b8d12 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -28,6 +28,8 @@ #include "Rect.h" #include "config.h" +namespace Aurum { + /** * @brief AccessibleNodeInterface enum class * @@ -424,4 +426,6 @@ private: mutable std::mutex mLock; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index d2977f2..cfaf72b 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -33,6 +33,8 @@ #include "config.h" +namespace Aurum { + /** * @class AccessibleWatcher * @@ -146,4 +148,6 @@ private: std::mutex mLock; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleWindow.h b/libaurum/inc/Accessibility/AccessibleWindow.h index f422d68..3d2c258 100644 --- a/libaurum/inc/Accessibility/AccessibleWindow.h +++ b/libaurum/inc/Accessibility/AccessibleWindow.h @@ -23,6 +23,8 @@ #include #include +namespace Aurum { + class AccessibleApplication; /** @@ -103,4 +105,6 @@ private: std::shared_ptr mNode; }; +} + #endif diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index d8cd29a..b7c0557 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -18,6 +18,8 @@ #ifndef _IEVENT_CONSUMER_H_ #define _IEVENT_CONSUMER_H_ +namespace Aurum { + /** * @class EventType * @@ -71,4 +73,6 @@ public: virtual void notify(int type1, int type2, void *src) = 0; }; +} + #endif diff --git a/libaurum/inc/Accessibility/IEventSource.h b/libaurum/inc/Accessibility/IEventSource.h index d1f6ce4..73f5c34 100644 --- a/libaurum/inc/Accessibility/IEventSource.h +++ b/libaurum/inc/Accessibility/IEventSource.h @@ -21,6 +21,8 @@ #include "IEventConsumer.h" #include +namespace Aurum { + /** * @class IEventSource * @@ -68,4 +70,6 @@ public: virtual void notifyAll(int type1, int type2, void *src) = 0; }; +} + #endif diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index ae1ccab..c64afeb 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -30,6 +30,8 @@ #include #include +namespace Aurum { + /** * @class Comparer * @@ -127,4 +129,6 @@ private: bool mEarlyReturn; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h index a6cdb80..2bdcbac 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h @@ -23,6 +23,10 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + /** * @internal * @@ -63,4 +67,6 @@ public: std::string getPackageName(void) override; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index b916c1b..2935faa 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -21,6 +21,10 @@ #include "AccessibleNode.h" #include +using namespace Aurum; + +namespace AurumInternal { + /** * @brief AtspiAccessibleNode is inherited from AccessibleNode class. * It manages object informations which from atspi server. @@ -144,4 +148,6 @@ private: AtspiAccessible *mNode; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index f4ed61f..8ce234b 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -32,6 +32,10 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + /** * @internal * @@ -157,4 +161,6 @@ private: static std::mutex mMutex; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h index e9d6f71..1e71af3 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h @@ -20,6 +20,10 @@ #include "AccessibleWindow.h" +using namespace Aurum; + +namespace AurumInternal { + /** * @internal * @@ -50,4 +54,6 @@ public: }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index ee603d6..b3928fb 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -21,6 +21,8 @@ #include #include +namespace AurumInternal { + /** * @internal * @@ -61,4 +63,6 @@ private: static std::recursive_mutex mMutex; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h index c2e03e8..942e779 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h @@ -24,6 +24,12 @@ #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleApplication : public AccessibleApplication, public std::enable_shared_from_this { public: /** @@ -83,4 +89,8 @@ private: std::vector> mWindowList; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h index 67cde40..110b6e1 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h @@ -23,6 +23,12 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleNode : public AccessibleNode { public: /** @@ -202,4 +208,8 @@ private: std::mutex mLock; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index 18dd60d..b36381a 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -28,6 +28,12 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleWatcher : public AccessibleWatcher { public: /** @@ -91,4 +97,8 @@ private: std::map> mActiveAppMap; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h index a978089..df214ef 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h @@ -21,6 +21,12 @@ #include "AccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleApplication; class MockAccessibleWindow : public AccessibleWindow { @@ -51,4 +57,8 @@ private: std::shared_ptr mMockNode; }; +} + +} + #endif \ No newline at end of file diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index 93705c1..7517471 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -27,6 +27,12 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + enum class MockKeyType { BACK, HOME, @@ -294,4 +300,8 @@ public: Size2D mScreenSize; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index 0bcbff9..4e16377 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -24,6 +24,10 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + class TizenDeviceImpl : public IDevice { public: TizenDeviceImpl(); @@ -198,4 +202,6 @@ private: Size2D mScreenSize; }; +} + #endif \ No newline at end of file diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index 85b213e..5d979d6 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -19,10 +19,11 @@ #define _IDEVICE_H_ #include "config.h" -#include "Rect.h" #include "Size2D.h" #include +namespace Aurum { + /** * @brief TimeRequestType enum class. * @@ -277,4 +278,6 @@ public: virtual const Size2D getScreenSize() = 0; }; +} + #endif diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h index fe25b09..e02bbcf 100644 --- a/libaurum/inc/Interface/ISearchable.h +++ b/libaurum/inc/Interface/ISearchable.h @@ -25,6 +25,8 @@ #include #include +namespace Aurum { + class UiObject; /** @@ -79,4 +81,6 @@ public: const std::shared_ptr selector) const = 0; }; +} + #endif diff --git a/libaurum/inc/Misc/Point2D.h b/libaurum/inc/Misc/Point2D.h index 1baddb9..634d779 100644 --- a/libaurum/inc/Misc/Point2D.h +++ b/libaurum/inc/Misc/Point2D.h @@ -18,6 +18,8 @@ #ifndef _POINT2D_H_ #define _POINT2D_H_ +namespace Aurum { + /** * @class Point2D * @@ -94,4 +96,6 @@ public: T y; }; +} + #endif diff --git a/libaurum/inc/Misc/Rect.h b/libaurum/inc/Misc/Rect.h index 5984670..9d935ed 100644 --- a/libaurum/inc/Misc/Rect.h +++ b/libaurum/inc/Misc/Rect.h @@ -20,6 +20,8 @@ #include "Point2D.h" +namespace Aurum { + /** * @class Rect * @@ -141,4 +143,6 @@ public: Point2D mBottomRight; }; +} + #endif diff --git a/libaurum/inc/Misc/Size2D.h b/libaurum/inc/Misc/Size2D.h index c8e1459..e44ef04 100644 --- a/libaurum/inc/Misc/Size2D.h +++ b/libaurum/inc/Misc/Size2D.h @@ -18,6 +18,8 @@ #ifndef _SIZE2D_H_ #define _SIZE2D_H_ +namespace Aurum { + /** * @brief Size2D Class. * This class for represent specific obejct's size as width and height. @@ -80,4 +82,6 @@ public: T height; }; +} + #endif diff --git a/libaurum/inc/Misc/bitmask.h b/libaurum/inc/Misc/bitmask.h index bcbca84..cbfef0b 100644 --- a/libaurum/inc/Misc/bitmask.h +++ b/libaurum/inc/Misc/bitmask.h @@ -20,6 +20,8 @@ #include +namespace Aurum { + template struct enable_bitmask_operators{ static const bool enable=false; @@ -89,4 +91,6 @@ operator^=(E& lhs,E rhs){ return lhs; } +} + #endif diff --git a/libaurum/inc/PartialMatch.h b/libaurum/inc/PartialMatch.h index bb8fb44..10fb59f 100644 --- a/libaurum/inc/PartialMatch.h +++ b/libaurum/inc/PartialMatch.h @@ -25,6 +25,8 @@ #include "AccessibleNode.h" #include "UiSelector.h" +namespace Aurum { + /** * @class PartialMatch * @@ -165,4 +167,6 @@ private: std::list> mPartialMatches; }; +} + #endif diff --git a/libaurum/inc/Runnable/Runnable.h b/libaurum/inc/Runnable/Runnable.h index 22b7723..b6b14f2 100644 --- a/libaurum/inc/Runnable/Runnable.h +++ b/libaurum/inc/Runnable/Runnable.h @@ -18,6 +18,8 @@ #ifndef _RUNNABLE_H_ #define _RUNNABLE_H_ +namespace Aurum { + /** * @class Runnable * @@ -43,4 +45,6 @@ public: virtual void run() const = 0; }; +} + #endif diff --git a/libaurum/inc/Runnable/SendKeyRunnable.h b/libaurum/inc/Runnable/SendKeyRunnable.h index 91f80dc..115166f 100644 --- a/libaurum/inc/Runnable/SendKeyRunnable.h +++ b/libaurum/inc/Runnable/SendKeyRunnable.h @@ -22,6 +22,8 @@ #include "Runnable.h" +namespace Aurum { + /** * @class SendKeyRunnable * @@ -49,4 +51,6 @@ public: void run() const override; }; +} + #endif diff --git a/libaurum/inc/Sel.h b/libaurum/inc/Sel.h index 9d75ab0..ae052d7 100644 --- a/libaurum/inc/Sel.h +++ b/libaurum/inc/Sel.h @@ -25,6 +25,8 @@ #include "UiSelector.h" +namespace Aurum { + /** * @class Sel * @@ -80,4 +82,6 @@ public: static std::shared_ptr depth(int depth); }; +} + #endif diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index f3ddcbb..2e5a3ff 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -35,6 +35,8 @@ #include #include +namespace Aurum { + /** * @class UiDevice * @@ -403,4 +405,6 @@ private: const Waiter *mWaiter; }; +} + #endif diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index b725b7d..08b3a3d 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -28,6 +28,8 @@ #include #include +namespace Aurum { + class UiDevice; /** @@ -511,4 +513,6 @@ private: static const unsigned int LOGNCLICK_INTERVAL = 500; }; +} + #endif diff --git a/libaurum/inc/UiScrollable.h b/libaurum/inc/UiScrollable.h index 090e746..0e27e81 100644 --- a/libaurum/inc/UiScrollable.h +++ b/libaurum/inc/UiScrollable.h @@ -20,6 +20,9 @@ #include "UiObject.h" #include + +namespace Aurum { + /** * @brief UiScrollable class * @since_tizen 5.5 @@ -96,4 +99,6 @@ private: int mScrollStep; }; +} + #endif diff --git a/libaurum/inc/UiSelector.h b/libaurum/inc/UiSelector.h index 37ade0c..25ef153 100644 --- a/libaurum/inc/UiSelector.h +++ b/libaurum/inc/UiSelector.h @@ -24,6 +24,8 @@ #include #include +namespace Aurum { + /** * @class UiSelector * @@ -383,4 +385,6 @@ public: std::shared_ptr mParent; }; +} + #endif diff --git a/libaurum/inc/Until.h b/libaurum/inc/Until.h index a67e45f..167ff48 100644 --- a/libaurum/inc/Until.h +++ b/libaurum/inc/Until.h @@ -22,6 +22,8 @@ #include "ISearchable.h" #include "UiSelector.h" +namespace Aurum { + /** * @class Until * @@ -115,4 +117,6 @@ public: const bool isCheckable); }; +} + #endif diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index 5c0c935..6f5a647 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -22,6 +22,8 @@ #include +namespace Aurum { + /** * @class Waiter * @@ -90,4 +92,6 @@ private: const int WAIT_TIMEOUT_MS; }; +} + #endif diff --git a/libaurum/src/A11yEvent.cc b/libaurum/src/A11yEvent.cc index b9f205b..86f5d6c 100644 --- a/libaurum/src/A11yEvent.cc +++ b/libaurum/src/A11yEvent.cc @@ -19,6 +19,8 @@ #include +using namespace Aurum; + A11yEventInfo::A11yEventInfo() : A11yEventInfo(A11yEvent::EVENT_NONE, nullptr, nullptr) {} A11yEventInfo::~A11yEventInfo() {} diff --git a/libaurum/src/Accessibility/AccessibleApplication.cc b/libaurum/src/Accessibility/AccessibleApplication.cc index 127e995..bbccc78 100644 --- a/libaurum/src/Accessibility/AccessibleApplication.cc +++ b/libaurum/src/Accessibility/AccessibleApplication.cc @@ -19,6 +19,8 @@ #include +using namespace Aurum; + AccessibleApplication::AccessibleApplication(std::shared_ptr node) : mNode{node} { diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc index 45c3993..d4bfb68 100644 --- a/libaurum/src/Accessibility/AccessibleNode.cc +++ b/libaurum/src/Accessibility/AccessibleNode.cc @@ -24,6 +24,8 @@ #include "config.h" #include +using namespace Aurum; + AccessibleNode::~AccessibleNode() { } diff --git a/libaurum/src/Accessibility/AccessibleWatcher.cc b/libaurum/src/Accessibility/AccessibleWatcher.cc index 5b6bc3a..d26461d 100644 --- a/libaurum/src/Accessibility/AccessibleWatcher.cc +++ b/libaurum/src/Accessibility/AccessibleWatcher.cc @@ -27,6 +27,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + AccessibleWatcher::AccessibleWatcher() :mSources{}, mLock{} { diff --git a/libaurum/src/Accessibility/AccessibleWindow.cc b/libaurum/src/Accessibility/AccessibleWindow.cc index ea2315c..c2bc794 100644 --- a/libaurum/src/Accessibility/AccessibleWindow.cc +++ b/libaurum/src/Accessibility/AccessibleWindow.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + AccessibleWindow::AccessibleWindow(std::shared_ptr app, std::shared_ptr node) : mApp{app}, mNode{node} { diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc index f5ebdf2..634d2e2 100644 --- a/libaurum/src/Comparer.cc +++ b/libaurum/src/Comparer.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + Comparer::Comparer(const std::shared_ptr device, const std::shared_ptr selector, const bool &earlyReturn) : mDevice(device), mSelector(selector), mEarlyReturn(earlyReturn) diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc index 4cd1327..6850096 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc @@ -22,6 +22,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + AtspiAccessibleApplication::AtspiAccessibleApplication(std::shared_ptr node) : AccessibleApplication(node) { diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc index 6a0575d..13d9373 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc @@ -22,6 +22,9 @@ #include +using namespace Aurum; +using namespace AurumInternal; + AtspiAccessibleNode::AtspiAccessibleNode(AtspiAccessible *node) : mNode{node} { diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index a167104..2c14713 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -28,6 +28,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + #define COMPARE(A, B) \ (B != A11yEvent::EVENT_NONE) && ((A & B) == B) diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc index 6968cae..053fcef 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc @@ -18,6 +18,9 @@ #include "AtspiAccessibleWindow.h" #include "AtspiWrapper.h" +using namespace Aurum; +using namespace AurumInternal; + AtspiAccessibleWindow::AtspiAccessibleWindow(std::shared_ptr app, std::shared_ptr node) : AccessibleWindow(app, node) { diff --git a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc index fdf6e26..f41b7f0 100644 --- a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc +++ b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc @@ -17,6 +17,8 @@ #include "AtspiWrapper.h" +using namespace AurumInternal; + std::recursive_mutex AtspiWrapper::mMutex = std::recursive_mutex{}; GArray *AtspiWrapper::Atspi_state_set_get_states(AtspiStateSet *set) diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc b/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc index e01ee5c..efe80fa 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc @@ -21,6 +21,9 @@ #include +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleApplication::MockAccessibleApplication(std::shared_ptr node) : AccessibleApplication(node), mWindowList{} { diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc index 795c8e7..5497dc2 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc @@ -21,6 +21,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleNode::MockAccessibleNode(std::shared_ptr parent, std::string text, std::string pkg, std::string role, std::string res, std::string type, std::string style,std::string automationId, Rect screenBoundingBox, int supportingIfaces,int featureProperty) : mParentNode(parent), mChildrenList{}, mActionSet{} { diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc index 05fec2f..52f5373 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc @@ -20,6 +20,9 @@ #include "MockAccessibleApplication.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleWatcher::MockAccessibleWatcher() { } diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc b/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc index 9941ac4..f20b351 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc @@ -19,6 +19,9 @@ #include "MockAccessibleApplication.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleWindow::MockAccessibleWindow(std::shared_ptr app, std::shared_ptr node) : AccessibleWindow(app, node), mMockNode{node} { diff --git a/libaurum/src/Impl/MockDeviceImpl.cc b/libaurum/src/Impl/MockDeviceImpl.cc index e05ceee..629329c 100644 --- a/libaurum/src/Impl/MockDeviceImpl.cc +++ b/libaurum/src/Impl/MockDeviceImpl.cc @@ -34,6 +34,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal::Mock; + #define NANO_SEC 1000000000.0 #define MICRO_SEC 1000000 diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index a5ffd01..1040f5c 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -32,6 +32,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + #define NANO_SEC 1000000000.0 #define MICRO_SEC 1000000 diff --git a/libaurum/src/PartialMatch.cc b/libaurum/src/PartialMatch.cc index 3b3e4eb..796c869 100644 --- a/libaurum/src/PartialMatch.cc +++ b/libaurum/src/PartialMatch.cc @@ -22,6 +22,8 @@ #include #include +using namespace Aurum; + bool PartialMatch::checkCriteria(const std::string textA, const std::string textB) { std::regex re(textA); diff --git a/libaurum/src/Runnable/SendKeyRunnable.cc b/libaurum/src/Runnable/SendKeyRunnable.cc index 3044426..a7e6ca5 100644 --- a/libaurum/src/Runnable/SendKeyRunnable.cc +++ b/libaurum/src/Runnable/SendKeyRunnable.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + SendKeyRunnable::SendKeyRunnable(std::string keycode) : mKeycode{keycode} { diff --git a/libaurum/src/Sel.cc b/libaurum/src/Sel.cc index 484ffca..282f28d 100644 --- a/libaurum/src/Sel.cc +++ b/libaurum/src/Sel.cc @@ -18,6 +18,8 @@ #include "Aurum.h" #include +using namespace Aurum; + std::shared_ptr Sel::text(std::string text) { std::shared_ptr sel = std::make_shared(); diff --git a/libaurum/src/UiDevice.cc b/libaurum/src/UiDevice.cc index 5643f3a..bafa6d7 100644 --- a/libaurum/src/UiDevice.cc +++ b/libaurum/src/UiDevice.cc @@ -30,6 +30,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + UiDevice::UiDevice() : UiDevice(nullptr) {} UiDevice::UiDevice(IDevice *impl) diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index 101f90f..7d4ebcc 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -23,6 +23,8 @@ #include #include +using namespace Aurum; + UiObject::UiObject() : UiObject(nullptr, nullptr, nullptr) {} UiObject::~UiObject() diff --git a/libaurum/src/UiScrollable.cc b/libaurum/src/UiScrollable.cc index 9a2eb57..c2c7aa3 100644 --- a/libaurum/src/UiScrollable.cc +++ b/libaurum/src/UiScrollable.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + UiScrollable::UiScrollable(std::shared_ptr selector) : mSelector{selector}, mMaxSearchSwipe{100}, mScrollStep{50} { @@ -54,7 +56,6 @@ bool UiScrollable::scrollForward() bool UiScrollable::scrollForward(int steps) { - //TODO Check Scree Size here return true; diff --git a/libaurum/src/UiSelector.cc b/libaurum/src/UiSelector.cc index 9f7b9bd..25af9e8 100644 --- a/libaurum/src/UiSelector.cc +++ b/libaurum/src/UiSelector.cc @@ -19,6 +19,8 @@ #include #include +using namespace Aurum; + UiSelector::UiSelector() : mId{}, mAutomationId{}, mRole{}, mText{}, mPkg{}, mType{}, mStyle{}, mMatchId{}, mMatchAutomationId{}, mMatchRole{}, mMatchText{}, mMatchPkg{}, mMatchType{}, mMatchStyle{}, diff --git a/libaurum/src/Until.cc b/libaurum/src/Until.cc index c6951c5..3a30831 100644 --- a/libaurum/src/Until.cc +++ b/libaurum/src/Until.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + std::function Until::hasObject( const std::shared_ptr selector) { diff --git a/libaurum/src/Waiter.cc b/libaurum/src/Waiter.cc index 6b852d0..43c8194 100644 --- a/libaurum/src/Waiter.cc +++ b/libaurum/src/Waiter.cc @@ -20,6 +20,8 @@ #include #include +using namespace Aurum; + Waiter::Waiter() : Waiter(nullptr) {} Waiter::~Waiter() {} diff --git a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h index 8326266..6bf7af7 100644 --- a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h +++ b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h @@ -23,6 +23,8 @@ #include "UiObject.h" +using namespace Aurum; + class ObjectMapper { private: std::map> mObjectMap; diff --git a/tests/Test_Misc.cc b/tests/Test_Misc.cc index d6793f7..99e6a63 100644 --- a/tests/Test_Misc.cc +++ b/tests/Test_Misc.cc @@ -15,7 +15,6 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" - class AurumTestMisc : public ::testing::Test { public: AurumTestMisc(){ diff --git a/tests/Test_Sel.cc b/tests/Test_Sel.cc index cef1c7f..b9ff53b 100644 --- a/tests/Test_Sel.cc +++ b/tests/Test_Sel.cc @@ -15,6 +15,8 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestSel : public ::testing::Test { public: diff --git a/tests/Test_UiDevice.cc b/tests/Test_UiDevice.cc index b46b312..4e09236 100644 --- a/tests/Test_UiDevice.cc +++ b/tests/Test_UiDevice.cc @@ -18,6 +18,8 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestUiDevice : public ::testing::Test { public: diff --git a/tests/Test_UiObject.cc b/tests/Test_UiObject.cc index 6820f93..9f20ca8 100644 --- a/tests/Test_UiObject.cc +++ b/tests/Test_UiObject.cc @@ -19,6 +19,8 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestUiObject : public ::testing::Test { public: diff --git a/tests/Test_UiSelector.cc b/tests/Test_UiSelector.cc index 3e2c79c..bdf6861 100644 --- a/tests/Test_UiSelector.cc +++ b/tests/Test_UiSelector.cc @@ -10,13 +10,13 @@ #include #include - - #include "MockAccessibleWatcher.h" #include "MockAccessibleApplication.h" #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestUiSelector : public ::testing::Test { public: -- 2.7.4 From ec5d53122371b65ebe26664be412c1a38cf8c156 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 4 Nov 2021 20:20:05 +0900 Subject: [PATCH 13/16] libaurum: Fix released tizen version as 6.5 aurum 1.0 will release since tizen 6.5. Change-Id: I3509c94d5849f5c1682f2c2e3f9d302b9f5a26a4 --- libaurum/inc/A11yEvent.h | 16 ++--- libaurum/inc/Accessibility/AccessibleApplication.h | 14 ++-- libaurum/inc/Accessibility/AccessibleNode.h | 38 +++++----- libaurum/inc/Accessibility/AccessibleWatcher.h | 14 ++-- libaurum/inc/Accessibility/AccessibleWindow.h | 14 ++-- libaurum/inc/Accessibility/IEventConsumer.h | 4 +- libaurum/inc/Accessibility/IEventSource.h | 8 +-- libaurum/inc/Comparer.h | 12 ++-- .../Accessibility/AtspiAccessibleApplication.h | 4 +- .../inc/Impl/Accessibility/AtspiAccessibleNode.h | 6 +- .../Impl/Accessibility/AtspiAccessibleWatcher.h | 12 ++-- .../inc/Impl/Accessibility/AtspiAccessibleWindow.h | 4 +- .../inc/Impl/Accessibility/MockAccessibleNode.h | 36 +++++----- .../inc/Impl/Accessibility/MockAccessibleWatcher.h | 14 ++-- .../inc/Impl/Accessibility/MockAccessibleWindow.h | 6 +- libaurum/inc/Impl/MockDeviceImpl.h | 54 +++++++------- libaurum/inc/Impl/TizenDeviceImpl.h | 14 ++-- libaurum/inc/Interface/IDevice.h | 42 +++++------ libaurum/inc/Interface/ISearchable.h | 8 +-- libaurum/inc/Misc/Point2D.h | 10 +-- libaurum/inc/Misc/Rect.h | 18 ++--- libaurum/inc/PartialMatch.h | 20 +++--- libaurum/inc/Runnable/Runnable.h | 4 +- libaurum/inc/Runnable/SendKeyRunnable.h | 2 +- libaurum/inc/Sel.h | 8 +-- libaurum/inc/UiDevice.h | 52 +++++++------- libaurum/inc/UiObject.h | 82 +++++++++++----------- libaurum/inc/UiScrollable.h | 20 +++--- libaurum/inc/UiSelector.h | 56 +++++++-------- libaurum/inc/Until.h | 16 ++--- libaurum/inc/Waiter.h | 10 +-- 31 files changed, 309 insertions(+), 309 deletions(-) diff --git a/libaurum/inc/A11yEvent.h b/libaurum/inc/A11yEvent.h index c557979..cbf402f 100644 --- a/libaurum/inc/A11yEvent.h +++ b/libaurum/inc/A11yEvent.h @@ -68,7 +68,7 @@ public: /** * @brief A11yEventInfo constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ A11yEventInfo(); @@ -79,7 +79,7 @@ public: * @param[in] name name of the ATSPI event * @param[in] package event occured package name * - * @since_tizen 5.5 + * @since_tizen 6.5 */ A11yEventInfo(A11yEvent event, std::string name = "", std::string package = ""); @@ -90,14 +90,14 @@ public: * @param[in] name name of the ATSPI event * @param[in] package event occured package name * - * @since_tizen 5.5 + * @since_tizen 6.5 */ A11yEventInfo(std::string event, std::string name = "", std::string package = ""); /** * @brief A11yEventInfo destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~A11yEventInfo(); @@ -107,7 +107,7 @@ public: * * @return @A11yEvent * - * @since_tizen 5.5 + * @since_tizen 6.5 */ A11yEvent getEvent(); @@ -118,7 +118,7 @@ public: * * @return @A11yEvent * - * @since_tizen 5.5 + * @since_tizen 6.5 */ A11yEvent getEvent(std::string event); @@ -127,7 +127,7 @@ public: * * @return name string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getName(); @@ -136,7 +136,7 @@ public: * * @return package name string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getPkg(); diff --git a/libaurum/inc/Accessibility/AccessibleApplication.h b/libaurum/inc/Accessibility/AccessibleApplication.h index 3a6daa0..59918b2 100644 --- a/libaurum/inc/Accessibility/AccessibleApplication.h +++ b/libaurum/inc/Accessibility/AccessibleApplication.h @@ -38,14 +38,14 @@ public: /** * @brief AccessibleApplication constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ AccessibleApplication(std::shared_ptr node); /** * @brief AccessibleApplication destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~AccessibleApplication(); @@ -55,7 +55,7 @@ public: * * @return @AccessibleNode * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getAccessibleNode(); @@ -64,7 +64,7 @@ public: * * @return true if it actives, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isActive(void); @@ -74,7 +74,7 @@ public: * * @return @AccessibleWindow vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::vector> getWindows(void) = 0; @@ -83,7 +83,7 @@ public: * * @return @AccessibleWindow vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::vector> getActiveWindows(void); @@ -92,7 +92,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::string getPackageName(void) = 0; diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index b8b8d12..ee0c07d 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -33,7 +33,7 @@ namespace Aurum { /** * @brief AccessibleNodeInterface enum class * - * @since_tizen 5.5 + * @since_tizen 6.5 */ enum class AccessibleNodeInterface { ACTION = 0x0001, @@ -57,7 +57,7 @@ enum class AccessibleNodeInterface { /** * @brief NodeFeatureProperties enum class * - * @since_tizen 5.5 + * @since_tizen 6.5 */ enum class NodeFeatureProperties { CHECKABLE = 0x0001, @@ -81,21 +81,21 @@ enum class NodeFeatureProperties { /** * @brief AccessibleNode Class that provides the abstracted object information to uses. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ class AccessibleNode : public std::enable_shared_from_this, public IEventConsumer { public: /** * @brief AccessibleNode constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ AccessibleNode(); /** * @brief AccessibleNode desctructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~AccessibleNode(); @@ -104,7 +104,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string description(); @@ -137,14 +137,14 @@ public: * @param[in] type2 @ObjectEventType * @param[in] src Atspi Node ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void notify(int type, int type2, void *src) override; /** * @brief Changes Node state to invalidate. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void invalidate(); @@ -265,7 +265,7 @@ public: * * @param[in] int depth * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void print(int); @@ -275,7 +275,7 @@ public: * @param[in] int depth * @param[in] int maxdepth * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void print(int, int); @@ -284,7 +284,7 @@ public: * * @return Atspi node ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void* getRawHandler(void) const = 0; @@ -326,7 +326,7 @@ public: /** * @brief Updates Node information from atspi server. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void refresh() = 0; @@ -335,7 +335,7 @@ public: * * @return string vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::vector getActions() const = 0; @@ -346,7 +346,7 @@ public: * * @return true if success, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool doAction(std::string action) = 0; @@ -355,7 +355,7 @@ public: * * @param[in] text string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void setValue(std::string text) = 0; @@ -364,7 +364,7 @@ public: * * @return true if valid, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool isValid() const; @@ -376,7 +376,7 @@ public: * * @return true if supporting, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isSupporting(AccessibleNodeInterface thisIface) const; @@ -387,7 +387,7 @@ public: * * @return true if has, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool hasFeatureProperty(NodeFeatureProperties prop) const; @@ -397,7 +397,7 @@ public: * @param[in] prop @NodeFeatureProperties * @param[in] has Node has given property ot not * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void setFeatureProperty(NodeFeatureProperties prop, bool has); diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index cfaf72b..bdc5fb3 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -48,21 +48,21 @@ public: /** * @brief AccessibleWatcher constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ AccessibleWatcher(); /** * @brief AccessibleWatcher destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~AccessibleWatcher(); /** * @brief Gets @AccessibleWatcher instance. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static AccessibleWatcher *getInstance(AccessibleWatcher *watcherImpl = nullptr); @@ -72,7 +72,7 @@ public: * * @return application count * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual int getApplicationCount(void) const = 0; @@ -83,7 +83,7 @@ public: * * @return @AccessibleApplication ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::shared_ptr getApplicationAt(int index) const = 0; @@ -92,7 +92,7 @@ public: * * @return @AccessibleApplication vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::vector> getApplications(void) const = 0; @@ -123,7 +123,7 @@ public: * * @return @AccessibleApplication vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::vector> getActiveApplications(void) const; diff --git a/libaurum/inc/Accessibility/AccessibleWindow.h b/libaurum/inc/Accessibility/AccessibleWindow.h index 3d2c258..ee1266d 100644 --- a/libaurum/inc/Accessibility/AccessibleWindow.h +++ b/libaurum/inc/Accessibility/AccessibleWindow.h @@ -43,14 +43,14 @@ public: * @param[in] app @AccessibleApplication * @param[in] node @AccessibleNode * - * @since_tizen 6.0 + * @since_tizen 6.5 */ AccessibleWindow(std::shared_ptr app, std::shared_ptr node); /** * @brief AccessibleWindow destructor. * - * @since_tizen 6.0 + * @since_tizen 6.5 */ virtual ~AccessibleWindow(); @@ -60,7 +60,7 @@ public: * * @return string * - * @since_tizen 6.0 + * @since_tizen 6.5 */ std::string getTitle(void); @@ -69,7 +69,7 @@ public: * * @return true if it is showing, else false * - * @since_tizen 6.0 + * @since_tizen 6.5 */ bool isShowing(); @@ -78,7 +78,7 @@ public: * * @return true if it actives, else false * - * @since_tizen 6.0 + * @since_tizen 6.5 */ bool isActive(); @@ -87,7 +87,7 @@ public: * * @return @AccessibleApplication ptr * - * @since_tizen 6.0 + * @since_tizen 6.5 */ std::shared_ptr getApplication(void); @@ -96,7 +96,7 @@ public: * * @return @AccessibleNode * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getAccessibleNode(void); diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index b7c0557..5ed0915 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -57,7 +57,7 @@ public: /** * @brief IEventConsumer destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~IEventConsumer() {}; @@ -68,7 +68,7 @@ public: * @param[in] type2 @ObjectEventType * @param[in] src source Node ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void notify(int type1, int type2, void *src) = 0; }; diff --git a/libaurum/inc/Accessibility/IEventSource.h b/libaurum/inc/Accessibility/IEventSource.h index 73f5c34..f3cf2d7 100644 --- a/libaurum/inc/Accessibility/IEventSource.h +++ b/libaurum/inc/Accessibility/IEventSource.h @@ -36,7 +36,7 @@ public: /** * @brief IEventSource destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~IEventSource() {}; @@ -45,7 +45,7 @@ public: * * @param[in] source @IEventConsumer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void attach(std::shared_ptr source) = 0; @@ -54,7 +54,7 @@ public: * * @param[in] source @IEventConsumer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void detach(std::shared_ptr source) = 0; @@ -65,7 +65,7 @@ public: * @param[in] type2 @ObjectEventType * @param[in] src source Node ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void notifyAll(int type1, int type2, void *src) = 0; }; diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index c64afeb..955a8b2 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -48,7 +48,7 @@ private: * @param[in] selector @UiSelctor * @param[in] earlyReturn flag for early return * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Comparer(const std::shared_ptr device, const std::shared_ptr selector, const bool &earlyReturn); @@ -56,7 +56,7 @@ private: /** * @brief Comparer destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~Comparer(); @@ -71,7 +71,7 @@ public: * * @return AccessibleNode if found, else nulltpr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr findObject(const std::shared_ptr device, const std::shared_ptr selector, @@ -89,7 +89,7 @@ public: * * @return AccessibleNode if found, else nulltpr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::vector> findObjects( const std::shared_ptr device, const std::shared_ptr selector, @@ -103,7 +103,7 @@ private: * * @param[in] root @AccessibleNode * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector> findObjects(const std::shared_ptr root); @@ -117,7 +117,7 @@ private: * @param[in] depth tree depth * @param[in] partialMatches @PartialMatch list * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector> findObjects( const std::shared_ptr root, const int &index, const int &depth, diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h index 2bdcbac..fd1dd5f 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h @@ -44,14 +44,14 @@ public: * * @param[in] node @AccessibleNode * - * @since_tizen 6.0 + * @since_tizen 6.5 */ AtspiAccessibleApplication(std::shared_ptr node); /** * @brief AtspiAccessibleApplication destructor. * - * @since_tizen 6.0 + * @since_tizen 6.5 */ virtual ~AtspiAccessibleApplication(); diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index 2935faa..42b7c3b 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -29,7 +29,7 @@ namespace AurumInternal { * @brief AtspiAccessibleNode is inherited from AccessibleNode class. * It manages object informations which from atspi server. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ class AtspiAccessibleNode : public AccessibleNode { public: @@ -38,14 +38,14 @@ public: * * @param[in] node AtspiAccessible ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ AtspiAccessibleNode(AtspiAccessible *node); /** * @brief AtspiAccessibleNode desctructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~AtspiAccessibleNode() override; diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index 8ce234b..4e5c8f1 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -41,7 +41,7 @@ namespace AurumInternal { * * @brief WindowActivateInfoType enum class. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ enum class WindowActivateInfoType { DEFAULT_LABEL_ENALBED = 0x00, @@ -54,19 +54,19 @@ enum class WindowActivateInfoType { * @internal * * @brief IAtspiEvents Interface - * @since_tizen 5.5 + * @since_tizen 6.5 */ class IAtspiEvents { public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~IAtspiEvents() {} /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void onObjectDefunct(AtspiAccessible *node) = 0; }; @@ -119,7 +119,7 @@ public: * @param[in] event AtspiEvent * @param[in] watcher @AtspiAccessibleWatcher * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static void onAtspiEvents(AtspiEvent *event, void *watcher); @@ -128,7 +128,7 @@ public: * * @param[in] node @AtspiAccessible * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void onObjectDefunct(AtspiAccessible *node) override; diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h index 1e71af3..698dab7 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h @@ -41,14 +41,14 @@ public: * @param[in] app @AccessibleApplication * @param[in] node @AccessibleNode * - * @since_tizen 5.5 + * @since_tizen 6.5 */ AtspiAccessibleWindow(std::shared_ptr app, std::shared_ptr node); /** * @brief AtspiAccessibleWindow desturctor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~AtspiAccessibleWindow(); diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h index 110b6e1..2071c81 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h @@ -33,45 +33,45 @@ class MockAccessibleNode : public AccessibleNode { public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ MockAccessibleNode(std::shared_ptr parent, std::string text,std::string pkg,std::string role, std::string id, std::string type,std::string style, std::string automationId, Rect screenBoundingBox,int supportingIfaces,int featureProperty); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~MockAccessibleNode() override; public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ int getChildCount() const override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getChildAt(int index) const override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector> getChildren() const override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getParent() const override; public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void* getRawHandler(void) const override; @@ -119,25 +119,25 @@ public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void refresh() override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector getActions() const override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool doAction(std::string action) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void setValue(std::string text) override; @@ -145,44 +145,44 @@ public: using AccessibleNode::setFeatureProperty; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void setFeatureProperty(int type); public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void addChild(std::shared_ptr child); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr addChild(std::string text, std::string pkg, std::string role, std::string res, std::string type, std::string style,std::string automationId, Rect geometry, int ifaces, int properties); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void clearChildren(void); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void addAction(std::string action); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void clearActions(void); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void setProperties(std::string text,std::string pkg, std::string role, std::string res, std::string type, std::string style,std::string automationId, Rect screenBoundingBox, int supportingIfaces, int featureProperty); diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index b36381a..68dace7 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -38,32 +38,32 @@ class MockAccessibleWatcher : public AccessibleWatcher { public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ MockAccessibleWatcher(); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~MockAccessibleWatcher(); public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual int getApplicationCount(void) const override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::shared_ptr getApplicationAt(int index) const override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::vector> getApplications(void) const override; @@ -78,13 +78,13 @@ public: public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void addApplication(std::shared_ptr application); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr addApplication(std::string pkgName, Rect geometry, int ifaces, int properties); diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h index df214ef..79673a8 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h @@ -33,20 +33,20 @@ class MockAccessibleWindow : public AccessibleWindow { public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ MockAccessibleWindow(std::shared_ptr app, std::shared_ptr node); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~MockAccessibleWindow(); public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr addNode(std::string text, std::string pkg, std::string role, std::string res, std::string type, std::string style, std::string automationId, Rect geometry, int ifaces, int properties); diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index 7517471..41e2cd1 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -48,116 +48,116 @@ class MockDeviceImpl : public IDevice { public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ MockDeviceImpl(); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~MockDeviceImpl(); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool click(const int x, const int y) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool click(const int x, const int y, const unsigned int durationMs) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool drag(const int sx, const int sy, const int ex, const int ey, const int steps, const int durationMs) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ int touchDown(const int x, const int y) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool touchMove(const int x, const int y, const int seq) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool touchUp(const int x, const int y, const int seq) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool wheelUp(int amount, const int durationMs) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool wheelDown(int amount, const int durationMs) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressBack(KeyRequestType type) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressHome(KeyRequestType type) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressMenu(KeyRequestType type) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressVolUp(KeyRequestType type) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressVolDown(KeyRequestType type) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressPower(KeyRequestType type) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressKeyCode(std::string keycode, KeyRequestType type) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool takeScreenshot(std::string path, float scale, int quality) override; /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ long long getSystemTime(TimeRequestType type) override; @@ -170,50 +170,50 @@ public: protected: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool strokeKeyCode(std::string keycode, unsigned int durationMs); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressKeyCode(std::string keycode); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool releaseKeyCode(std::string keycode); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ int grabTouchSeqNumber(); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool releaseTouchSeqNumber(int seq); private: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ void startTimer(void); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ int stopTimer(void); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ long long timeStamp(void); diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index 4e16377..242cb60 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -133,35 +133,35 @@ protected: /** * @brief Press and release given key during duration time. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool strokeKeyCode(std::string keycode, unsigned int durationMs); /** * @brief Press given key. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressKeyCode(std::string keycode); /** * @brief Release given key. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool releaseKeyCode(std::string keycode); /** * @brief Increase touch count and return the number to manage touch count. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ int grabTouchSeqNumber(); /** * @brief Delete given touch number. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool releaseTouchSeqNumber(int seq); @@ -169,14 +169,14 @@ private: /** * @brief Timer utility. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void startTimer(void); /** * @brief Timer utility. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ int stopTimer(void); diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index 5d979d6..6404060 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -27,7 +27,7 @@ namespace Aurum { /** * @brief TimeRequestType enum class. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ enum class TimeRequestType { WALLCLOCK, //Real time of system @@ -37,7 +37,7 @@ enum class TimeRequestType { /** * @brief KeyRequestType enum class. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ enum class KeyRequestType { STROKE, //Key press(100ms) and release @@ -50,14 +50,14 @@ enum class KeyRequestType { * @brief IDevice interface. * It defines common device controls such as touch, key events * - * @since_tizen 5.5 + * @since_tizen 6.5 */ class IDevice { public: /** * @brief IDevice Destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~IDevice() {} @@ -69,7 +69,7 @@ public: * * @return true if the click succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool click(const int x, const int y) = 0; @@ -82,7 +82,7 @@ public: * * @return true if the click succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool click(const int x, const int y, const unsigned int durationMs) = 0; @@ -99,7 +99,7 @@ public: * * @return true if the drag succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool drag(const int sx, const int sy, const int ex, const int ey, const int steps, const int durationMs) = 0; @@ -112,7 +112,7 @@ public: * * @return touch event number * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual int touchDown(const int x, const int y) = 0; @@ -125,7 +125,7 @@ public: * * @return true if the touch move succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool touchMove(const int x, const int y, const int seq) = 0; @@ -138,7 +138,7 @@ public: * * @return true if the touch up succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool touchUp(const int x, const int y, const int seq) = 0; @@ -150,7 +150,7 @@ public: * * @return true if the wheel up succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool wheelUp(int amount, const int durationMs) = 0; @@ -162,7 +162,7 @@ public: * * @return true if the wheel down succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool wheelDown(int amount, const int durationMs) = 0; @@ -173,7 +173,7 @@ public: * * @return true if the press back succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool pressBack(KeyRequestType type) = 0; @@ -184,7 +184,7 @@ public: * * @return true if the press home succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool pressHome(KeyRequestType type) = 0; @@ -195,7 +195,7 @@ public: * * @return true if the press menu succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool pressMenu(KeyRequestType type) = 0; @@ -206,7 +206,7 @@ public: * * @return true if the press volume up succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool pressVolUp(KeyRequestType type) = 0; @@ -217,7 +217,7 @@ public: * * @return true if the press volume down succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool pressVolDown(KeyRequestType type) = 0; @@ -228,7 +228,7 @@ public: * * @return true if the press power succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool pressPower(KeyRequestType type) = 0; @@ -240,7 +240,7 @@ public: * * @return true if the press keycode succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool pressKeyCode(std::string keycode, KeyRequestType type) = 0; @@ -253,7 +253,7 @@ public: * * @return true if screen shot is created successfully, false otherwise * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool takeScreenshot(std::string path, float scale, int quality) = 0; @@ -264,7 +264,7 @@ public: * * @return utc time stamp * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual long long getSystemTime(TimeRequestType type) = 0; diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h index e02bbcf..ab86c4d 100644 --- a/libaurum/inc/Interface/ISearchable.h +++ b/libaurum/inc/Interface/ISearchable.h @@ -41,7 +41,7 @@ public: /** * @brief ISearchable Destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~ISearchable() {} @@ -52,7 +52,7 @@ public: * * @return true if object has, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual bool hasObject(const std::shared_ptr selector) const = 0; @@ -63,7 +63,7 @@ public: * * @return UiObject if succeed, else nulltpr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::shared_ptr findObject( const std::shared_ptr selector) const = 0; @@ -75,7 +75,7 @@ public: * * @return UiObject vector if succeed, else nulltpr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual std::vector> findObjects( const std::shared_ptr selector) const = 0; diff --git a/libaurum/inc/Misc/Point2D.h b/libaurum/inc/Misc/Point2D.h index 634d779..69bc81d 100644 --- a/libaurum/inc/Misc/Point2D.h +++ b/libaurum/inc/Misc/Point2D.h @@ -33,7 +33,7 @@ public: /** * @brief Point2D constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Point2D() : x{0}, y{0} {} @@ -42,7 +42,7 @@ public: * * @param[in] src Point2D source * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Point2D(const Point2D &src) { @@ -56,7 +56,7 @@ public: * @param[in] x x coordinate * @param[in] y y coordinate * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Point2D(const T &x, const T &y) { @@ -71,7 +71,7 @@ public: * * @return true if same, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ inline bool operator==(const Point2D& rhs) { @@ -85,7 +85,7 @@ public: * * @return true if same, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ inline bool operator!=(const Point2D& rhs) { diff --git a/libaurum/inc/Misc/Rect.h b/libaurum/inc/Misc/Rect.h index 9d935ed..70410af 100644 --- a/libaurum/inc/Misc/Rect.h +++ b/libaurum/inc/Misc/Rect.h @@ -35,7 +35,7 @@ public: /** * @brief Rect constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Rect() : mTopLeft{0, 0}, mBottomRight{0, 0} {} @@ -45,7 +45,7 @@ public: * @param[in] tl top left @Point2D * @param[in] br bottom right @Point2D * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Rect(const Point2D &tl, const Point2D &br) : mTopLeft(tl), mBottomRight(br) @@ -60,7 +60,7 @@ public: * @param[in] x2 bottom right x coordinate * @param[in] y2 bottom right y coordinate * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Rect(const T &x1, const T &y1, const T &x2, const T &y2) : mTopLeft{x1, y1}, mBottomRight{x2, y2} @@ -72,7 +72,7 @@ public: * * @param[in] src Rect source * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Rect(const Rect &src) @@ -86,7 +86,7 @@ public: * * @return Point2D * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Point2D midPoint() const { @@ -99,7 +99,7 @@ public: * * @return width value * - * @since_tizen 5.5 + * @since_tizen 6.5 */ T width() const { return mBottomRight.x - mTopLeft.x; } @@ -108,7 +108,7 @@ public: * * @return height value * - * @since_tizen 5.5 + * @since_tizen 6.5 */ T height() const { return mBottomRight.y - mTopLeft.y; } @@ -119,7 +119,7 @@ public: * * @return true if same, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ inline bool operator==(const Rect& rhs) { @@ -133,7 +133,7 @@ public: * * @return true if same, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ inline bool operator!=(const Rect& rhs){ return !(*this == rhs); diff --git a/libaurum/inc/PartialMatch.h b/libaurum/inc/PartialMatch.h index 10fb59f..fcc6aaf 100644 --- a/libaurum/inc/PartialMatch.h +++ b/libaurum/inc/PartialMatch.h @@ -40,7 +40,7 @@ private: /** * @brief PartialMatch constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ PartialMatch(); @@ -50,7 +50,7 @@ public: * * @param[in][in] absolute depth(start from root) value * - * @since_tizen 5.5 + * @since_tizen 6.5 */ PartialMatch(const std::shared_ptr selector, const int absDepth); @@ -63,7 +63,7 @@ public: * @param[in] depth next depth * @param[in] partialMatches @PartialMatch list * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void update(const std::shared_ptr node, int index, int depth, std::list> &partialMatches); @@ -73,14 +73,14 @@ public: * * @return true if matched child exist, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool finalizeMatch(); /** * @brief Prints selector information. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string debugPrint(); @@ -97,7 +97,7 @@ public: * * @return @PartialMatch * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr accept(const std::shared_ptr node, const std::shared_ptr selector, @@ -115,7 +115,7 @@ public: * * @return @PartialMatch * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr accept(const std::shared_ptr node, const std::shared_ptr selector, @@ -132,7 +132,7 @@ private: * * @return ture if satisfied, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static bool checkCriteria(const std::shared_ptr selector, const std::shared_ptr node); @@ -145,7 +145,7 @@ private: * * @return ture if matched, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static bool checkCriteria(const std::string textA, const std::string textB); @@ -157,7 +157,7 @@ private: * * @return ture if matched, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static bool checkCriteria(const bool boolA, const bool boolB); diff --git a/libaurum/inc/Runnable/Runnable.h b/libaurum/inc/Runnable/Runnable.h index b6b14f2..0a3c35e 100644 --- a/libaurum/inc/Runnable/Runnable.h +++ b/libaurum/inc/Runnable/Runnable.h @@ -33,14 +33,14 @@ public: /** * @brief Runnable destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~Runnable() { } /** * @brief Do given action. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual void run() const = 0; }; diff --git a/libaurum/inc/Runnable/SendKeyRunnable.h b/libaurum/inc/Runnable/SendKeyRunnable.h index 115166f..dd1bfd8 100644 --- a/libaurum/inc/Runnable/SendKeyRunnable.h +++ b/libaurum/inc/Runnable/SendKeyRunnable.h @@ -41,7 +41,7 @@ public: * * @param[in] keycode keycode string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ SendKeyRunnable(std::string keycode); diff --git a/libaurum/inc/Sel.h b/libaurum/inc/Sel.h index ae052d7..4c89e0d 100644 --- a/libaurum/inc/Sel.h +++ b/libaurum/inc/Sel.h @@ -44,7 +44,7 @@ public: * * @return @UiSelector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr text(std::string text); @@ -55,7 +55,7 @@ public: * * @return @UiSelector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr type(std::string type); @@ -66,7 +66,7 @@ public: * * @return @UiSelector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr style(std::string style); @@ -77,7 +77,7 @@ public: * * @return @UiSelector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr depth(int depth); }; diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index 2e5a3ff..163c258 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -55,7 +55,7 @@ public: * * @return true if the click succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool click(const int x, const int y) override; @@ -68,7 +68,7 @@ public: * * @return true if the click succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool click(const int x, const int y, const unsigned int durationMs) override; @@ -85,7 +85,7 @@ public: * * @return true if the drag succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool drag(const int sx, const int sy, const int ex, const int ey, const int steps, const int durationMs) override; @@ -98,7 +98,7 @@ public: * * @return touch event number * - * @since_tizen 5.5 + * @since_tizen 6.5 */ int touchDown(const int x, const int y) override; @@ -111,7 +111,7 @@ public: * * @return true if the touch move succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool touchMove(const int x, const int y, const int seq) override; @@ -124,7 +124,7 @@ public: * * @return true if the touch up succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool touchUp(const int x, const int y, const int seq) override; @@ -136,7 +136,7 @@ public: * * @return true if the wheel up succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool wheelUp(int amount, const int durationMs) override; @@ -148,7 +148,7 @@ public: * * @return true if the wheel down succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool wheelDown(int amount, const int durationMs) override; @@ -159,7 +159,7 @@ public: * * @return true if the press back succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressBack(KeyRequestType type) override; @@ -170,7 +170,7 @@ public: * * @return true if the press home succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressHome(KeyRequestType type) override; @@ -181,7 +181,7 @@ public: * * @return true if the press menu succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressMenu(KeyRequestType type) override; @@ -192,7 +192,7 @@ public: * * @return true if the press volume up succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressVolUp(KeyRequestType type) override; @@ -203,7 +203,7 @@ public: * * @return true if the press volume down succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressVolDown(KeyRequestType type) override; @@ -214,7 +214,7 @@ public: * * @return true if the press power succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressPower(KeyRequestType type) override; @@ -226,7 +226,7 @@ public: * * @return true if the press keycode succeeded else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool pressKeyCode(std::string keycode, KeyRequestType type) override; @@ -239,7 +239,7 @@ public: * * @return true if screen shot is created successfully, false otherwise * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool takeScreenshot(std::string path, float scale, int quality) override; @@ -250,7 +250,7 @@ public: * * @return utc time stamp * - * @since_tizen 5.5 + * @since_tizen 6.5 */ long long getSystemTime(TimeRequestType type) override; @@ -271,7 +271,7 @@ public: * * @return object exist or not * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool hasObject(const std::shared_ptr selector) const override; @@ -282,7 +282,7 @@ public: * * @return Found UiObject ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr findObject( const std::shared_ptr selector) const override; @@ -294,7 +294,7 @@ public: * * @return Found UiObject ptr vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector> findObjects( const std::shared_ptr selector) const override; @@ -358,7 +358,7 @@ public: * * @return UiDevice ptr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::shared_ptr getInstance(IDevice *deviceImpl = nullptr); @@ -366,14 +366,14 @@ public: * @brief Gets currently enabled applications root window. * * @return AccessibleNode ptr vector - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector> getWindowRoot() const; private: /** * @brief Waits process idle. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool waitForIdle() const; @@ -381,14 +381,14 @@ private: /** * @brief UiDevice Consturctor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiDevice(); /** * @brief UiDevice Consturctor with IDevice. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiDevice(IDevice *impl); @@ -396,7 +396,7 @@ public: /** * @brief UiDevice Destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~UiDevice(); diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index 08b3a3d..e9d81ce 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -59,7 +59,7 @@ public: /** * @brief UiObject constructor with device, selector, node pointer. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiObject(const std::shared_ptr device, const std::shared_ptr selector, const AccessibleNode *node); @@ -67,7 +67,7 @@ public: /** * @brief UiObject constructor with device, selector, node. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiObject(const std::shared_ptr device, const std::shared_ptr selector, std::shared_ptr node); @@ -75,21 +75,21 @@ public: /** * @brief UiObject constructor with object source. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiObject(UiObject &&src); /** * @brief UiObject constructor. (default constructor) * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiObject(); /** * @brief UiObject destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ virtual ~UiObject(); @@ -98,7 +98,7 @@ public: * * @return UiSelector pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getSelector(); @@ -109,7 +109,7 @@ public: * * @return true if object exist, otherwise false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool hasObject(const std::shared_ptr selector) const override; @@ -120,7 +120,7 @@ public: * * @return Found UiObject pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr findObject( const std::shared_ptr selector) const override; @@ -132,7 +132,7 @@ public: * * @return the list of found UiObject pointer vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector> findObjects( const std::shared_ptr selector) const override; @@ -161,7 +161,7 @@ public: * * @return UiObject pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiObject *getParent() const; @@ -170,7 +170,7 @@ public: * * @return number of child * - * @since_tizen 5.5 + * @since_tizen 6.5 */ int getChildCount() const; @@ -179,7 +179,7 @@ public: * * @return UiObject pointer vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::vector> getChildren() const; @@ -188,7 +188,7 @@ public: * * @return UiObject pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getChildAt(int index) const; @@ -197,7 +197,7 @@ public: * * @return Node pointer vector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getDescendant(); @@ -206,7 +206,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getApplicationPackage() const; @@ -215,7 +215,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getId() const; @@ -224,7 +224,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getAutomationId() const; @@ -233,7 +233,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getElementType() const; @@ -242,7 +242,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getElementStyle() const; @@ -251,7 +251,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getText() const; @@ -260,7 +260,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string getRole() const; @@ -271,7 +271,7 @@ public: * * @return string * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void setText(std::string text); @@ -280,7 +280,7 @@ public: * * @return @Rect * - * @since_tizen 5.5 + * @since_tizen 6.5 */ const Rect getScreenBoundingBox() const; @@ -289,7 +289,7 @@ public: * * @return @Rect * - * @since_tizen 5.5 + * @since_tizen 6.5 */ const Rect getWindowBoundingBox() const; @@ -298,7 +298,7 @@ public: * * @return true if checkable else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isCheckable() const; @@ -307,7 +307,7 @@ public: * * @return true if checked else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isChecked() const; @@ -316,7 +316,7 @@ public: * * @return true if clickable else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isClickable() const; @@ -325,7 +325,7 @@ public: * * @return true if enabled else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isEnabled() const; @@ -334,7 +334,7 @@ public: * * @return true if focusable else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isFocusable() const; @@ -343,7 +343,7 @@ public: * * @return true if focused else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isFocused() const; @@ -352,7 +352,7 @@ public: * * @return true if longclickable else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isLongClickable() const; @@ -361,7 +361,7 @@ public: * * @return true if scrollable else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isScrollable() const; @@ -370,7 +370,7 @@ public: * * @return true if selectable else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isSelectable() const; @@ -379,7 +379,7 @@ public: * * @return true if selected else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isSelected() const; @@ -388,7 +388,7 @@ public: * * @return true if visible else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isVisible() const; @@ -397,7 +397,7 @@ public: * * @return true if showing else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isShowing() const; @@ -406,14 +406,14 @@ public: * * @return true if active else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isActive() const; /** * @brief Performs a click action on object. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void click() const; @@ -422,7 +422,7 @@ public: * * @param[in] durationMs total time to maintain down action (default = 500ms) * - * @since_tizen 5.5 + * @since_tizen 6.5 */ void longClick(const unsigned int durationMs = LOGNCLICK_INTERVAL) const; @@ -492,7 +492,7 @@ public: * * @return true if valid else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool isValid() const; @@ -501,7 +501,7 @@ public: * * @return AccessibleNode pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::shared_ptr getAccessibleNode() const; diff --git a/libaurum/inc/UiScrollable.h b/libaurum/inc/UiScrollable.h index 0e27e81..d214dd6 100644 --- a/libaurum/inc/UiScrollable.h +++ b/libaurum/inc/UiScrollable.h @@ -25,60 +25,60 @@ namespace Aurum { /** * @brief UiScrollable class - * @since_tizen 5.5 + * @since_tizen 6.5 */ class UiScrollable : public UiObject { public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiScrollable(std::shared_ptr selector); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiScrollable(); public: /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool exists(UiObject *obj); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool scrollToObject(UiObject *obj); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool scrollForward(); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool scrollForward(int steps); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool scrollBackward(); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool scrollBackward(int steps); /** * @brief TBD - * @since_tizen 5.5 + * @since_tizen 6.5 */ bool scrollToBegin(); diff --git a/libaurum/inc/UiSelector.h b/libaurum/inc/UiSelector.h index 25ef153..302e6f7 100644 --- a/libaurum/inc/UiSelector.h +++ b/libaurum/inc/UiSelector.h @@ -41,20 +41,20 @@ public: /** * @brief UiSelector constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector(); /** * @brief UiSelector constructor with selector. - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector(UiSelector &selector); /** * @brief Gets Selector information as string. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ std::string description(); @@ -66,7 +66,7 @@ public: * * @return UiSelector pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *id(std::string text); @@ -77,7 +77,7 @@ public: * * @return UiSelector pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *automationid(std::string text); @@ -88,7 +88,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *text(std::string text); @@ -99,7 +99,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *pkg(std::string text); @@ -110,7 +110,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *role(std::string text); @@ -121,7 +121,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *type(std::string text); @@ -132,7 +132,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *style(std::string text); @@ -143,7 +143,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *depth(int depth); @@ -155,7 +155,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *depth(int minDepth, int maxDepth); @@ -166,7 +166,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *minDepth(int depth); @@ -177,7 +177,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *maxDepth(int depth); @@ -188,7 +188,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isChecked(bool condition); @@ -199,7 +199,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isCheckable(bool condition); @@ -210,7 +210,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isClickable(bool condition); @@ -221,7 +221,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isEnabled(bool condition); @@ -232,7 +232,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isFocused(bool condition); @@ -243,7 +243,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isFocusable(bool condition); @@ -254,7 +254,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isScrollable(bool condition); @@ -265,7 +265,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isSelected(bool condition); @@ -276,7 +276,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isShowing(bool condition); @@ -287,7 +287,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isActive(bool condition); @@ -298,7 +298,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isVisible(bool condition); @@ -309,7 +309,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *isSelectable(bool condition); @@ -320,7 +320,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *hasChild(std::shared_ptr child); @@ -331,7 +331,7 @@ public: * * @return UiSelector class instance * - * @since_tizen 5.5 + * @since_tizen 6.5 */ UiSelector *fromParent(std::shared_ptr parent); diff --git a/libaurum/inc/Until.h b/libaurum/inc/Until.h index 167ff48..ecbaeed 100644 --- a/libaurum/inc/Until.h +++ b/libaurum/inc/Until.h @@ -37,7 +37,7 @@ private: /** * @brief Until constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Until(); @@ -46,7 +46,7 @@ private: * * @param[in] selector @UiSelector * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Until(const std::shared_ptr selector); @@ -55,7 +55,7 @@ private: * * @param[in] src reference of Until source * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Until(const Until &src); @@ -64,7 +64,7 @@ private: * * @param[in] src Rvalue reference of Util source * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Until(const Until &&src); @@ -72,7 +72,7 @@ public: /** * @brief UiSelector destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~Until(); @@ -85,7 +85,7 @@ public: * @return function that performs hasObject * returned function will return true if object has, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::function hasObject( const std::shared_ptr selector); @@ -98,7 +98,7 @@ public: * @return function that performs findObject * returned function will return obj if succeed, else nulltpr * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::function(const ISearchable *)> findObject(const std::shared_ptr selector); @@ -111,7 +111,7 @@ public: * @return function that check checkable * returned function will return true if checkable, else false * - * @since_tizen 5.5 + * @since_tizen 6.5 */ static std::function checkable( const bool isCheckable); diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index 6f5a647..e865ecf 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -37,7 +37,7 @@ private: /** * @brief Waiter constructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Waiter(); @@ -48,7 +48,7 @@ public: * @param[in] searchableObject ISearchable pointer * @param[in] uiObject UiObject pointer * - * @since_tizen 5.5 + * @since_tizen 6.5 */ Waiter(const ISearchable *searchableObject, const UiObject *uiObject = nullptr); @@ -56,7 +56,7 @@ public: /** * @brief Waiter destructor. * - * @since_tizen 5.5 + * @since_tizen 6.5 */ ~Waiter(); @@ -68,7 +68,7 @@ public: * * @return template * - * @since_tizen 5.5 + * @since_tizen 6.5 */ template R waitFor(const std::function condition) const; @@ -80,7 +80,7 @@ public: * * @return template * - * @since_tizen 5.5 + * @since_tizen 6.5 */ template R waitFor(const std::function object) const; -- 2.7.4 From 1f642f656ab69d4f792fa947950b1ea444a22775 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Mon, 8 Nov 2021 15:17:34 +0900 Subject: [PATCH 14/16] bootstrap: Delete wrong colons Change-Id: Ica97e195731de19db169f4a10efc3a0a3834ceb6 --- org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h | 1 - org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h | 1 - org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h | 1 - org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h | 1 - org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h | 1 - org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h | 1 - org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h | 1 - org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h | 1 - 8 files changed, 8 deletions(-) diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h index e4ea276..3f5a188 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h @@ -30,6 +30,5 @@ private: public: FlickCommand(const ::aurum::ReqFlick *request, ::aurum::RspFlick *response); - ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h index b62cb20..3c866c4 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h @@ -30,6 +30,5 @@ private: public: GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, ::aurum::RspGetAppInfo *response); - ; ::grpc::Status execute() override; }; diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h index 9112f14..05ed05e 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h @@ -30,6 +30,5 @@ private: public: GetDeviceTimeCommand(const ::aurum::ReqGetDeviceTime *request, ::aurum::RspGetDeviceTime *response); - ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h index ef21777..fc4d4c6 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h @@ -30,6 +30,5 @@ private: public: GetLocationCommand(const ::aurum::ReqGetLocation *request, ::aurum::RspGetLocation *response); - ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h index 78fb8ca..9fead13 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h @@ -30,6 +30,5 @@ private: public: GetSizeCommand(const ::aurum::ReqGetSize *request, ::aurum::RspGetSize *response); - ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h index 50cb6b7..daeae97 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h @@ -30,6 +30,5 @@ private: public: GetValueCommand(const ::aurum::ReqGetValue *request, ::aurum::RspGetValue *response); - ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h index 04032d4..f1c6739 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h @@ -30,6 +30,5 @@ private: public: KillServerCommand(const ::aurum::ReqEmpty *request, ::aurum::RspEmpty *response); - ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h index 648f25a..5f973e8 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h @@ -30,7 +30,6 @@ private: public: RemoveAppCommand(const ::aurum::ReqRemoveApp *request, ::aurum::RspRemoveApp *response); - ; ::grpc::Status execute() override; ::grpc::Status executePost() override; }; \ No newline at end of file -- 2.7.4 From 0a40614c946702498cbe0baffd935ea97a8c56ae Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Mon, 8 Nov 2021 13:45:30 +0900 Subject: [PATCH 15/16] implement getscreensize feature Change-Id: I83baf89a7003424b800ca68aa5ec51e8e7e97f09 --- org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h | 3 ++ org.tizen.aurum-bootstrap/inc/Commands/Commands.h | 1 + .../inc/Commands/GetScreenSizeCommand.h | 34 ++++++++++++++++++ org.tizen.aurum-bootstrap/meson.build | 1 + org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc | 8 +++++ .../src/Commands/GetScreenSizeCommand.cc | 41 ++++++++++++++++++++++ protocol/aurum.proto | 9 +++++ 7 files changed, 97 insertions(+) create mode 100644 org.tizen.aurum-bootstrap/inc/Commands/GetScreenSizeCommand.h create mode 100644 org.tizen.aurum-bootstrap/src/Commands/GetScreenSizeCommand.cc diff --git a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h index e7d348a..f532b6a 100644 --- a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h +++ b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h @@ -107,6 +107,9 @@ public: ::grpc::Status dumpObjectTree(::grpc::ServerContext *context, const ::aurum::ReqDumpObjectTree *request, ::aurum::RspDumpObjectTree *response) override; + ::grpc::Status getScreenSize(::grpc::ServerContext *context, + const ::aurum::ReqGetScreenSize *request, + ::aurum::RspGetScreenSize *response) override; }; #endif diff --git a/org.tizen.aurum-bootstrap/inc/Commands/Commands.h b/org.tizen.aurum-bootstrap/inc/Commands/Commands.h index 1311895..5c9b25f 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/Commands.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/Commands.h @@ -45,3 +45,4 @@ #include "Commands/TakeScreenshotCommand.h" #include "Commands/DumpObjectTreeCommand.h" +#include "Commands/GetScreenSizeCommand.h" diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetScreenSizeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetScreenSizeCommand.h new file mode 100644 index 0000000..cbb37ff --- /dev/null +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetScreenSizeCommand.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + +#include +#include +#include "Commands/Command.h" +#include "ObjectMapper.h" +#include +#include "config.h" + +class GetScreenSizeCommand : public Command { +private: + const ::aurum::ReqGetScreenSize *mRequest; + ::aurum::RspGetScreenSize *mResponse; + +public: + GetScreenSizeCommand(const ::aurum::ReqGetScreenSize *request, + ::aurum::RspGetScreenSize *response); + ::grpc::Status execute() override; +}; diff --git a/org.tizen.aurum-bootstrap/meson.build b/org.tizen.aurum-bootstrap/meson.build index e27c68a..ae2f8dd 100644 --- a/org.tizen.aurum-bootstrap/meson.build +++ b/org.tizen.aurum-bootstrap/meson.build @@ -40,6 +40,7 @@ bootstrap_svr_src += [ files('src/Commands/PreCommand.cc'), files('src/Commands/PostCommand.cc'), files('src/Commands/DumpObjectTreeCommand.cc'), + files('src/Commands/GetScreenSizeCommand.cc'), ] bootstrap_svr_dep = [ diff --git a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc index 51b0863..371af97 100644 --- a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc +++ b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc @@ -232,3 +232,11 @@ aurumServiceImpl::~aurumServiceImpl() std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), true); } + +::grpc::Status aurumServiceImpl::getScreenSize(::grpc::ServerContext *context, + const ::aurum::ReqGetScreenSize *request, + ::aurum::RspGetScreenSize *response) +{ + std::unique_ptr cmd = std::make_unique(request, response); + return execute(cmd.get(), true); +} diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetScreenSizeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetScreenSizeCommand.cc new file mode 100644 index 0000000..29f4cfb --- /dev/null +++ b/org.tizen.aurum-bootstrap/src/Commands/GetScreenSizeCommand.cc @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + * + */ + +#include "bootstrap.h" +#include "GetScreenSizeCommand.h" +#include "UiDevice.h" + +GetScreenSizeCommand::GetScreenSizeCommand(const ::aurum::ReqGetScreenSize *request, + ::aurum::RspGetScreenSize *response) + : mRequest{request}, mResponse{response} +{ +} + +::grpc::Status GetScreenSizeCommand::execute() +{ + LOGI("GetScreenSize --------------- "); + + ::aurum::Rect *rect = mResponse->mutable_size(); + std::shared_ptr mDevice = UiDevice::getInstance(); + + rect->set_x(0); + rect->set_y(0); + rect->set_width(mDevice->getScreenSize().width); + rect->set_height(mDevice->getScreenSize().height); + + return grpc::Status::OK; +} diff --git a/protocol/aurum.proto b/protocol/aurum.proto index d26d272..acb2c8c 100644 --- a/protocol/aurum.proto +++ b/protocol/aurum.proto @@ -29,6 +29,7 @@ service Bootstrap { rpc sendKey(ReqKey) returns (RspKey) {} rpc takeScreenshot(ReqTakeScreenshot) returns (stream RspTakeScreenshot) {} rpc dumpObjectTree(ReqDumpObjectTree) returns (RspDumpObjectTree) {} + rpc getScreenSize(ReqGetScreenSize) returns (RspGetScreenSize) {} } // ------------------------------------ // @@ -416,3 +417,11 @@ message RspDumpObjectTree { RspStatus status = 1; repeated Element roots = 2; } + +message ReqGetScreenSize { +} + +message RspGetScreenSize { + RspStatus status = 1; + Rect size = 2; +} -- 2.7.4 From ad26855d9d72591425ebfff8a6479b1e798a511d Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Mon, 8 Nov 2021 13:16:23 +0900 Subject: [PATCH 16/16] Aurum Version 1.0.0 release Change-Id: I1d242ba5fe90c5edd69461889272ace99c9470ef --- packaging/aurum.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/aurum.spec b/packaging/aurum.spec index 73a6a95..3aede61 100644 --- a/packaging/aurum.spec +++ b/packaging/aurum.spec @@ -1,6 +1,6 @@ Name: aurum -Version: 0.1.2 -Release: 0 +Version: 1.0.0 +Release: 1 License: Apache-2.0 Summary: Automation framework for Ui testing Group: UI Framework -- 2.7.4