tests: update tests for DSWaylandCompositor, DSWaylandSeat, DSWaylandKeyboard and...

Change-Id: Ibe0eca9fbcb0b963eed7194e57374bf32d72f363
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/tests/DSKeyboard-test.cpp b/tests/DSKeyboard-test.cpp
index 0db9a36..fe4262c 100644 (file)
--- a/tests/DSKeyboard-test.cpp
+++ b/tests/DSKeyboard-test.cpp
@@ -79,6 +79,12 @@ TEST_F(DSKeyboardTest, BasicMethods)
                {
                        keyboard->setFocus(window);
                        EXPECT_TRUE(window == keyboard->getFocus());
+
+                       keyboard->keyDown(100);
+                       keyboard->keyUp(100);
+
+                       keyboard->setRepeatRate(25);
+                       keyboard->setRepeatDelay(400);
                }
        }
 }

diff --git a/tests/DSWaylandCompositor-test.cpp b/tests/DSWaylandCompositor-test.cpp
index 7a459e3..0c29a43 100644 (file)
--- a/tests/DSWaylandCompositor-test.cpp
+++ b/tests/DSWaylandCompositor-test.cpp
@@ -87,6 +87,26 @@ TEST_F(DSWaylandCompositorTest, NextSerialGet)
        }
 }
 
+TEST_F(DSWaylandCompositorTest, GetCurrentTime)
+{
+       bool res;
+       uint32_t currentTime;
+
+       DSWaylandCompositor *comp = DSWaylandCompositor::getInstance();
+       EXPECT_TRUE(comp != nullptr);
+
+       if (comp)
+       {
+               res = comp->create();
+               EXPECT_TRUE(res == true);
+
+               currentTime = comp->currentTime();
+               EXPECT_TRUE(currentTime <= comp->currentTime());
+
+               DSWaylandCompositor::releaseInstance();
+       }
+}
+
 TEST_F(DSWaylandCompositorTest, AddRemoveClient)
 {
        bool res;

diff --git a/tests/DSWaylandKeyboard-test.cpp b/tests/DSWaylandKeyboard-test.cpp
index 3769679..c4bd123 100644 (file)
--- a/tests/DSWaylandKeyboard-test.cpp
+++ b/tests/DSWaylandKeyboard-test.cpp
@@ -87,3 +87,15 @@ TEST_F(DSWaylandKeyboardTest, SetGetFocus)
        }
 }
 
+TEST_F(DSWaylandKeyboardTest, BasicMethods)
+{
+       auto keyboard = new DSWaylandKeyboard(nullptr);
+        EXPECT_TRUE(keyboard != nullptr);
+
+        if (keyboard)
+        {
+               keyboard->sendKeyDown(100);
+               keyboard->sendKeyUp(100);
+       }
+}
+

diff --git a/tests/DSWaylandSeat-test.cpp b/tests/DSWaylandSeat-test.cpp
index d4bf446..7ad984e 100644 (file)
--- a/tests/DSWaylandSeat-test.cpp
+++ b/tests/DSWaylandSeat-test.cpp
@@ -1,6 +1,8 @@
 #include "libds-tests.h"
 #include "DSWaylandCompositor.h"
 #include "DSWaylandSeat.h"
+#include "DSSeat.h" 
+#include "DSXkb.h"
 
 using namespace display_server;
 
@@ -114,3 +116,50 @@ TEST_F(DSWaylandSeatTest, getKeyboardPointerTouch)
        }
 }
 
+TEST_F(DSWaylandSeatTest, GetSetCurrentEventTime)
+{
+       DSWaylandCompositor *comp = DSWaylandCompositor::getInstance();
+       EXPECT_TRUE(comp != nullptr);
+
+       if (comp)
+       {
+               auto seat = new DSWaylandSeat(comp, DSWaylandSeat::capDefault);
+               EXPECT_TRUE(seat != nullptr);
+
+               uint32_t currentTime = comp->currentTime();
+               seat->setCurrentEventTime(currentTime);
+               EXPECT_TRUE(currentTime == seat->getCurrentEventTime());
+
+               DSWaylandCompositor::releaseInstance();
+       }
+}
+
+TEST_F(DSWaylandSeatTest, GetSetXkb)
+{
+       DSWaylandCompositor *comp = DSWaylandCompositor::getInstance();
+       EXPECT_TRUE(comp != nullptr);
+
+       if (comp)
+       {
+               auto seat = new DSSeat();
+               EXPECT_TRUE(seat != nullptr);
+
+               if (seat)
+               {
+                       auto xkb = seat->getXkb();
+                       EXPECT_TRUE(xkb != nullptr);
+
+                       if (xkb)
+                       {
+                               auto waylandSeat = new DSWaylandSeat(comp, DSWaylandSeat::capDefault);
+                               EXPECT_TRUE(waylandSeat != nullptr);
+
+                               waylandSeat->setXkb(xkb);
+                               EXPECT_TRUE(xkb == waylandSeat->getXkb());
+                       }
+               }
+
+               DSWaylandCompositor::releaseInstance();
+       }
+}
+