Unity 8

Merge lp:~aacid/unity8/expandable_filter into lp:unity8

expandable_filter
Merge into trunk

Proposed by Albert Astals Cid on 2016-03-14

Status:	Merged
Approved by:	Andrea Cimitan on 2016-04-26
Approved revision:	2054
Merged at revision:	2391
Proposed branch:	lp:~aacid/unity8/expandable_filter
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/valueslider_filter
Diff against target:	534 lines (+334/-17) 13 files modified debian/control (+2/-2) qml/Dash/Filters/FilterExpandableWidget.qml (+96/-0) qml/Dash/Filters/FilterWidget.qml (+3/-0) qml/Dash/Filters/FilterWidgetFactory.qml (+2/-1) tests/mocks/Unity/CMakeLists.txt (+3/-1) tests/mocks/Unity/fake_expandablefilterwidget.cpp (+53/-0) tests/mocks/Unity/fake_expandablefilterwidget.h (+48/-0) tests/mocks/Unity/fake_filters.cpp (+19/-8) tests/mocks/Unity/fake_filters.h (+4/-4) tests/mocks/Unity/fake_scope.cpp (+2/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qml (+99/-0) tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml (+2/-1)
To merge this branch:	bzr merge lp:~aacid/unity8/expandable_filter
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2016-03-14	Approve on 2016-04-26
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-04-25
Paweł Stołowski			Approve on 2016-04-22
Review via email: mp+288957@code.launchpad.net

Commit Message

Expandable Filter Widget

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~stolowski/unity-api/expandable-filter-widget

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes (via make tryDash)

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-14:

FAILED: Continuous integration, rev:2049
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/736/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/965
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/981
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/981
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/979/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/979/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/979/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/979/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/979/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/979/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/736/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/837/rebuild

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-04-19:

a couple of comments plus... why is it called ExpandableFilterWidget and not ExpandableFilter like all other Filters we have so far?

review: Needs Fixing

lp:~aacid/unity8/expandable_filter updated on 2016-04-19

2050. By Albert Astals Cid on 2016-04-19: Merge
2051. By Albert Astals Cid on 2016-04-19: increase dep versions

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-19:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1007/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-19:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1008/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-04-19:

> a couple of comments plus... why is it called ExpandableFilterWidget and not
> ExpandableFilter like all other Filters we have so far?

Follows the API naming, according to Pawel it's because it's not really a Filter (doesn't filter anything) just a Filter Widget.

lp:~aacid/unity8/expandable_filter updated on 2016-04-19

2052. By Albert Astals Cid on 2016-04-19: fix too much c&p
2053. By Albert Astals Cid on 2016-04-19: Use anchors instead of width as suggested in review

Albert Astals Cid (aacid) wrote on 2016-04-19:

> a couple of comments plus...
Addressed the comments (i think)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-19:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1015/rebuild

review: Needs Fixing (continuous-integration)

Paweł Stołowski (stolowski) wrote on 2016-04-22:

Tested in silo 59, works as expected. +1

review: Approve

Andrea Cimitan (cimi) wrote on 2016-04-25:

any reason we didn't add qml tests for the component?

review: Needs Information

lp:~aacid/unity8/expandable_filter updated on 2016-04-25

2054. By Albert Astals Cid on 2016-04-25: Add test for the expandable filter widget

Albert Astals Cid (aacid) wrote on 2016-04-25:

> any reason we didn't add qml tests for the component?

Added a test, it doesn't do much but it won't hurt.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-25:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1045/rebuild

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-04-26:

* Did you perform an exploratory manual test run of the code change and any related functionality?
pawel did for me since I had an issue with his click package
* Did CI run pass? If not, please explain why.
unrelated

review: Approve

lp:~aacid/unity8/expandable_filter updated on 2016-04-27

2055. By Albert Astals Cid on 2016-04-26: Increase version number
2056. By Albert Astals Cid on 2016-04-26: Merge
2057. By Albert Astals Cid on 2016-04-27: Make the test work better with different px per gu values

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/control'
 --- debian/control	2016-04-13 16:50:51 +0000
 +++ debian/control	2016-04-27 12:56:09 +0000
@@ -30,7 +30,7 @@
                 libqt5xmlpatterns5-dev,
                 libsystemsettings-dev,
                 libudev-dev,
--               libunity-api-dev (>= 7.110),
++               libunity-api-dev (>= 7.111),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!armhf],
@@ -136,7 +136,7 @@
           unity-application-impl-15,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
--         unity-scopes-impl-11,
++         unity-scopes-impl-12,
           unity8-fake-env | unity-application-impl,
           ${misc:Depends},
  Breaks: unity8 (<< 7.86),
 === added file 'qml/Dash/Filters/FilterExpandableWidget.qml'
 --- qml/Dash/Filters/FilterExpandableWidget.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Filters/FilterExpandableWidget.qml	2016-04-27 12:56:09 +0000
@@ -0,0 +1,96 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++import Ubuntu.Components.ListItems 1.3 as ListItems
++
++/*! Expandable Filter Widget. */
++
++FilterWidget {
++    id: root
++
++    showsTitleOnItsOwn: true
++
++    implicitHeight: expandingItem.height
++
++    ListItems.Expandable {
++        id: expandingItem
++        objectName: "expandingItem"
++
++        expandedHeight: collapsedHeight + column.height
++        anchors.left: parent.left
++        anchors.right: parent.right
++        showDivider: false
++
++        onClicked: {
++            expanded = !expanded;
++            forceActiveFocus();
++        }
++        __contentsMargins: 0
++
++        Item {
++            id: titleHolder
++            anchors.top: parent.top
++            height: expandingItem.collapsedHeight
++            anchors.left: parent.left
++            anchors.right: parent.right
++
++            Label {
++                anchors.left: parent.left
++                anchors.leftMargin: units.gu(2)
++                anchors.right: dropDown.left
++                anchors.verticalCenter: parent.verticalCenter
++                text: widgetData.title || ""
++            }
++
++            Image {
++                id: dropDown
++                height: units.gu(3)
++                fillMode: Image.PreserveAspectFit
++                anchors.right: parent.right
++                anchors.rightMargin: units.gu(2)
++                anchors.verticalCenter: parent.verticalCenter
++                source: expandingItem.expanded ? "image://theme/up" : "image://theme/down"
++            }
++        }
++
++        Column {
++            id: column
++            anchors.left: parent.left
++            anchors.right: parent.right
++            anchors.top: titleHolder.bottom
++
++            Repeater {
++                id: repeater
++                model: widgetData.filters
++
++                delegate: FilterWidgetFactory {
++                    width: parent.width
++
++                    widgetId: id
++                    widgetType: type
++                    widgetData: filter
++
++                    ListItems.ThinDivider {
++                        anchors.bottom: parent.bottom
++                        visible: index !== repeater.count - 1
++                    }
++                }
++            }
++        }
++    }
++}
 === modified file 'qml/Dash/Filters/FilterWidget.qml'
 --- qml/Dash/Filters/FilterWidget.qml	2015-11-17 10:32:29 +0000
 +++ qml/Dash/Filters/FilterWidget.qml	2016-04-27 12:56:09 +0000
@@ -25,5 +25,8 @@
      //! Variable used to contain widget's data
      property var widgetData: null
++    //! Does the widget show the title inside?
++    property bool showsTitleOnItsOwn: false
++
      objectName: widgetId
+ }
 === modified file 'qml/Dash/Filters/FilterWidgetFactory.qml'
 --- qml/Dash/Filters/FilterWidgetFactory.qml	2016-03-15 19:16:10 +0000
 +++ qml/Dash/Filters/FilterWidgetFactory.qml	2016-04-27 12:56:09 +0000
