Merge lp:~veebers/stock-ticker-mobile-app/mock-server-for-testing into lp:stock-ticker-mobile-app

[Christopher Lee]

Introduce a mock http server for use in testing

Introduce a mock http server for use in testing (no need to hit external network).
Modify application so that it can take a data source url as an argument (enabling use of the mock server).

Unmerged revisions

76. By Christopher Lee on 2013-11-13

Initial server working

75. By Christopher Lee on 2013-11-12

Further additions to assist in mocking server.

74. By Christopher Lee on 2013-11-12

Enable being able to use a different datasource.

=== modified file 'Add_Stocks_page.qml'
--- Add_Stocks_page.qml	2013-08-28 03:15:07 +0000
+++ Add_Stocks_page.qml	2013-11-13 01:54:57 +0000
@@ -27,6 +27,7 @@
     property string active_search_tick: ""
     property string before_after_space: "00"
     //   This is used as two varibles > 0 is for has space at begining of line in `function update_search_text`
+    property string dataServerUrl: "http://d.yimg.com/autoc.finance.yahoo.com/" // Can be overwritten for testing.
 
     Timer {
         id: reloadTrigger
@@ -55,7 +56,6 @@
 
     function text_change_handler() {
         log("text_change_handler()")
-
         // Find the current word the user is editing by spaces before and after current word at cursor
         var cursor_to_end = addStockTextField.text.substr(addStockTextField.cursorPosition).split(' ')
         var cursor_to_begining = addStockTextField.text.substr(0, addStockTextField.cursorPosition+cursor_to_end[0].length).split(' ')
@@ -73,7 +73,7 @@
         matchIndicator = true
         active_search_tick = search_word
         before_after_space = before_after
-        xhr.open("GET","http://d.yimg.com/autoc.finance.yahoo.com/autoc?query="+search_word+"&callback=YAHOO.Finance.SymbolSuggest.ssCallback", true);
+        xhr.open("GET", dataServerUrl + "autoc?query="+search_word+"&callback=YAHOO.Finance.SymbolSuggest.ssCallback", true);
         xhr.onreadystatechange = function()
         {
             if ( xhr.readyState == xhr.DONE) {

=== modified file 'Current_charts_page.qml'
--- Current_charts_page.qml	2013-09-04 01:51:45 +0000
+++ Current_charts_page.qml	2013-11-13 01:54:57 +0000
@@ -20,6 +20,7 @@
 import "javascript/graph.js" as Graph
 
 Rectangle {
+    objectName: "chartDetails"
     property var canvas_object
     onVisibleChanged: visible && displayDayInfo()
    // color: "#FCFCFC"

=== modified file 'Stock_Ticker.qml'
--- Stock_Ticker.qml	2013-10-09 20:13:18 +0000
+++ Stock_Ticker.qml	2013-11-13 01:54:57 +0000
@@ -24,6 +24,17 @@
 
 
 MainView {
+    Arguments {
+        id: args
+
+        Argument {
+            name: "dataserver"
+            help: "Server to use for retrieving data (Useful for testing.)"
+            required: false
+            valueNames: ["URL"]
+        }
+    }
+
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "stockTicker"
     applicationName: "com.ubuntu.stock-ticker-mobile"
@@ -47,13 +58,26 @@
 
     property int dummyTextWidth // Holds the width of the percent sign in Stock_Component_Main
 
-    property string serverDomain: "http://www.surgemcgee.com:8080/"
-//    property string serverDomain: "http://localhost:8080/"
+    property string serverDomain: get_data_server() ? get_data_server() : "http://www.surgemcgee.com:8080/"
+    property string dataServer: get_data_server() ? get_data_server() : "http://finance.yahoo.com/"
 
     function log(message) {
          console.log("["+applicationName+"] "+message)
     }
 
+    // If no dataserver argument passed returns undefined, otherwise returns a cleaned up URL.
+    function get_data_server() {
+        var server = args.values.dataserver;
+        if (server === undefined)
+            return undefined
+        if (server.substr(0, 7) !== "http://")
+            server = "http://" + server
+        if (server.slice(-1) !== "/")
+            server += "/"
+
+        return server
+    }
+
     property string quoteParams: "?f=sabl1vpghojkc8dre7j1n&s="
     property var database: new Store.IndurateDatabase({name: "SockTickerMobile", version: "1.0", description: "The Stock Ticker core application database", size: 4}, LocalStorage)
     property var userTable: database.initTable(primaryTable, false, function(msg){ console.log(msg) })
@@ -413,7 +437,7 @@
 
     XmlListModel {
         id: newsFeed
-        source: "http://finance.yahoo.com/rss/headline?s="+chartTick
+        source: dataServer + "rss/headline?s=" +chartTick
         query: "/rss/channel/item"
         XmlRole { name: "title"; query: "title/string()" }
         XmlRole { name: "description"; query: "description/string()" }
@@ -672,7 +696,10 @@
                         width: parent.width - 10 // Subtract the main program border amount here
                         height: parent.height
                         anchors.horizontalCenter: parent.horizontalCenter
-                        Add_Stocks_page { id: addStocksTab }
+                        Add_Stocks_page {
+                            id: addStocksTab
+                            dataServerUrl: get_data_server() ? get_data_server() : Add_Stocks_page.dataServerUrl
+                        }
                     }
             }
         }

=== modified file 'tests/autopilot/stock_ticker/emulators.py'
--- tests/autopilot/stock_ticker/emulators.py	2013-10-10 18:51:45 +0000
+++ tests/autopilot/stock_ticker/emulators.py	2013-11-13 01:54:57 +0000
@@ -19,19 +19,20 @@
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
 
-class MainView(toolkit_emulators.MainView):
+class Stock(toolkit_emulators.MainView):
 
     def move_subtabs_bar_up(self):
         """Moves the subtabs bar to a different location"""
-        qmlView = self.select("QQuickView")
-        sub_bar = self.select("QQuickRectangle", objectName='subTabsBar')
+        sub_bar = self.select_single(
+            "QQuickRectangle",
+            objectName='subTabsBar')
         button_width = sub_bar.select_single(
             'UbuntuShape', objectName='detailsTab').width
         self.pointing_device.move_to_object(sub_bar)
 
         self.pointing_device.drag(
             self.pointing_device.x-button_width-5, self.pointing_device.y,
-            self.pointing_device.x-button_width-5, qmlView.height*0.3)
+            self.pointing_device.x-button_width-5, self.height*0.3)
 
     def flick_page_up(self, obj):
         """Moves the pointer around the charts sub tab"""
@@ -61,23 +62,24 @@
 
     def after_program_fully_loaded(self):
         """
-        Returns when all of the applications ActivityIndicator.running
-        state is False.
+        Blocks until all of the applications ActivityIndicator.running state
+        are False.
+
+        :raises AssertionError: if the running states take longer than 10 sec
+        to transition to False
+
         """
 
-        add_activity_indicator = self.select(
+        add_activity_indicator = self.select_single(
             'ActivityIndicator', objectName='addActivityIndicator')
-        current_activity_indicator = self.select(
+        current_activity_indicator = self.select_single(
             'ActivityIndicator', objectName='currentActivityIndicator')
-        charts_activity_indicator = self.select(
+        charts_activity_indicator = self.select_single(
             'ActivityIndicator', objectName='chartsActivityIndicator')
-        news_activity_indicator = self.select(
+        news_activity_indicator = self.select_single(
             'ActivityIndicator', objectName='newsActivityIndicator')
-        self.assertThat(add_activity_indicator.running,
-                        Eventually(Equals(False)))
-        self.assertThat(current_activity_indicator.running,
-                        Eventually(Equals(False)))
-        self.assertThat(charts_activity_indicator.running,
-                        Eventually(Equals(False)))
-        self.assertThat(news_activity_indicator.running,
-                        Eventually(Equals(False)))
+
+        add_activity_indicator.running.wait_for(False)
+        current_activity_indicator.running.wait_for(False)
+        charts_activity_indicator.running.wait_for(False)
+        news_activity_indicator.running.wait_for(False)

=== added file 'tests/autopilot/stock_ticker/mock_data_server.py'
--- tests/autopilot/stock_ticker/mock_data_server.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/stock_ticker/mock_data_server.py	2013-11-13 01:54:57 +0000
@@ -0,0 +1,144 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# 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 BaseHTTPServer
+import errno
+import os
+import socket
+import threading
+from textwrap import dedent
+import re
+
+
+class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+    """Simple HTTP request handler that mocks data and requests for testing."""
+
+    def _send_xml(self, xml):
+        self.send_response(200)
+        self.send_header("Content-Type", "application/xml")
+        self.end_headers()
+        self.wfile.write(
+            '<?xml version="1.0" encoding="UTF-8"?>{content}'.format(
+                content=xml
+            )
+        )
+
+    def _send_json(self, json):
+        self.send_response(200)
+        self.send_header(
+            "Content-Type",
+            "application/x-javascript; charset=utf-8"
+        )
+        self.end_headers()
+        self.wfile.write(json)
+
+    def send_stock_data(self):
+        match_check = re.compile("\&s=[\+]+goo")
+        if match_check.search(self.path) is not None:
+            google_stock_data = dedent(
+                '<stockInfo>'
+                '<currentStats stkent0="GOOG" '
+                'stkent1="1040.66" stkent2="1009.50" stkent3="1010.59" '
+                'stkent4="1112778" stkent5="1016.03" stkent6="1008.00" '
+                'stkent7="1015.93" stkent8="1009.51" stkent9="636.00" '
+                'stkent10="1041.52" stkent11="N/A - N/A" stkent12="0.00" '
+                'stkent13="27.65" stkent14="44.06" stkent15="337.6B" '
+                'stkent16="Google Inc."/>'
+                '</stockInfo>'
+            )
+            self._send_xml(google_stock_data)
+        else:
+            self._send_xml('<stockInfo></stockInfo>')
+
+    def send_autocomplete_data(self):
+        """Build up a response for the autocomplete.
+
+        Pad-out the wanted data with dummy data
+
+        """
+        google_result = dedent(
+            '{"symbol":"GOOG","name": "Google Inc.","exch": "NMS","type": "S",'
+            '"exchDisp":"NASDAQ","typeDisp":"Equity"}'
+        )
+        dummy_result = dedent(
+            '{"symbol":"DUMM","name": "Dummy Inc.","exch": "NMS","type": "S",'
+            '"exchDisp":"NASDAQ","typeDisp":"Equity"}'
+        )
+        result_list = "{google},{dummies}".format(
+            google=google_result,
+            dummies=",".join([dummy_result for x in range(9)])
+        )
+        json = dedent(
+            'YAHOO.Finance.SymbolSuggest.ssCallback('
+            '{"ResultSet":{"Query":"goo","Result":'
+            '['
+            '%s'
+            ']}})'
+            % result_list
+        )
+        self._send_json(json)
+
+    def do_GET(self):
+        try:
+            if self.path.startswith("/?f"):
+                self.send_stock_data()
+            elif self.path.startswith("/rss/2.0/headline"):
+                self._send_xml('<rss version="2.0"><channel/></rss>')
+            elif self.path.startswith("/autoc"):
+                self.send_autocomplete_data()
+            else:
+                self.send_response(200)
+                self.end_headers()
+                self.wfile.write("[[[[ UNKNOWN ]]]]")
+        except IOError as e:
+            pass
+
+class HTTPServerInAThread(threading.Thread):
+    """Simple custom HTTP server run in a separate thread."""
+
+    def __init__(self):
+        super(HTTPServerInAThread, self).__init__()
+        port = 12345
+        self.server = None
+        while self.server is None:
+            try:
+                self.server = BaseHTTPServer.HTTPServer(
+                    ("", port),
+                    HTTPRequestHandler
+                )
+            except socket.error as error:
+                if (error.errno == errno.EADDRINUSE):
+                    print "Port %d is already in use" % port
+                    port += 1
+                else:
+                    print os.strerror(error.errno)
+                    raise
+        self.server.allow_reuse_address = True
+
+    @property
+    def port(self):
+        return self.server.server_port
+
+    def run(self):
+        print "now serving on port %d" % self.port
+        self.server.serve_forever()
+
+    def shutdown(self):
+        self.server.shutdown()
+        self.server.server_close()
+
+
+__all__ = ["HTTPServerInAThread"]

=== modified file 'tests/autopilot/stock_ticker/tests/__init__.py'
--- tests/autopilot/stock_ticker/tests/__init__.py	2013-10-10 18:13:37 +0000
+++ tests/autopilot/stock_ticker/tests/__init__.py	2013-11-13 01:54:57 +0000
@@ -26,7 +26,7 @@
 from autopilot.testcase import AutopilotTestCase
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
-from stock_ticker import emulators
+from stock_ticker import emulators, mock_data_server
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../Stock_Ticker.qml"
-    installed_location = "/usr/share/stock-ticker-mobile-app/Stock_Tickers.qml"
+    installed_location = "/usr/share/stock-ticker-mobile-app/Stock_Ticker.qml"
     sqlite_dir = os.path.expanduser(
         "~/.local/share/com.ubuntu.stock-ticker-mobile/Databases")
     backup_dir = sqlite_dir + ".backup"
@@ -54,32 +54,43 @@
         self.temp_move_sqlite_db()
         self.addCleanup(self.restore_sqlite_db)
 
+        self.server = mock_data_server.HTTPServerInAThread()
+        self.server.start()
+        self.addCleanup(self.server.shutdown)
+
+        url = self._get_data_server_url()
         if os.path.exists(self.local_location):
-            self.launch_test_local()
+            self.launch_test_local(url)
         elif os.path.exists(self.installed_location):
-            self.launch_test_installed()
+            self.launch_test_installed(url)
         else:
-            self.launch_test_click()
-
-    def launch_test_local(self):
+            self.launch_test_click(url)
+
+    def _get_data_server_url(self):
+        return "http://localhost:%s" % self.server.port
+
+    def launch_test_local(self, server_url):
         self.app = self.launch_test_application(
             "qmlscene",
             self.local_location,
+            "--dataserver=%s" % server_url,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
-    def launch_test_installed(self):
+    def launch_test_installed(self, server_url):
         self.app = self.launch_test_application(
             "qmlscene",
             self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "stock-ticker-app.desktop",
+            "--dataserver=%s" % server_url,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
-    def launch_test_click(self):
+    def launch_test_click(self, server_url):
         self.app = self.launch_click_package(
             "com.ubuntu.stock-ticker-mobile",
+            "--dataserver=%s" % server_url,
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def temp_move_sqlite_db(self):
@@ -113,4 +124,4 @@
 
     @property
     def main_view(self):
-        return self.app.select_single(emulators.MainView)
+        return self.app.select_single(emulators.Stock, objectName="stockTicker")

=== modified file 'tests/autopilot/stock_ticker/tests/test_Management_page.py'
--- tests/autopilot/stock_ticker/tests/test_Management_page.py	2013-10-10 18:51:45 +0000
+++ tests/autopilot/stock_ticker/tests/test_Management_page.py	2013-11-13 01:54:57 +0000
@@ -23,6 +23,7 @@
 from __future__ import absolute_import
 
 from testtools.matchers import Equals
+from autopilot.introspection.dbus import StateNotFoundError
 from autopilot.matchers import Eventually
 from stock_ticker.tests import StockTickerTestCase
 
@@ -95,19 +96,23 @@
         management_delegate = \
             management_listview.get_children()[0].get_children()
 
-        cmpy_index = -1
+        # Find the newly added row and list item.
+        target_row = None
         for o in management_delegate:
-            add_list_item = o.select_single(
-                'QQuickText', objectName='companyNameText')
-            cmpy_index += 1
-            if add_list_item and hasattr(add_list_item, 'text'):
-                if add_list_item.text == 'Google Inc.':
-                    break
-
-        self.assertThat(add_list_item.text, Eventually(Equals('Google Inc.')))
-
-        remove_button = management_delegate[cmpy_index].select_single(
-            'QQuickItem', objectName='removeButton')
+            try:
+                o.select_single(
+                    'QQuickText',
+                    objectName='companyNameText',
+                    text="Google Inc."
+                )
+                target_row = o
+                break
+            except StateNotFoundError:
+                pass
+
+        remove_button = target_row.select_single(
+            'QQuickItem',
+            objectName='removeButton')
         self.pointing_device.click_object(remove_button)
 
         self.assertThat(management_listview.count,

=== modified file 'tests/autopilot/stock_ticker/tests/test_Subtabs.py'
--- tests/autopilot/stock_ticker/tests/test_Subtabs.py	2013-10-10 18:51:45 +0000
+++ tests/autopilot/stock_ticker/tests/test_Subtabs.py	2013-11-13 01:54:57 +0000
@@ -42,7 +42,7 @@
 
         tabs = self.app.select_single("Tabs", objectName="rootTabs")
 
-        self.main_view.switch_to_tab(0)
+        self.main_view.switch_to_tab_by_index(0)
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
 
         self.main_view.after_program_fully_loaded()
@@ -54,29 +54,38 @@
         details_button = sub_bar.select_single(
             'UbuntuShape', objectName='detailsTab')
 
-        subtab_pages = self.app.select_single(
-            'QQuickItem', objectName='currentRectSizer').get_children()
+        tabs_container = self.app.select_single(
+            'QQuickItem', objectName='currentRectSizer')
+        chart_details = tabs_container.select_single(
+            "Current",
+            objectName="chartDetails")
+        details_listview = tabs_container.select_single(
+            "QQuickListView",
+            objectName="detailsListView")
+
+        # Ensure toolbar is hidden so we can interact with buttons
+        self.main_view.close_toolbar()
 
         self.pointing_device.click_object(details_button)
-        self.assertThat(subtab_pages[2].visible, Eventually(Equals(True)))
+        self.assertThat(details_listview.visible, Eventually(Equals(True)))
 
         self.pointing_device.click_object(charts_button)
 
-        self.assertThat(subtab_pages[2].visible, Eventually(Equals(False)))
-        self.assertThat(subtab_pages[1].visible, Eventually(Equals(True)))
+        self.assertThat(details_listview.visible, Eventually(Equals(False)))
+        self.assertThat(chart_details.visible, Eventually(Equals(True)))
 
         chart_dot = self.app.select_single(
             'QQuickImage', objectName='chartDot')
         chart_info = self.app.select_single(
             'QQuickText', objectName='dayInfoText')
 
-        self.pointing_device.click_object(subtab_pages[1])
+        self.pointing_device.click_object(chart_details)
 
         dot_x = chart_dot.x
         info_text = chart_info.text
 
         self.main_view.move_subtabs_bar_up()
-        self.main_view.flick_page_right(subtab_pages[1])
+        self.main_view.flick_page_right(chart_details)
 
         self.assertThat(chart_dot.x, NotEquals(dot_x))
         self.assertThat(chart_info.text, NotEquals(info_text))
@@ -90,7 +99,7 @@
 
         tabs = self.app.select_single("Tabs", objectName="rootTabs")
 
-        self.main_view.switch_to_tab(0)
+        self.main_view.switch_to_tab_by_index(0)
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
 
         self.main_view.after_program_fully_loaded()
@@ -103,19 +112,25 @@
         details_button = sub_bar.select_single(
             'UbuntuShape', objectName='detailsTab')
 
-        subtab_pages = self.app.select_single(
-            'QQuickItem', objectName='currentRectSizer').get_children()
+        tabs_container = self.app.select_single(
+            'QQuickItem', objectName='currentRectSizer')
+        news_listview = tabs_container.select_single(
+            "QQuickListView",
+            objectName="newsListView")
+        details_listview = tabs_container.select_single(
+            "QQuickListView",
+            objectName="detailsListView")
+
+        # Ensure toolbar is hidden so we can interact with buttons
+        self.main_view.close_toolbar()
 
         self.pointing_device.click_object(news_button)
-        self.assertThat(subtab_pages[3].visible, Eventually(Equals(True)))
+        self.assertThat(news_listview.visible, Eventually(Equals(True)))
 
         self.pointing_device.click_object(details_button)
 
-        self.assertThat(subtab_pages[3].visible, Eventually(Equals(False)))
-        self.assertThat(subtab_pages[2].visible, Eventually(Equals(True)))
-
-        details_listview = self.app.select_single(
-            'QQuickListView', objectName='detailsListView')
+        self.assertThat(news_listview.visible, Eventually(Equals(False)))
+        self.assertThat(details_button.visible, Eventually(Equals(True)))
 
         contentY = details_listview.contentY
 
@@ -123,7 +138,7 @@
                         Eventually(Equals(details_listview.contentY)))
 
         self.main_view.move_subtabs_bar_up()
-        self.main_view.hold_page_down(subtab_pages[2])
+        self.main_view.hold_page_down(details_listview)
 
         self.assertThat(details_listview.contentY,
                         Eventually(NotEquals(contentY)))
@@ -151,26 +166,33 @@
         details_button = sub_bar.select_single(
             'UbuntuShape', objectName='detailsTab')
 
-        subtab_pages = self.app.select_single(
-            'QQuickItem', objectName='currentRectSizer').get_children()
+        tabs_container = self.app.select_single(
+            'QQuickItem',
+            objectName='currentRectSizer')
+
+        news_listview = tabs_container.select_single(
+            "QQuickListView",
+            objectName="newsListView")
+        details_listview = tabs_container.select_single(
+            "QQuickListView",
+            objectName="detailsListView")
+
+        self.main_view.close_toolbar()
 
         self.pointing_device.click_object(details_button)
-        self.assertThat(subtab_pages[2].visible, Eventually(Equals(True)))
+        self.assertThat(details_listview.visible, Eventually(Equals(True)))
 
         self.pointing_device.click_object(news_button)
 
-        self.assertThat(subtab_pages[2].visible, Eventually(Equals(False)))
-        self.assertThat(subtab_pages[3].visible, Eventually(Equals(True)))
-
-        news_listview = self.app.select_single(
-            'QQuickListView', objectName='newsListView')
+        self.assertThat(details_listview.visible, Eventually(Equals(False)))
+        self.assertThat(news_listview.visible, Eventually(Equals(True)))
 
         contentY = news_listview.contentY
 
         self.assertThat(news_listview.contentY, Eventually(Equals(contentY)))
 
         self.main_view.move_subtabs_bar_up()
-        self.main_view.hold_page_down(subtab_pages[3])
+        self.main_view.hold_page_down(news_listview)
 
         self.assertThat(news_listview.contentY,
                         Eventually(NotEquals(contentY)))

=== modified file 'tests/autopilot/stock_ticker/tests/test_Toolbar_actions.py'
--- tests/autopilot/stock_ticker/tests/test_Toolbar_actions.py	2013-10-10 18:51:45 +0000
+++ tests/autopilot/stock_ticker/tests/test_Toolbar_actions.py	2013-11-13 01:54:57 +0000
@@ -70,7 +70,10 @@
         reset_dialog = self.app.select_single(
             'Dialog', objectName='resetDataDialog')
         self.pointing_device.click_object(
-            reset_dialog.select_single('Button', objectName='resetConfirm'))
+            reset_dialog.select_single(
+                'Button',
+                objectName='resetConfirm',
+                text="Reset Current Profile"))
 
         self.main_view.close_toolbar()
 
@@ -88,7 +91,10 @@
         reset_dialog_a = self.app.select_single(
             'Dialog', objectName='resetDataDialog')
         self.pointing_device.click_object(
-            reset_dialog_a.select_single('Button', objectName='resetConfirm'))
+            reset_dialog_a.select_single(
+                'Button',
+                objectName='resetConfirm',
+                text="Reset Current Profile"))
 
         self.main_view.close_toolbar()