Merge lp:~allanlesage/qakit/i18ncheck-sample-test into lp:~vrruiz/qakit/i18ncheck

[Allan LeSage]

Sample test, run with nosetests3 .

[Víctor R. Ruiz (vrruiz)]

Looks fine to me.

[Víctor R. Ruiz (vrruiz)]

review: Approve

=== added directory 'qakit/i18ncheck/tests'
=== added file 'qakit/i18ncheck/tests/test_filter_strings.py'
--- qakit/i18ncheck/tests/test_filter_strings.py	1970-01-01 00:00:00 +0000
+++ qakit/i18ncheck/tests/test_filter_strings.py	2015-07-16 00:11:20 +0000
@@ -0,0 +1,89 @@
+# Copyright (C) 2014-2015 Canonical
+#
+# 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; either version 2
+# of the License, or (at your option) any later version.
+#
+# 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+import unittest
+from unittest import mock
+
+import qakit.i18ncheck.TranslationChecker as translation_checker
+
+
+GALLERY_STRINGS = [
+    'import QtQuick 2.0\n',
+    'import Ubuntu.Components 1.1\n',
+    'import Ubuntu.Components.Extras 0.2 as Extras\n',
+    '\n',
+    '/*\n',
+    ' * Copyright (C) 2014 Canonical Ltd\n',
+    ' *\n',
+    ' * This program is free software: you can redistribute it and/or modify\n',
+    ' * it under the terms of the GNU General Public License version 3 as\n',
+    ' * published by the Free Software Foundation.\n',
+    ' *\n',
+    ' * This program is distributed in the hope that it will be useful,\n',
+    ' * but WITHOUT ANY WARRANTY; without even the implied warranty of\n',
+    ' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n',
+    ' * GNU General Public License for more details.\n',
+    ' *\n',
+    ' * You should have received a copy of the GNU General Public License\n',
+    ' * along with this program.  If not, see <http://www.gnu.org/licenses/>.\n',
+    ' */\n',
+    '\n',
+    'Page {\n',
+    '    id: page\n',
+    '    property string photo\n',
+    '    signal done(bool photoWasModified)\n',
+    '\n',
+    '    title: i18n.tr("Edit Photo")\n',
+    '\n',
+    '    head.backAction: Action {\n',
+    '        iconName: "back"\n',
+    '        onTriggered: editor.close(true)\n',
+    '    }\n',
+    '    head.actions: editor.actions\n',
+    '\n',
+    '    Extras.PhotoEditor {\n',
+    '        id: editor\n',
+    '        anchors.fill: parent\n',
+    '        onClosed: page.done(photoWasModified)\n',
+    '    }\n',
+    '\n',
+    '    onActiveChanged: {\n',
+    '        if (active) editor.open(page.photo)\n',
+    '    }\n',
+    '}\n'
+]
+
+
+class TranslationCheckerTestCase(unittest.TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.translation_checker_init_patch = mock.patch(
+            'qakit.i18ncheck.TranslationChecker.TranslationChecker.__init__',
+            return_value=None)
+        self.translation_checker_init_patch.start()
+
+    def tearDown(self):
+        self.translation_checker_init_patch.stop()
+
+
+class FilterStringsTestCase(TranslationCheckerTestCase):
+
+    def test_filter_gallery_strings_returns_edit_photo(self):
+        checker = translation_checker.TranslationChecker('gallery-app', ['es'])
+        result = checker._filter_strings(GALLERY_STRINGS, checker.REGEX_TR)
+        self.assertEqual(["Edit Photo"], result)

=== renamed file 'qakit/practitest/tests/test_practisanity.py' => 'qakit/practitest/tests/test_practisubunit.py'
--- qakit/practitest/tests/test_practisanity.py	2015-04-15 19:03:17 +0000
+++ qakit/practitest/tests/test_practisubunit.py	2015-07-16 00:11:20 +0000
@@ -15,16 +15,22 @@
 # 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 os
 import unittest
 from unittest import mock
 
-import practisanity
-import sanity_suite
-from tests.test_practitest import TESTS, INSTANCES
-
-
-class GetInstanceSanitySuiteNameTestCase(unittest.TestCase):
+from qakit.practitest.practisubunit import PractiSubunitSession
+from qakit.practitest.tests.test_practitest import TEST, TESTS
+
+
+class PractiSubunitSessionTestCase(unittest.TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.practisubunit_session = PractiSubunitSession(
+            42, 'fake_api_key', 'fake_api_secret_key')
+
+
+class GetInstanceSanitySuiteNameTestCase(PractiSubunitSessionTestCase):
 
     def test_get_instance_sanity_suite_name(self):
         instance = {
@@ -35,62 +41,11 @@
             'system_id': 1188312,
             'id': '24:1'
         }
-        sanity_name = 'ubuntu_sanity_tests.tests.test_settings_wizard.SettingsWizardTestCase.test_complete_settings_wizard'  # NOQA
-        result = practisanity._get_instance_sanity_suite_name(
-            TESTS, instance)
-        self.assertEqual(sanity_name, result)
-
-
-class BuildPractisanityTestMapTestCase(unittest.TestCase):
-
-    def test_build_practisanity_test_map(self):
-        test_name = 'ubuntu_sanity_tests.tests.test_bluetooth.BluetoothTestCase.test_disconnected_list_populates'  # NOQA
-        practitest_instance =  {
-            'system_id': 1188331,
-            'id': '24:11',
-            'last_run': {'value': '04-Mar-2015  17:12', 'name': 'Last Run'},
-            'run_status': {'value': 'FAILED', 'name': 'Run Status'},
-            'name': 'Discover Bluetooth devices'
-        }
-        practitest_tests = TESTS
-        sanity_suite_results = sanity_suite.parse_subunit_results(
-            os.path.join(os.path.dirname(__file__),
-                         'test-results.subunit'))
-        result = practisanity._build_practisanity_test_map(
-            practitest_instance,
-            practitest_tests,
-            sanity_suite_results)
-        self.assertEqual(
-            test_name,
-            result['test_name'])
-        self.assertEqual(
-            'Discover Bluetooth devices',
-            result['practitest_instance']['name'])
-        self.assertEqual(
-            test_name,
-            result['sanity_test_result']['id'])
-
-
-class ConfirmNameOfTestset(unittest.TestCase):
-
-    @mock.patch('practitest._get_testset')
-    @mock.patch('practisanity.input', create=True)
-    def test_confirm_name_of_testset(self, mock_input, mock_get_testset):
-        mock_input.return_value = "Y"
-        self.assertTrue(practisanity._confirm_name_of_testset(24))
-
-    @mock.patch('practitest._get_testset')
-    @mock.patch('practisanity.input', create=True)
-    def test_confirm_name_of_testset_false(self,
-                                           mock_input,
-                                           mock_get_testset):
-        mock_input.return_value = "n"
-        self.assertFalse(practisanity._confirm_name_of_testset(24))
-
-    @mock.patch('practitest._get_testset')
-    @mock.patch('practisanity.input', create=True)
-    def test_confirm_name_of_testset_gibberish(self,
-                                               mock_input,
-                                               mock_get_testset):
-        mock_input.return_value = "GIBBERISH"
-        self.assertTrue(practisanity._confirm_name_of_testset(24))
+        test_name = ('ubuntu_sanity_tests.tests.test_settings_wizard.'
+                     'SettingsWizardTestCase.test_complete_settings_wizard')
+        with mock.patch.object(self.practisubunit_session,
+                               'get_test',
+                               return_value=TEST):
+            result = self.practisubunit_session.get_instance_custom_field(
+                instance, "External ID", TESTS)
+        self.assertEqual(test_name, result)

=== modified file 'qakit/practitest/tests/test_practitest.py'
--- qakit/practitest/tests/test_practitest.py	2015-04-15 19:03:17 +0000
+++ qakit/practitest/tests/test_practitest.py	2015-07-16 00:11:20 +0000
@@ -19,7 +19,8 @@
 import unittest
 from unittest import mock
 
-import practitest
+from qakit.practitest.practitest import PractitestSession
+import qakit.practitest as practitest
 
 
 TESTS = [
@@ -158,41 +159,45 @@
 
 class GetInstancesTestCase(PractitestSessionTestCase):
 
-    @mock.patch.object('practitest.PractitestSession', '_get')
-    def test_get_instances(self, mock_get):
-        result = practitest._get_instances(24)
+    def test_get_instances(self):
+        with mock.patch.object(self.practitest_session,
+                               '_get') as mock_get:
+            result = self.practitest_session.get_instances(24)
         mock_get.assert_called_with(
-            'http://prod.practitest.com/api/sets/24/instances.json')
+            'https://prod.practitest.com/api/sets/24/instances.json')
 
 
 class GetTestsetTestCase(PractitestSessionTestCase):
 
-    @mock.patch('practitest._get')
-    def test_get_testset(self, mock_get):
-        practitest._get_testset(42)
-        mock_get.assert_called_with(
-            'http://prod.practitest.com/api/sets/42.json')
-
-
-class GetInstancesTestCase(PractitestSesssionTestCase):
-
-    @mock.patch('practitest._get')
-    def test_get_testset(self, mock_get):
-        practitest._get_instances(42)
-        mock_get.assert_called_with(
-            'http://prod.practitest.com/api/sets/42/instances.json')
-
-
-class GetTestTestCase(PractitestSesssionTestCase):
-
-    @mock.patch('practitest._get')
-    def test_get_test(self, mock_get):
-        practitest._get_test(42)
-        mock_get.assert_called_with(
-            'http://prod.practitest.com/api/tests/42.json')
-
-
-class GetTestFromTestsByName(PractitestSesssionTestCase):
+    def test_get_testset(self):
+        with mock.patch.object(self.practitest_session,
+                               '_get') as mock_get:
+            self.practitest_session.get_testset(42)
+        mock_get.assert_called_with(
+            'https://prod.practitest.com/api/sets/42.json')
+
+
+class GetInstancesTestCase(PractitestSessionTestCase):
+
+    def test_get_testset(self):
+        with mock.patch.object(self.practitest_session,
+                               '_get') as mock_get:
+            self.practitest_session.get_instances(42)
+        mock_get.assert_called_with(
+            'https://prod.practitest.com/api/sets/42/instances.json')
+
+
+class GetTestTestCase(PractitestSessionTestCase):
+
+    def test_get_test(self):
+        with mock.patch.object(self.practitest_session,
+                               '_get') as mock_get:
+            self.practitest_session.get_test(42)
+        mock_get.assert_called_with(
+            'https://prod.practitest.com/api/tests/42.json')
+
+
+class GetTestFromTestsByName(PractitestSessionTestCase):
 
     def test_get_test_from_tests_by_name(self):
         test = {
@@ -207,42 +212,49 @@
         }
         test_name = ('Complete wizard successfully '
                      '(English, SIM inserted, Wi-Fi connected)')
-        self.assertEqual(test, practitest._get_test_from_tests_by_name(
-            TESTS, test_name))
+        result = self.practitest_session.get_test_from_tests_by_name(
+            test_name, TESTS)
+        self.assertEqual(test, result)
 
     def test_get_gibberish(self):
         test_name = 'Test exploding OSK'
-        self.assertIsNone(practitest._get_test_from_tests_by_name(
-            TESTS, test_name))
-
-
-class GetIdOfTestByNameTestCase(PractitestSesssionTestCase):
-
-    @mock.patch('practitest._get_test_from_tests_by_name')
-    def test_get_id_of_test_by_name(self, get_test_mock):
-        get_test_mock.return_value = {
-            'last_run': '26-Feb-2015  11:44',
-            'display_id': 94,
-            'name': ('Complete wizard successfully '
-                     '(English, SIM inserted, Wi-Fi connected)'),
-            'run_status': 'PASSED',
-            'updated_at': '25-Feb-2015  16:14',
-            'steps_count': 9,
-            'system_id': 371857
-        }
-        test_name = ('Complete wizard successfully '
-                     '(English, SIM inserted, Wi-Fi connected)')
-        result = practitest._get_id_of_test_by_name(
-            TESTS, test_name)
+        result = self.practitest_session.get_test_from_tests_by_name(
+            test_name, TESTS)
+        self.assertIsNone(result)
+
+
+class GetIdOfTestByNameTestCase(PractitestSessionTestCase):
+
+    def test_get_id_of_test_by_name(self):
+        with mock.patch.object(
+                self.practitest_session,
+                'get_test_from_tests_by_name') as get_test_mock:
+            get_test_mock.return_value = {
+                'last_run': '26-Feb-2015  11:44',
+                'display_id': 94,
+                'name': ('Complete wizard successfully '
+                         '(English, SIM inserted, Wi-Fi connected)'),
+                'run_status': 'PASSED',
+                'updated_at': '25-Feb-2015  16:14',
+                'steps_count': 9,
+                'system_id': 371857
+            }
+            test_name = ('Complete wizard successfully '
+                         '(English, SIM inserted, Wi-Fi connected)')
+            result = self.practitest_session._get_id_of_test_by_name(
+                test_name, TESTS)
         self.assertEqual(94, result)
 
 
-class GetTestExternalId(PractitestSesssionTestCase):
[e-mail]
+class GetTestExternalId(PractitestSessionTestCase):
 
     def test_get_test_external_id(self):
-        result = practitest._get_test_external_id(TEST)
-        self.assertEqual('ubuntu_sanity_tests.tests.test_settings_wizard.SettingsWizardTestCase.test_complete_settings_wizard', result)  # NOQA
+        result = practitest.get_test_external_id(TEST)
+        self.assertEqual(('ubuntu_sanity_tests.tests.test_settings_wizard.'
+                          'SettingsWizardTestCase.test_complete_settings_wizard'),
+                         result)
 
     def test_get_id_of_not_sanity_test(self):
-        result = practitest._get_test_external_id(NOT_SANITY_TEST)
+        result = self.practitest_session.get_test_external_id(NOT_SANITY_TEST)
         self.assertEqual(None, result)

=== added file 'qakit/practitest/tests/test_report_subunit_results_to_practitest.py'
--- qakit/practitest/tests/test_report_subunit_results_to_practitest.py	1970-01-01 00:00:00 +0000
+++ qakit/practitest/tests/test_report_subunit_results_to_practitest.py	2015-07-16 00:11:20 +0000
@@ -0,0 +1,51 @@
+# PractiSubunit
+# Copyright (C) 2015 Canonical
+#
+# 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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 unittest
+from unittest import mock
+
+import qakit.practitest.report_subunit_results_to_practitest as report
+
+
[e-mail]('qakit.practitest.report_subunit_results_to_practitest.input',
+            create=True)
+class ConfirmNameOfTestset(unittest.TestCase):
+
+    mock_practisubunit_session = mock.Mock(
+        get_testset=mock.Mock(
+            return_value={'name': 'fake_name',
+                          'assigned_to': {'value': 'fake_value'}}))
+
+    def test_confirm_name_of_testset(self, mock_input):
+        mock_input.return_value = "Y"
+        self.assertTrue(
+            report._confirm_name_of_testset(
+                24,
+                self.mock_practisubunit_session))
+
+    def test_confirm_name_of_testset_false(self, mock_input):
+        mock_input.return_value = "n"
+        self.assertFalse(
+            report._confirm_name_of_testset(
+                24,
+                self.mock_practisubunit_session))
+
+    def test_confirm_name_of_testset_gibberish(self, mock_input):
+        mock_input.return_value = "GIBBERISH"
+        self.assertTrue(
+            report._confirm_name_of_testset(
+                24,
+                self.mock_practisubunit_session))

=== modified file 'qakit/practitest/tests/test_sanity_suite.py'
--- qakit/practitest/tests/test_sanity_suite.py	2015-04-15 19:03:17 +0000
+++ qakit/practitest/tests/test_sanity_suite.py	2015-07-16 00:11:20 +0000
@@ -1,5 +1,5 @@
 
-# PractiSanity
+# PractiSubunit
 # Copyright (C) 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
@@ -18,29 +18,28 @@
 import os
 import unittest
 
-import sanity_suite
-
-
-class GetSanitySuiteTestByName(unittest.TestCase):
-
-    def test_get_sanity_suite_test_by_name(self):
-        # FIXME: pickle the results?
-        test_name = 'ubuntu_sanity_tests.tests.test_bluetooth.BluetoothTestCase.test_disconnected_list_populates'
-        sanity_suite_results = sanity_suite.parse_subunit_results(
+import qakit.practitest.subunit_results as subunit
+
+
+class GetSubunitSuiteTestByName(unittest.TestCase):
+
+    def test_get_subunit_test_by_name(self):
+        test_name = ('ubuntu_sanity_tests.tests.test_bluetooth.'
+                     'BluetoothTestCase.test_disconnected_list_populates')
+        subunit_results = subunit.parse(
             os.path.join(os.path.dirname(__file__),
                          'test-results.subunit'))
-        result = sanity_suite.get_sanity_suite_test_by_name(
+        result = subunit.get_subunit_test_by_name(
             test_name,
-            sanity_suite_results)
+            subunit_results)
         self.assertEqual(test_name, result['id'])
 
-    def test_get_sanity_suite_test_by_name(self):
-        # FIXME: pickle the results?
+    def test_get_subunit_test_by_name_gibberish(self):
         test_name = 'exploding_osk.really.this_would_never_be_a_test_name'
-        sanity_suite_results = sanity_suite.parse_subunit_results(
+        subunit_results = subunit.parse(
             os.path.join(os.path.dirname(__file__),
                          'test-results.subunit'))
-        result = sanity_suite.get_sanity_suite_test_by_name(
+        result = subunit.get_subunit_test_by_name(
             test_name,
-            sanity_suite_results)
+            subunit_results)
         self.assertEqual(None, result)