@@ -35,7 +35,7 @@
      Label {
          id: title
--        text: widgetData ? widgetData.title : ""
++        text: widgetData && !(loader.item && loader.item.showsTitleOnItsOwn) ? widgetData.title : ""
          height: text != "" ? implicitHeight : 0
          anchors {
@@ -68,6 +68,7 @@
                  case Filters.OptionSelectorFilter: return "FilterOptionSelector.qml";
                  case Filters.RangeInputFilter: return "FilterRangeInput.qml";
                  case Filters.ValueSliderFilter: return "FilterValueSlider.qml";
++                case Filters.ExpandableFilterWidget: return "FilterExpandableWidget.qml";
                  default: return "";
+             }
+         }
 === modified file 'tests/mocks/Unity/CMakeLists.txt'
 --- tests/mocks/Unity/CMakeLists.txt	2016-03-08 15:01:00 +0000
 +++ tests/mocks/Unity/CMakeLists.txt	2016-04-27 12:56:09 +0000
@@ -8,7 +8,7 @@
  add_subdirectory(Screens)
  pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
--pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=11)
++pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=12)
  include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
@@ -34,6 +34,7 @@
    fake_optionselectoroptions.cpp
    fake_rangeinputfilter.cpp
    fake_valuesliderfilter.cpp
