projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Split texture-manager-impl files" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-TextSelectionPopup-internal.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextSelectionPopup-internal.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextSelectionPopup-internal.cpp
index
06ce4c8
..
c5ad959
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-TextSelectionPopup-internal.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-TextSelectionPopup-internal.cpp
@@
-24,7
+24,9
@@
#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
#undef private
#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
#undef private
+#if defined(ELDBUS_ENABLED)
#include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
#include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
+#endif
using namespace Dali;
using namespace Toolkit;
using namespace Dali;
using namespace Toolkit;
@@
-32,7
+34,9
@@
using namespace Toolkit;
void dali_textselectionpopupinternal_startup(void)
{
test_return_value = TET_UNDEF;
void dali_textselectionpopupinternal_startup(void)
{
test_return_value = TET_UNDEF;
+#if defined(ELDBUS_ENABLED)
DBusWrapper::Install(std::unique_ptr<DBusWrapper>(new TestDBusWrapper));
DBusWrapper::Install(std::unique_ptr<DBusWrapper>(new TestDBusWrapper));
+#endif
}
void dali_textselectionpopupinternal_cleanup(void)
}
void dali_textselectionpopupinternal_cleanup(void)
@@
-51,4
+55,3
@@
int UtcDaliToolkitTextSelectionPopupIconPropertiesN(void)
END_TEST;
}
END_TEST;
}
-