split resize_move test into separate tests

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>

diff --git a/src/efl/test_button.cpp b/src/efl/test_button.cpp
index 631fc15..f19e987 100644 (file)
--- a/src/efl/test_button.cpp
+++ b/src/efl/test_button.cpp
@@ -6,7 +6,7 @@
 
 BOOST_AUTO_TEST_SUITE(Wayland_EFL_Button_Suite)
 
-WAYLAND_EFL_AUTO_TEST_CASE(efl_button_resize_move)
+WAYLAND_EFL_AUTO_TEST_CASE(efl_button_resize)
 {
        Window win;
        win.setSize(400, 400);
@@ -16,22 +16,40 @@ WAYLAND_EFL_AUTO_TEST_CASE(efl_button_resize_move)
        btn.show();
 
        btn.setSize(120, 30);
-       btn.setPosition(60, 15);
 
        Application::yield();
 
        BOOST_CHECK_EQUAL(btn.getWidth(), 120);
        BOOST_CHECK_EQUAL(btn.getHeight(), 30);
-       BOOST_CHECK_EQUAL(btn.getX(), 60);
-       BOOST_CHECK_EQUAL(btn.getY(), 15);
 
        btn.setSize(75, 75);
-       btn.setPosition(10, 10);
 
        Application::yield();
 
        BOOST_CHECK_EQUAL(btn.getWidth(), 75);
        BOOST_CHECK_EQUAL(btn.getHeight(), 75);
+}
+
+WAYLAND_EFL_AUTO_TEST_CASE(efl_button_move)
+{
+       Window win;
+       win.setSize(400, 400);
+       win.show();
+
+       EvasObject btn(elm_button_add(win));
+       btn.show();
+
+       btn.setPosition(60, 15);
+
+       Application::yield();
+
+       BOOST_CHECK_EQUAL(btn.getX(), 60);
+       BOOST_CHECK_EQUAL(btn.getY(), 15);
+
+       btn.setPosition(10, 10);
+
+       Application::yield();
+
        BOOST_CHECK_EQUAL(btn.getX(), 10);
        BOOST_CHECK_EQUAL(btn.getY(), 10);
 }

diff --git a/src/efl/test_window.cpp b/src/efl/test_window.cpp
index f9f8da8..93fbb6e 100644 (file)
--- a/src/efl/test_window.cpp
+++ b/src/efl/test_window.cpp
@@ -6,29 +6,44 @@
 
 BOOST_AUTO_TEST_SUITE(Wayland_EFL_Window_Suite)
 
-WAYLAND_EFL_AUTO_TEST_CASE(efl_window_resize_move)
+WAYLAND_EFL_AUTO_TEST_CASE(efl_window_resize)
 {
        Window win;
 
        win.show();
 
        win.setSize(400, 200);
-       win.setPosition(10, 20);
 
        Application::yield();
 
        BOOST_CHECK_EQUAL(win.getWidth(), 400);
        BOOST_CHECK_EQUAL(win.getHeight(), 200);
-       BOOST_CHECK_EQUAL(win.getX(), 10);
-       BOOST_CHECK_EQUAL(win.getY(), 20);
 
        win.setSize(100, 120);
-       win.setPosition(15, 25);
 
        Application::yield();
 
        BOOST_CHECK_EQUAL(win.getWidth(), 100);
        BOOST_CHECK_EQUAL(win.getHeight(), 120);
+}
+
+WAYLAND_EFL_AUTO_TEST_CASE(efl_window_move)
+{
+       Window win;
+
+       win.show();
+
+       win.setPosition(10, 20);
+
+       Application::yield();
+
+       BOOST_CHECK_EQUAL(win.getX(), 10);
+       BOOST_CHECK_EQUAL(win.getY(), 20);
+
+       win.setPosition(15, 25);
+
+       Application::yield();
+
        BOOST_CHECK_EQUAL(win.getX(), 15);
        BOOST_CHECK_EQUAL(win.getY(), 25);
 }