++  fake_expandablefilterwidget.cpp
    fake_valueslidervalues.cpp
    fake_unity_plugin.cpp
    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h
@@ -51,6 +52,7 @@
    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h
    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderFilterInterface.h
    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderValuesInterface.h
++  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ExpandableFilterWidgetInterface.h
+ )
  # Workaround for gcc failure LP: #1417664
 === added file 'tests/mocks/Unity/fake_expandablefilterwidget.cpp'
 --- tests/mocks/Unity/fake_expandablefilterwidget.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_expandablefilterwidget.cpp	2016-04-27 12:56:09 +0000
@@ -0,0 +1,53 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "fake_expandablefilterwidget.h"
++
++#include "fake_filters.h"
++
++FakeExpandbleFilterWidget::FakeExpandbleFilterWidget(const QString &id, const QString &tag, const QString &title, QObject* parent)
++ : unity::shell::scopes::ExpandableFilterWidgetInterface(parent)
++ , m_filterId(id)
++ , m_filterTag(tag)
++ , m_title(title)
++{
++    m_filters = new Filters(this);
++}
++
++QString FakeExpandbleFilterWidget::filterId() const
++{
++    return m_filterId;
++}
++
++QString FakeExpandbleFilterWidget::filterTag() const
++{
++    return m_filterTag;
++}
++
++QString FakeExpandbleFilterWidget::title() const
++{
++    return m_title;
++}
++
++unity::shell::scopes::FiltersInterface* FakeExpandbleFilterWidget::filters() const
++{
++    return m_filters;
++}
++
++void FakeExpandbleFilterWidget::addFilter(unity::shell::scopes::FilterBaseInterface* f)
++{
++    m_filters->addFilter(f);
++}
 === added file 'tests/mocks/Unity/fake_expandablefilterwidget.h'
 --- tests/mocks/Unity/fake_expandablefilterwidget.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_expandablefilterwidget.h	2016-04-27 12:56:09 +0000
@@ -0,0 +1,48 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef FAKE_EXPANDABLEFILTERWIDGET_H
++#define FAKE_EXPANDABLEFILTERWIDGET_H
++
++#include <unity/shell/scopes/ExpandableFilterWidgetInterface.h>
++
++class Filters;
++
++class FakeExpandbleFilterWidget : public unity::shell::scopes::ExpandableFilterWidgetInterface
++{
++    Q_OBJECT
++
++public:
++    FakeExpandbleFilterWidget(const QString &id, const QString &tag, const QString &title, QObject* parent);
++
++    QString filterId() const override;
++    QString filterTag() const override;
++    QString title() const override;
++
++    unity::shell::scopes::FiltersInterface* filters() const override;
++
++    // mock API
++    void addFilter(unity::shell::scopes::FilterBaseInterface* f);
++
++private:
++    QString m_filterId;
++    QString m_filterTag;
++    QString m_title;
++
++    Filters *m_filters;
++};
++
++#endif
 === modified file 'tests/mocks/Unity/fake_filters.cpp'
 --- tests/mocks/Unity/fake_filters.cpp	2015-12-09 11:35:29 +0000
 +++ tests/mocks/Unity/fake_filters.cpp	2016-04-27 12:56:09 +0000
