make application a global test fixture

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

diff --git a/src/efl/application.cpp b/src/efl/application.cpp
index e29217e..93b26c8 100644 (file)
--- a/src/efl/application.cpp
+++ b/src/efl/application.cpp
@@ -15,10 +15,10 @@ Application::Application()
 /* virtual */
 Application::~Application()
 {
-       // FIXME: hmmm... doesn't behave nicely across muliple boost test instances
        elm_shutdown();
 }
 
+/* static */
 void Application::setEngine(const Engine& engine)
 {
        std::string strEngine;
@@ -37,18 +37,24 @@ void Application::setEngine(const Engine& engine)
        BOOST_ASSERT(strEngine == std::string(elm_config_engine_get()));
 }
 
+/* static */
 void Application::mainLoop()
 {
        elm_run();
 }
 
+/* static */
 void Application::yield()
 {
        ecore_main_loop_iterate();
-       sleep(1);
+       usleep(0.1 * 1e6);
 }
 
+/* static */
 void Application::exit()
 {
        elm_exit();
 }
+
+// only one instance per test binary
+BOOST_GLOBAL_FIXTURE(Application);

diff --git a/src/efl/application.h b/src/efl/application.h
index 3965829..82f8b1b 100644 (file)
--- a/src/efl/application.h
+++ b/src/efl/application.h
@@ -1,6 +1,14 @@
 #ifndef __WAYLAND_EFL_APPLICATION_H__
 #define __WAYLAND_EFL_APPLICATION_H__
 
+namespace boost {
+       namespace unit_test {
+               namespace ut_detail {
+                       template<class F> class global_fixture_impl;
+               }
+       }
+}
+
 class Application
 {
 public:
@@ -9,13 +17,16 @@ public:
                ENGINE_EGL
        };
 
-       Application();
        virtual ~Application();
 
-       void setEngine(const Engine&);
-       void mainLoop();
-       void yield();
-       void exit();
+       static void setEngine(const Engine&);
+       static void mainLoop();
+       static void yield();
+       static void exit();
+
+private:
+       friend class ::boost::unit_test::ut_detail::global_fixture_impl<Application>;
+       Application();
 };
 
 #endif

diff --git a/src/efl/evasobject.cpp b/src/efl/evasobject.cpp
index 8d40536..c697888 100644 (file)
--- a/src/efl/evasobject.cpp
+++ b/src/efl/evasobject.cpp
@@ -10,6 +10,10 @@ EvasObject::EvasObject(Evas_Object* o)
 
 EvasObject::~EvasObject()
 {
+       if (obj_)
+       {
+               evas_object_del(obj_);
+       }
        obj_ = NULL;
 }
 

diff --git a/src/efl/test_evas_object.cpp b/src/efl/test_evas_object.cpp
index 67e67dd..616f4a2 100644 (file)
--- a/src/efl/test_evas_object.cpp
+++ b/src/efl/test_evas_object.cpp
@@ -5,27 +5,23 @@
 #include "window.h"
 #include "../test.h"
 
-//TODO: The application should be a singleton
-//TODO: We could probably iterate over each engine in a global fixture.
 #define TEST_ALL_ENGINES(name) \
 \
-void name##_test_run(Application&); \
+void name##_test_run(); \
 \
 BOOST_AUTO_TEST_CASE(name##_shm_engine) \
 { \
-       Application app; \
-       app.setEngine(Application::ENGINE_SHM); \
-       name##_test_run(app); \
+       Application::setEngine(Application::ENGINE_SHM); \
+       name##_test_run(); \
 } \
 \
 BOOST_AUTO_TEST_CASE(name##_egl_engine) \
 { \
-       Application app; \
-       app.setEngine(Application::ENGINE_EGL); \
-       name##_test_run(app); \
+       Application::setEngine(Application::ENGINE_EGL); \
+       name##_test_run(); \
 } \
 \
-void name##_test_run(Application& app)
+void name##_test_run()
 
 
 TEST_ALL_ENGINES(efl_window_resize_move)
@@ -37,7 +33,7 @@ TEST_ALL_ENGINES(efl_window_resize_move)
        win.setSize(400, 200);
        win.setPosition(10, 20);
 
-       app.yield();
+       Application::yield();
 
        BOOST_CHECK_EQUAL(win.getWidth(), 400);
        BOOST_CHECK_EQUAL(win.getHeight(), 200);
@@ -47,7 +43,7 @@ TEST_ALL_ENGINES(efl_window_resize_move)
        win.setSize(100, 120);
        win.setPosition(15, 25);
 
-       app.yield();
+       Application::yield();
 
        BOOST_CHECK_EQUAL(win.getWidth(), 100);
        BOOST_CHECK_EQUAL(win.getHeight(), 120);
@@ -67,7 +63,7 @@ TEST_ALL_ENGINES(efl_button_resize_move)
        btn.setSize(120, 30);
        btn.setPosition(60, 15);
 
-       app.yield();
+       Application::yield();
 
        BOOST_CHECK_EQUAL(btn.getWidth(), 120);
        BOOST_CHECK_EQUAL(btn.getHeight(), 30);
@@ -77,7 +73,7 @@ TEST_ALL_ENGINES(efl_button_resize_move)
        btn.setSize(75, 75);
        btn.setPosition(10, 10);
 
-       app.yield();
+       Application::yield();
 
        BOOST_CHECK_EQUAL(btn.getWidth(), 75);
        BOOST_CHECK_EQUAL(btn.getHeight(), 75);