[sociald] Improve unit test coverage. Contributes to JB#13730

rpm/sociald.spec

@@ -88,6 +88,9 @@ Translation source for sociald
 Summary:    Automatable tests for sociald
 License:    TBD
 Group:      System/Applications
+BuildRequires:  pkgconfig(Qt5Test)
+Requires:   qt5-qtdeclarative-devel-tools
+Requires:   qt5-qtdeclarative-import-qttest
 
 %description tests
 Automatable tests for sociald

sociald.pro

@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = src tests
+
 tests.depends = src
 
 OTHER_FILES += rpm/sociald.spec

src/eventfeed/SocialAvatar.qml

@@ -19,4 +19,3 @@ SocialImage {
         visible: image.status !== Image.Ready
     }
 }
-

src/eventfeed/SocialBody.qml

@@ -5,6 +5,7 @@ import Sailfish.TextLinking 1.0
 Column {
     property alias text: body.plainText
     property alias time: time.text
+
     anchors {
         left: parent.left
         right: parent.right

src/eventfeed/SocialContent.qml

@@ -40,7 +40,10 @@ Item {
         }
 
         Column {
+            id: column
+
             property int _depth: parentPage && parentPage._depth ? parentPage._depth + 1 : 0
+
             visible: subSource != ""
             anchors {
                 verticalCenter: parent.verticalCenter
@@ -50,7 +53,7 @@ Item {
             spacing: -Theme.paddingSmall
 
             Label {
-                width: Math.min(implicitWidth, header.width - Theme.pageStackIndicatorWidth * _depth
+                width: Math.min(implicitWidth, header.width - Theme.pageStackIndicatorWidth * column._depth
                                 - 2 * Theme.paddingLarge)
                 truncationMode: TruncationMode.Fade
                 color: Theme.highlightColor
@@ -66,7 +69,7 @@ Item {
             }
 
             Label {
-                width: Math.min(implicitWidth, header.width - Theme.pageStackIndicatorWidth * _depth
+                width: Math.min(implicitWidth, header.width - Theme.pageStackIndicatorWidth * column._depth
                                 - 2 * Theme.paddingLarge)
                 truncationMode: TruncationMode.Fade
                 color: Theme.highlightColor

src/eventfeed/SocialImage.qml

@@ -11,8 +11,6 @@ Item {
     property alias fillMode: image.fillMode
     property alias sourceSize: image.sourceSize
 
-    // ---------------------
-
     onConnectedToNetworkChanged: _setImageSource()
     onSourceChanged: _setImageSource()
     Component.onCompleted: _setImageSource()
@@ -41,4 +39,4 @@ Item {
         width: container.width
         height: container.height
     }
-}
+}

src/eventfeed/SocialInfoLabel.qml

@@ -8,8 +8,8 @@ Item {
         right: parent.right
     }
 
-    height: label.text != "" ? (label.height + 2 * Theme.paddingLarge) : Theme.paddingLarge
-    opacity: label.text != "" ? 1 : 0
+    height: label.text !== "" ? (label.height + 2 * Theme.paddingLarge) : Theme.paddingLarge
+    opacity: label.text !== "" ? 1 : 0
 
     Label {
         id: label

src/eventfeed/SocialMediaAccountDelegate.qml

@@ -12,8 +12,6 @@ BackgroundItem {
     property alias iconSource: icon.source
     property int unseenPostCount: feedPage ? feedPage.unseenPostCount : 0
 
-    // -------------------------
-
     onClicked: {
         pageStack.push(feedPage)
         feedPage.positionViewAtBeginning()

src/eventfeed/SocialMediaFeedPage.qml

@@ -21,11 +21,9 @@ Page {
     property bool connectedToNetwork // ALL other connectedToNetwork properties in other pages
                                      // are bound to this property, directly or indirectly.
     property int refreshTimeCount: 1 // Increment this to trigger feed items to refresh times.
-
-    // -------------------------
-
     property bool _needToSync
     allowedOrientations: Lipstick.compositor.eventsWindowOrientation
+
     onConnectedToNetworkChanged: {
         if (page.connectedToNetwork && page._needToSync) {
             page._needToSync = false

src/eventfeed/SocialMediaPreviewRow.qml

@@ -7,8 +7,6 @@ Item {
 
     property var imageList
     property string mediaName
-    property string mediaCaption
-    property string mediaDescription
     property real imageSize: width / 3
     property int imageCount: imageList ? imageList.length : 0
     property bool connectedToNetwork

src/facebook/eventfeed/FacebookFeedItem.qml

@@ -21,8 +21,6 @@ SocialMediaFeedItem {
             id: mediaRow
             imageList: item.imageList
             mediaName: model.attachmentName
-            mediaCaption: model.attachmentCaption
-            mediaDescription: model.attachmentDescription
             connectedToNetwork: item.connectedToNetwork
         }
 

src/twitter/eventfeed/TwitterPostPage.qml

@@ -400,8 +400,8 @@ Page {
             accountString: qsTrId("lipstick-jolla-home-la-account-name")
 
             // We should not set the identifier of account when we are syncing or signin in
-            switchEnabled: account.status != Account.SigningIn
-                             && account.status != Account.SyncInProgress
+            switchEnabled: account.status !== Account.SigningIn
+                             && account.status !== Account.SyncInProgress
             serviceName: "twitter"
         }
     }

tests/auto/auto.pro

@@ -0,0 +1,16 @@
+TEMPLATE = aux
+
+OTHER_FILES += \
+    ../*.xml \
+    *.qml
+
+unittest.files = *.qml
+unittest.path = /opt/tests/sociald/auto
+
+shared.files = ../../src/eventfeed/*.qml
+shared.path = /opt/tests/sociald/auto/eventfeed/shared
+
+twitter.files = ../../src/twitter/eventfeed/*.qml
+twitter.path = /opt/tests/sociald/auto/eventfeed
+
+INSTALLS += unittest shared twitter

tests/auto/tst_socialaccountpage.qml

@@ -0,0 +1,57 @@
+/****************************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd.
+** Contact: Antti Seppälä <antti.seppala@jollamobile.com>
+** All rights reserved.
+**
+** This file is part of sociald package.
+**
+****************************************************************************************/
+
+import QtTest 1.0
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import "eventfeed/shared"
+
+ApplicationWindow {
+    id: window
+    deviceOrientation: Orientation.Portrait
+    initialPage: accountPage
+
+    SocialAccountPage {
+        id: accountPage
+        accounts: createAccounts()
+
+        function createAccounts() {
+            var accArray = new Array
+            for (var i = 0; i < 100; i++) {
+                accArray.push({"name": "Account" + i})
+            }
+            return accArray
+        }
+    }
+
+    SignalSpy {
+        id: clickedSpy
+        target: accountPage
+        signalName: "indexSelected"
+    }
+    TestEvent { id: testEvent }
+
+    TestCase {
+        name: "SocialAccountPage"
+        when: windowShown
+
+        function test_accountPage() {
+            verify(accountPage === pageStack.currentPage)
+            compare(accountPage.currentIndex, 0)
+            verify(accountPage.accounts !== null)
+            compare(accountPage.headerText, "")
+
+            clickedSpy.clear()
+            testEvent.mouseClick(accountPage, accountPage.width / 2, accountPage.height / 2, Qt.LeftButton, 0, 0)
+            compare(clickedSpy.count, 1)
+            verify(accountPage.currentIndex > 0)
+        }
+    }
+}

tests/auto/tst_socialaccountpulldownmenu.qml

@@ -0,0 +1,74 @@
+/****************************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd.
+** Contact: Antti Seppälä <antti.seppala@jollamobile.com>
+** All rights reserved.
+**
+** This file is part of sociald package.
+**
+****************************************************************************************/
+
+import QtTest 1.0
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import "eventfeed/shared"
+
+ApplicationWindow {
+    id: window
+    deviceOrientation: Orientation.Portrait
+
+    Page {
+        id: page
+
+        SilicaListView {
+            id: listView
+            anchors.fill: parent
+            model: ListModel {}
+
+            Item {
+                id: subviewModel
+
+                function accountList(idString) {
+                    var result = new Array
+                    result.push({"identifier": 2, "displayName": "Test account"})
+                    return result
+                }
+            }
+
+            SocialAccountPullDownMenu {
+                id: pullDownMenu
+                pageContainer: page
+                accountString: "Account %1"
+
+                property QtObject model: QtObject {
+                    property QtObject accounts: QtObject {
+                        function indexOf(what) {
+                            if (what === 2) {
+                                return 0
+                            }
+                            return -1
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    initialPage: page
+
+    TestCase {
+        name: "SocialAccountPullDownMenu"
+        when: windowShown
+
+        function test_pullDownMenu() {
+            compare(pullDownMenu.currentAccount, 2)
+            compare(pullDownMenu.currentAccountIndex, 0)
+            compare(pullDownMenu.selectAccountString, "")
+            compare(pullDownMenu.changeToAccountString, "")
+            compare(pullDownMenu.accountString, "Account %1")
+            compare(pullDownMenu.pageContainer, page)
+            compare(pullDownMenu.serviceName, "")
+            compare(pullDownMenu.switchEnabled, false)
+        }
+    }
+}

tests/auto/tst_socialavatar.qml

@@ -0,0 +1,36 @@
+/****************************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd.
+** Contact: Antti Seppälä <antti.seppala@jollamobile.com>
+** All rights reserved.
+** 
+** This file is part of sociald package.
+**
+****************************************************************************************/
+
+import QtTest 1.0
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import "eventfeed/shared"
+
+Item {
+    id: item
+    width: 100; height: 100
+
+    SocialAvatar {
+        id: avatar
+    }
+
+    TestCase {
+        name: "SocialAvatar"
+        when: windowShown
+
+        function test_avatar() {
+            compare(avatar.width, Theme.itemSizeExtraLarge)
+            compare(avatar.height, Theme.itemSizeExtraLarge)
+            compare(avatar.fillMode, Image.PreserveAspectCrop)
+            compare(avatar.sourceSize.width, avatar.width)
+            compare(avatar.sourceSize.height, avatar.height)
+        }
+    }
+}

tests/auto/tst_socialbody.qml

@@ -0,0 +1,33 @@
+/****************************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd.
+** Contact: Antti Seppälä <antti.seppala@jollamobile.com>
+** All rights reserved.
+** 
+** This file is part of sociald package.
+**
+****************************************************************************************/
+
+import QtTest 1.0
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import "eventfeed/shared"
+
+Item {
+    width: 100; height: 100
+
+    SocialBody {
+        id: body
+        width: parent.width
+    }
+
+    TestCase {
+        name: "SocialBody"
+        when: windowShown
+
+        function test_body() {
+            compare(body.text, "")
+            compare(body.time, "")
+        }
+    }
+}