@@ -19,11 +19,15 @@
  #include "fake_optionselectorfilter.h"
  #include "fake_rangeinputfilter.h"
  #include "fake_valuesliderfilter.h"
--#include "fake_scope.h"
++#include "fake_expandablefilterwidget.h"
--Filters::Filters(Scope* parent)
++Filters::Filters(QObject* parent)
   : unity::shell::scopes::FiltersInterface(parent)
+ {
++}
++
++void Filters::addFakeFilters()
++{
      addFilter(new FakeOptionSelectorFilter("OSF1", "Tag1", "Which Cake you like More", false, QStringList() << "cheese" << "carrot" << "chocolate", this));
      FakeRangeInputFilter *rif = new FakeRangeInputFilter("RIF1", "Tag3", this);
@@ -41,6 +45,11 @@
      addFilter(vsf);
      addFilter(new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this));
++
++    auto expandableFilter = new FakeExpandbleFilterWidget("EFW", "Tag5", "Advanced Settings", this);
++    expandableFilter->addFilter(new FakeValueSliderFilter("VS2", "Tag6", 15, 10, 150, labels, this));
++
++    addFilter(expandableFilter);
+ }
  void Filters::addFilter(unity::shell::scopes::FilterBaseInterface *f)
@@ -58,9 +67,10 @@
+         }
          break;
--        case FiltersInterface::ValueSliderFilter: {
--            // Not counting value slider as active in the mock
--        }
++        case FiltersInterface::ExpandableFilterWidget:
++            // Can't be active
++        case FiltersInterface::ValueSliderFilter:
++            // Not counting value as active in the mock
          case Invalid:
          break;
@@ -113,9 +123,10 @@
+             }
              break;
--            case FiltersInterface::ValueSliderFilter: {
--                // Not counting value slider as active in the mock
--            }
++            case FiltersInterface::ExpandableFilterWidget:
++                // Can't be active
++            case FiltersInterface::ValueSliderFilter:
++                // Not counting value as active in the mock
              case Invalid:
              break;
 === modified file 'tests/mocks/Unity/fake_filters.h'
 --- tests/mocks/Unity/fake_filters.h	2015-11-17 10:32:29 +0000
 +++ tests/mocks/Unity/fake_filters.h	2016-04-27 12:56:09 +0000
@@ -20,25 +20,25 @@
  #include <unity/shell/scopes/FiltersInterface.h>
  #include <unity/shell/scopes/FilterBaseInterface.h>
--class Scope;
--
  class Filters : public unity::shell::scopes::FiltersInterface
+ {
      Q_OBJECT
  public:
--    Filters(Scope* parent);
++    Filters(QObject* parent);
      int rowCount(const QModelIndex &parent) const override;
      QVariant data(const QModelIndex &index, int role) const override;
++    // Mock API
      int activeFiltersCount() const;
++    void addFakeFilters();
++    void addFilter(unity::shell::scopes::FilterBaseInterface* f);
  Q_SIGNALS:
      void activeFiltersCountChanged();
  private:
--    void addFilter(unity::shell::scopes::FilterBaseInterface* f);
      QVector<unity::shell::scopes::FilterBaseInterface*> m_filters;
  };
 === modified file 'tests/mocks/Unity/fake_scope.cpp'
 --- tests/mocks/Unity/fake_scope.cpp	2016-03-07 08:46:16 +0000
 +++ tests/mocks/Unity/fake_scope.cpp	2016-04-27 12:56:09 +0000
@@ -49,6 +49,8 @@
      , m_filters(new Filters(this))
      , m_returnNullPreview(returnNullPreview)
