test: make tests to be succeeded.

Change-Id: I05a43a096392f04cbd0fba33d8aacbdb6d36c4d2

diff --git a/src/DSDisplayArea/DSDisplayArea.cpp b/src/DSDisplayArea/DSDisplayArea.cpp
index b711f01..69c1118 100644 (file)
--- a/src/DSDisplayArea/DSDisplayArea.cpp
+++ b/src/DSDisplayArea/DSDisplayArea.cpp
@@ -73,7 +73,7 @@ DSDisplayAreaPrivate::DSDisplayAreaPrivate(DSDisplayArea *p_ptr, std::shared_ptr
 
        // The size of DSDisplayArea is the one of DSOutput
        __width = outputImpl->getResolutionWidth();
-       __height = outputImpl->getResolutionWidth();
+       __height = outputImpl->getResolutionHeight();
 }
 
 DSDisplayAreaPrivate::~DSDisplayAreaPrivate()

diff --git a/tests/DSDisplayArea-test.cpp b/tests/DSDisplayArea-test.cpp
index da2ba5e..2e252fc 100644 (file)
--- a/tests/DSDisplayArea-test.cpp
+++ b/tests/DSDisplayArea-test.cpp
@@ -44,7 +44,7 @@ TEST_F(DSDisplayAreaTest, BasicMethods)
                EXPECT_TRUE(output->applyResolutionAuto() == true);
 
                auto displayArea = std::make_shared<DSDisplayArea>(output);
-               EXPECT_TRUE(displayArea->getHeight() == output->getResolutionWidth());
-               EXPECT_TRUE(displayArea->getWidth() == output->getResolutionHeight());
+               EXPECT_TRUE(displayArea->getWidth() == output->getResolutionWidth());
+               EXPECT_TRUE(displayArea->getHeight() == output->getResolutionHeight());
        }
 }

diff --git a/tests/DSDisplayDeviceTDMImpl-test.cpp b/tests/DSDisplayDeviceTDMImpl-test.cpp
index 640d5fb..b926250 100644 (file)
--- a/tests/DSDisplayDeviceTDMImpl-test.cpp
+++ b/tests/DSDisplayDeviceTDMImpl-test.cpp
@@ -74,7 +74,7 @@ TEST_F(DSDisplayDeviceTDMImplTest, Device_OutputRemoved)
        displayDevice->registerCallbackOutputRemoved(mockDisplayDevice.get(), std::bind(&MockDisplayDevice::outputRemoved, mockDisplayDevice, std::placeholders::_1));
 
        std::unique_ptr<DSDisplayDeviceTDMImpl> displayDeviceTDM(static_cast<DSDisplayDeviceTDMImpl*>(displayDevice.release())); // down-casting of std::unique_ptr
-       displayDeviceTDM->callCallbackOutputAdded();
+       displayDeviceTDM->callCallbackOutputRemoved();
        EXPECT_TRUE(mockDisplayDevice->flagOutputRemoved);
 }
 

diff --git a/tests/DSOutputImpl-test.cpp b/tests/DSOutputImpl-test.cpp
index 1b983f8..1c047d7 100644 (file)
--- a/tests/DSOutputImpl-test.cpp
+++ b/tests/DSOutputImpl-test.cpp
@@ -30,8 +30,8 @@ TEST_F(DSOutputTest, BasicMethods)
        auto output = std::make_shared<DSOutputImpl>(displayDeviceOutput);
        EXPECT_TRUE(output != nullptr);
 
-       EXPECT_TRUE(output->getResolutionWidth() != 0);
-       EXPECT_TRUE(output->getResolutionHeight() != 0);
-       EXPECT_TRUE(output->applyResolutionAuto() == true);
+       EXPECT_TRUE(output->getResolutionWidth() == 0);
+       EXPECT_TRUE(output->getResolutionHeight() == 0);
+       EXPECT_TRUE(output->applyResolutionAuto() == false);
        EXPECT_TRUE(output->getDisplayDeviceOutput() == displayDeviceOutput);
 }