test: Revert through exception during full of message queues

Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp>

1 files changed, 13 insertions, 23 deletions

diff --git a/ivi-layermanagement-api/test/ilm_control_notification_test.cpp b/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
index 12abd5c..5df3bd4 100644
--- a/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
+++ b/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
@@ -58,27 +58,10 @@ class NotificationTest: public TestBase, public ::testing::Test {
         }
     };
 
-    void IlmCommitChanges()
-    {
-        int error = wl_display_roundtrip(wlDisplay);
-        if (error) {
-            throw std::exception();
-        }
-
-        ilm_commitChanges();
-    }
-
 public:
-
-    static void SetUpTestCase() {
-        ilm_init();
-     }
-    static void TearDownTestCase() {
-        ilm_destroy();
-    }
-
-    NotificationTest()
+    void SetUp()
     {
+        ilm_initWithNativedisplay((t_ilm_nativedisplay)wlDisplay);
         // set default values
         callbackLayerId = -1;
         LayerProperties = ilmLayerProperties();
@@ -88,18 +71,25 @@ public:
         // create a layer
         layer = 345;
         ilm_layerRemove(layer);
-        IlmCommitChanges();
+        ilm_commitChanges();
         ilm_layerCreateWithDimension(&layer, 800, 480);
-        IlmCommitChanges();
+        ilm_commitChanges();
         // create a surface
         surface = 456;
         ilm_surfaceRemove(surface);
-        IlmCommitChanges();
+        ilm_commitChanges();
         ilm_surfaceCreate((t_ilm_nativehandle)wlSurface,10,10,ILM_PIXELFORMAT_RGBA_8888,&surface);
-        IlmCommitChanges();
+        ilm_commitChanges();
         timesCalled=0;
     }
 
+    void TearDown()
+    {
+        ilm_destroy();
+    }
+
+    NotificationTest(){}
+
     ~NotificationTest(){}