Merge trunk

2 files changed, 72 insertions, 8 deletions

diff --git a/tests/modules/DesktopFileReader/desktopfilereader_test.cpp b/tests/modules/DesktopFileReader/desktopfilereader_test.cpp
index d6bb36e..ca7d8eb 100644
--- a/tests/modules/DesktopFileReader/desktopfilereader_test.cpp
+++ b/tests/modules/DesktopFileReader/desktopfilereader_test.cpp
@@ -126,3 +126,73 @@ TEST(DesktopFileReader, testUTF8Characters)
     EXPECT_EQ(reader->comment(), "Ubuntu 简易计算器");
     EXPECT_EQ(reader->splashTitle(), "计算器 2.0");
 }
+
+TEST(DesktopFileReader, parseOrientations)
+{
+    using namespace ::testing;
+
+    const Qt::ScreenOrientations defaultOrientations = Qt::PortraitOrientation | Qt::LandscapeOrientation
+        | Qt::InvertedPortraitOrientation | Qt::InvertedLandscapeOrientation;
+    bool ok;
+    Qt::ScreenOrientations orientations;
+
+    ok = DesktopFileReader::parseOrientations(QString(), orientations);
+    ASSERT_TRUE(ok);
+    EXPECT_EQ(defaultOrientations, orientations);
+
+    ok = DesktopFileReader::parseOrientations("An invalid string!", orientations);
+    ASSERT_FALSE(ok);
+    EXPECT_EQ(defaultOrientations, orientations);
+
+    ok = DesktopFileReader::parseOrientations("landscape", orientations);
+    ASSERT_TRUE(ok);
+    EXPECT_EQ(Qt::LandscapeOrientation, orientations);
+
+    ok = DesktopFileReader::parseOrientations("   InvertedPortrait  , Portrait ", orientations);
+    ASSERT_TRUE(ok);
+    EXPECT_EQ(Qt::InvertedPortraitOrientation | Qt::PortraitOrientation, orientations);
+
+    ok = DesktopFileReader::parseOrientations(",inverted-landscape, inverted_portrait, ", orientations);
+    ASSERT_TRUE(ok);
+    EXPECT_EQ(Qt::InvertedPortraitOrientation | Qt::InvertedLandscapeOrientation, orientations);
+
+    ok = DesktopFileReader::parseOrientations(",inverted-landscape, some-invalid-text, ", orientations);
+    ASSERT_FALSE(ok);
+    EXPECT_EQ(defaultOrientations, orientations);
+
+    ok = DesktopFileReader::parseOrientations("landscape;portrait", orientations);
+    ASSERT_TRUE(ok);
+    EXPECT_EQ(Qt::PortraitOrientation | Qt::LandscapeOrientation, orientations);
+
+    ok = DesktopFileReader::parseOrientations("primary", orientations);
+    ASSERT_TRUE(ok);
+    EXPECT_EQ(Qt::PrimaryOrientation, orientations);
+
+    ok = DesktopFileReader::parseOrientations("landscpe,primary", orientations);
+    ASSERT_FALSE(ok);
+    EXPECT_EQ(defaultOrientations, orientations);
+}
+
+TEST(DesktopFileReader, parseBoolean)
+{
+    using namespace ::testing;
+
+    bool ok;
+    bool boolean;
+
+    ok = DesktopFileReader::parseBoolean(QString(), boolean);
+    ASSERT_TRUE(ok);
+    EXPECT_FALSE(boolean);
+
+    ok = DesktopFileReader::parseBoolean("  Yes ", boolean);
+    ASSERT_TRUE(ok);
+    EXPECT_TRUE(boolean);
+
+    ok = DesktopFileReader::parseBoolean("False", boolean);
+    ASSERT_TRUE(ok);
+    EXPECT_FALSE(boolean);
+
+    ok = DesktopFileReader::parseBoolean("Hello World!", boolean);
+    ASSERT_FALSE(ok);
+    EXPECT_FALSE(boolean);
+}
diff --git a/tests/modules/common/fake_mirsurfaceitem.h b/tests/modules/common/fake_mirsurfaceitem.h
index ef8e6f7..ea55d14 100644
--- a/tests/modules/common/fake_mirsurfaceitem.h
+++ b/tests/modules/common/fake_mirsurfaceitem.h
@@ -31,7 +31,6 @@ public:
         , m_state(Restored)
         , m_live(true)
         , m_session(nullptr)
-        , m_orientation(Qt::PortraitOrientation)
         , m_isFirstFrameDrawn(false)
         , m_isFrameDropperRunning(true)
     {}
@@ -40,8 +39,8 @@ public:
     State state() const override { return m_state; }
     QString name() const override { return QString("fake app surface"); }
     bool live() const override { return m_live; }
-    Qt::ScreenOrientation orientation() const override { return m_orientation; }
     SessionInterface *session() const override { return m_session; }
+    OrientationAngle orientationAngle() const override { return Angle0; }
 
     Q_INVOKABLE void release() override {}
 
@@ -56,11 +55,7 @@ public:
         return m_isFirstFrameDrawn;
     }
 
-    void setOrientation(const Qt::ScreenOrientation orientation) override {
-        if (m_orientation != orientation) {
-            m_orientation = orientation;
-            Q_EMIT orientationChanged();
-        }
+    void setOrientationAngle(OrientationAngle) override {
     }
 
     void setSession(SessionInterface *session) override {
@@ -91,7 +86,6 @@ private:
     State m_state;
     bool m_live;
     SessionInterface *m_session;
-    Qt::ScreenOrientation m_orientation;
     bool m_isFirstFrameDrawn;
     bool m_isFrameDropperRunning;
 };