Merge lp:~pete-woods/indicator-network/fix-uss-wifi-settings-lp1647830 into lp:indicator-network

[Pete Woods]

Export the correct menu contents for the settings menu

- Add a test to prove it

Export the correct menu contents for the settings menu

- Add a test to prove it

[Xavi Garcia (xavi-garcia-mena)]

Looks good to me ;)

review: Approve

=== modified file 'src/indicator/sections/wifi-section.cpp'
--- src/indicator/sections/wifi-section.cpp	2016-12-01 11:40:00 +0000
+++ src/indicator/sections/wifi-section.cpp	2016-12-14 16:55:18 +0000
@@ -43,6 +43,7 @@
 
     ActionGroupMerger::Ptr m_actionGroupMerger;
     MenuMerger::Ptr m_menuMerger;
+    MenuMerger::Ptr m_settingsModel;
 
     Menu::Ptr m_switchMenu;
     Menu::Ptr m_menu;
@@ -58,6 +59,7 @@
     {
         m_actionGroupMerger = make_shared<ActionGroupMerger>();
         m_menuMerger = make_shared<MenuMerger>();
+        m_settingsModel = make_shared<MenuMerger>();
         m_switchMenu = make_shared<Menu>();
         m_menu = make_shared<Menu>();
         m_settingsMenu = make_shared<Menu>();
@@ -70,6 +72,8 @@
         m_menuMerger->append(m_switchMenu);
         m_menuMerger->append(m_menu);
         m_menuMerger->append(m_settingsMenu);
+        m_settingsModel->append(m_switchMenu);
+        m_settingsModel->append(m_menu);
 
         updateLinks();
         connect(m_manager.get(), &Manager::linksUpdated, this, &Private::updateLinks);
@@ -169,7 +173,7 @@
 MenuModel::Ptr
 WifiSection::settingsModel()
 {
-    return d->m_settingsMenu;
+    return d->m_settingsModel;
 }
 
 #include "wifi-section.moc"

=== modified file 'tests/integration/indicator-network-test-base.cpp'
--- tests/integration/indicator-network-test-base.cpp	2016-12-01 11:40:00 +0000
+++ tests/integration/indicator-network-test-base.cpp	2016-12-14 16:55:18 +0000
@@ -209,6 +209,14 @@
             "/com/canonical/indicator/network/phone");
 }
 
+mh::MenuMatcher::Parameters IndicatorNetworkTestBase::phoneWifiSettingsParameters()
+{
+    return mh::MenuMatcher::Parameters(
+            "com.canonical.indicator.network",
+            { { "indicator", "/com/canonical/indicator/network" } },
+            "/com/canonical/indicator/network/phone_wifi_settings");
+}
+
 mh::MenuMatcher::Parameters IndicatorNetworkTestBase::unlockSimParameters(std::string const& busName, int exportId)
 {
     return mh::MenuMatcher::Parameters(

=== modified file 'tests/integration/indicator-network-test-base.h'
--- tests/integration/indicator-network-test-base.h	2016-12-01 11:40:00 +0000
+++ tests/integration/indicator-network-test-base.h	2016-12-14 16:55:18 +0000
@@ -149,6 +149,8 @@
 
     static unity::gmenuharness::MenuMatcher::Parameters phoneParameters();
 
+    static unity::gmenuharness::MenuMatcher::Parameters phoneWifiSettingsParameters();
+
     static unity::gmenuharness::MenuMatcher::Parameters unlockSimParameters(std::string const& busName, int exportId);
 
     void startIndicator();

=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2016-12-05 18:14:26 +0000
+++ tests/integration/test-indicator.cpp	2016-12-14 16:55:18 +0000
@@ -492,6 +492,27 @@
     EXPECT_EQ("/", activeConnection.path().toStdString());
 }
 
+TEST_F(TestIndicator, OneDisconnectedAccessPointAtStartupInSettingsMenu)
+{
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+    auto device = createWiFiDevice(NM_DEVICE_STATE_DISCONNECTED);
+    auto ap = createAccessPoint("0", "the ssid", device);
+    auto connection = createAccessPointConnection("0", "the ssid", device);
+
+    ASSERT_NO_THROW(startIndicator());
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneWifiSettingsParameters())
+        .item(wifiEnableSwitch())
+        .item(mh::MenuItemMatcher()
+            .section()
+            .item(accessPoint("the ssid",
+                  Secure::wpa,
+                  ApMode::infra,
+                  ConnectionStatus::disconnected)
+            )
+        ).match());
+}
+
 TEST_F(TestIndicator, OneDisconnectedAccessPointAtStartup)
 {
     setGlobalConnectedState(NM_STATE_DISCONNECTED);