EFL refactor: nested suites

Each control now represented by a Boost suite, which is added to
Wayland_EFL_Suite.

Signed-off-by: Joe Konno <joe.konno@intel.com>

diff --git a/src/efl/test_actionslider.cpp b/src/efl/test_actionslider.cpp
index db9cea6..fb0e41d 100644 (file)
--- a/src/efl/test_actionslider.cpp
+++ b/src/efl/test_actionslider.cpp
@@ -52,8 +52,12 @@ private:
        Actionslider    as_;
 };
 
-BOOST_AUTO_TEST_SUITE(Wayland_EFL_Actionslider_Suite)
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
 
-       WAYLAND_ELM_HARNESS_TEST_CASE(ActionsliderPosTest)
+       BOOST_AUTO_TEST_SUITE(Wayland_EFL_Actionslider_Suite)
+       
+               WAYLAND_ELM_HARNESS_TEST_CASE(ActionsliderPosTest)
+       
+       BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()

diff --git a/src/efl/test_background.cpp b/src/efl/test_background.cpp
index c68fd4b..18e635d 100644 (file)
--- a/src/efl/test_background.cpp
+++ b/src/efl/test_background.cpp
@@ -123,9 +123,14 @@ private:
        Background      bg_;
 };
 
-BOOST_AUTO_TEST_SUITE(Wayland_EFL_Background_Suite)
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
 
-       WAYLAND_ELM_HARNESS_TEST_CASE(BackgroundColorTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(BackgroundImageTest)
+       BOOST_AUTO_TEST_SUITE(Wayland_EFL_Background_Suite)
+       
+               WAYLAND_ELM_HARNESS_TEST_CASE(BackgroundColorTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(BackgroundImageTest)
+       
+       BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
+

diff --git a/src/efl/test_bubble.cpp b/src/efl/test_bubble.cpp
index 80d68d4..27588e1 100644 (file)
--- a/src/efl/test_bubble.cpp
+++ b/src/efl/test_bubble.cpp
@@ -94,10 +94,13 @@ private:
        EvasObject      bubble_;
 };
 
-BOOST_AUTO_TEST_SUITE(Wayland_EFL_Bubble_Suite)
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
 
-       WAYLAND_ELM_HARNESS_TEST_CASE(BubblePosTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(BubbleTextTest)
+       BOOST_AUTO_TEST_SUITE(Wayland_EFL_Bubble_Suite)
+       
+               WAYLAND_ELM_HARNESS_TEST_CASE(BubblePosTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(BubbleTextTest)
+       
+       BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
-

diff --git a/src/efl/test_button.cpp b/src/efl/test_button.cpp
index 2c3ac06..cce05ea 100644 (file)
--- a/src/efl/test_button.cpp
+++ b/src/efl/test_button.cpp
@@ -90,9 +90,13 @@ private:
        EvasObject      button_;
 };
 
-BOOST_AUTO_TEST_SUITE(Wayland_EFL_Button_Suite)
-
-       WAYLAND_ELM_HARNESS_TEST_CASE(ButtonResizeTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(ButtonMoveTest)
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
+
+       BOOST_AUTO_TEST_SUITE(Wayland_EFL_Button_Suite)
+       
+               WAYLAND_ELM_HARNESS_TEST_CASE(ButtonResizeTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(ButtonMoveTest)
+       
+       BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()

diff --git a/src/efl/test_check.cpp b/src/efl/test_check.cpp
index f4d209c..d51dc7a 100644 (file)
--- a/src/efl/test_check.cpp
+++ b/src/efl/test_check.cpp
@@ -105,10 +105,14 @@ private:
        EvasObject      check_;
 };
 
-BOOST_AUTO_TEST_SUITE(Wayland_EFL_Check_Suite)
-
-       WAYLAND_ELM_HARNESS_TEST_CASE(CheckStateTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(CheckTextTest)
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
+
+       BOOST_AUTO_TEST_SUITE(Wayland_EFL_Check_Suite)
+       
+               WAYLAND_ELM_HARNESS_TEST_CASE(CheckStateTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(CheckTextTest)
+       
+       BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 

diff --git a/src/efl/test_clock.cpp b/src/efl/test_clock.cpp
index be51f01..fb17482 100644 (file)
--- a/src/efl/test_clock.cpp
+++ b/src/efl/test_clock.cpp
@@ -193,11 +193,16 @@ private:
        Window          window_;
        EvasObject      clock_;
 };
-BOOST_AUTO_TEST_SUITE(Wayland_EFL_Clock_Suite)
 
-       WAYLAND_ELM_HARNESS_TEST_CASE(ClockTimeTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(ClockEditionTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(ClockDigitEditionTest)
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
+
+       BOOST_AUTO_TEST_SUITE(Wayland_EFL_Clock_Suite)
+       
+               WAYLAND_ELM_HARNESS_TEST_CASE(ClockTimeTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(ClockEditionTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(ClockDigitEditionTest)
+       
+       BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 

diff --git a/src/efl/test_engine_set.cpp b/src/efl/test_engine_set.cpp
index bb56a33..e1a9657 100644 (file)
--- a/src/efl/test_engine_set.cpp
+++ b/src/efl/test_engine_set.cpp
@@ -1,6 +1,9 @@
 #include <Elementary.h>
 #include "../test.h"
 
+
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
+
 BOOST_AUTO_TEST_SUITE(Wayland_EFL_Misc_Suite)
 
 BOOST_AUTO_TEST_CASE(elm_engine_set_wayland_shm)
@@ -38,3 +41,6 @@ BOOST_AUTO_TEST_CASE(elm_engine_set_wayland_egl)
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE_END()
+

diff --git a/src/efl/test_window.cpp b/src/efl/test_window.cpp
index f880369..2ff628a 100644 (file)
--- a/src/efl/test_window.cpp
+++ b/src/efl/test_window.cpp
@@ -273,14 +273,19 @@ private:
        Window          window_;
 };
 
-BOOST_AUTO_TEST_SUITE(Wayland_EFL_Window_Suite)
-
-       WAYLAND_ELM_HARNESS_TEST_CASE(WindowResizeTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(WindowMoveTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(WindowIconifyTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(WindowMaximizeTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(WindowFullscreenTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(WindowStickyTest)
-       WAYLAND_ELM_HARNESS_TEST_CASE(WindowWithdrawnTest)
+BOOST_AUTO_TEST_SUITE(Wayland_EFL_Suite)
+
+       BOOST_AUTO_TEST_SUITE(Wayland_EFL_Window_Suite)
+       
+               WAYLAND_ELM_HARNESS_TEST_CASE(WindowResizeTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(WindowMoveTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(WindowIconifyTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(WindowMaximizeTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(WindowFullscreenTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(WindowStickyTest)
+               WAYLAND_ELM_HARNESS_TEST_CASE(WindowWithdrawnTest)
+       
+       BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
+