+ {
++    m_filters->addFakeFilters();
++
      m_primaryNavigationFilter = new FakeOptionSelectorFilter("OSF3", "PFTag", "Which food you like More", false, QStringList() << "meat" << "vegetables", this);
      connect(m_filters, &Filters::activeFiltersCountChanged, this, &Scope::activeFiltersCountChanged);
+ }
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2016-04-04 13:37:49 +0000
 +++ tests/qmltests/CMakeLists.txt	2016-04-27 12:56:09 +0000
@@ -57,6 +57,7 @@
  add_unity8_qmltest(Dash/Filters FilterRangeInput)
  add_unity8_qmltest(Dash/Filters FilterValueSlider)
  add_unity8_qmltest(Dash/Filters FilterWidgetFactory)
++add_unity8_qmltest(Dash/Filters FilterExpandableWidget)
  add_unity8_qmltest(Dash/ScopeSettings ScopeSettingBoolean)
  add_unity8_qmltest(Dash/ScopeSettings ScopeSettingList)
  add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)
 === added file 'tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qml'
 --- tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qml	2016-04-27 12:56:09 +0000
@@ -0,0 +1,99 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import QtTest 1.0
++import Ubuntu.Components 1.3
++import "../../../../qml/Dash/Filters"
++import Unity.Test 0.1 as UT
++import Unity 0.2
++
++Rectangle {
++    id: root
++    width: units.gu(60)
++    height: units.gu(80)
++    color: theme.palette.selected.background
++
++    QtObject {
++        id: widgetData1
++
++        property string title: "Expand me!"
++        property ListModel filters: ListModel {
++            dynamicRoles: true
++        }
++    }
++
++    QtObject {
++        id: sliderObject
++
++        property string title
++        property int value: 30
++        property int minValue: 10
++        property int maxValue: 150
++
++        property ListModel values: ListModel {
++            ListElement {
++                value: 10
++                label: "10"
++            }
++            ListElement {
++                value: 30
++                label: "30"
++            }
++            ListElement {
++                value: 100
++                label: "100"
++            }
++            ListElement {
++                value: 150
++                label: "150"
++            }
++        }
++    }
++
++    Component.onCompleted: {
++        widgetData1.filters.append({"type": Filters.ValueSliderFilter, "filter": sliderObject, id: "trololo"});
++    }
++
++    FilterWidgetFactory {
++        id: factory
++        widgetId: "testExpandableWidget"
++        widgetType: Filters.ExpandableFilterWidget
++        widgetData: widgetData1
++        anchors {
++            left: parent.left
++            right: parent.right
++        }
++        height: implicitHeight
++        clip: true
++    }
++
++    UT.UnityTestCase {
++        name: "FilterExpandableWidget"
++        when: windowShown
++
++        function test_expandedChanges() {
++            var expandingItem = findChild(factory, "expandingItem");
++            verify(!expandingItem.expanded)
++            compare(expandingItem.height, expandingItem.collapsedHeight)
++            mouseClick(expandingItem);
++            verify(expandingItem.expanded)
++            tryCompare(expandingItem, "height", expandingItem.expandedHeight)
++            verify(expandingItem.collapsedHeight < expandingItem.expandedHeight / 2);
++        }
++
++    }
++}
 === modified file 'tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml'
 --- tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml	2016-03-15 19:16:10 +0000
 +++ tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml	2016-04-27 12:56:09 +0000
@@ -43,7 +43,8 @@
              return [
                  { tag: "OptionSelector", type: Filters.OptionSelectorFilter, source: "FilterOptionSelector.qml" },
                  { tag: "RangeInputFilter", type: Filters.RangeInputFilter, source: "FilterRangeInput.qml" },
--                { tag: "ValueSliderFilter", type: Filters.ValueSliderFilter, source: "FilterValueSlider.qml" }
++                { tag: "ValueSliderFilter", type: Filters.ValueSliderFilter, source: "FilterValueSlider.qml" },
++                { tag: "ExpandableFilter", type: Filters.ExpandableFilterWidget, source: "FilterExpandableWidget.qml" }
              ];
+         }