[Pkg-mozext-commits] [requestpolicy] 54/80: Marionette "addons" library: add some methods

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit c61ef78156ac6076dc36bbce46a21f50480453d7
Author: Martin Kimmerle <dev at 256k.de>
Date:   Fri Jun 19 19:32:58 2015 +0200

    Marionette "addons" library: add some methods
    
    add those methods for convenience:
    * is_addon_installed
    * is_addon_enabled
---
 tests/marionette/rp_puppeteer/tests/test_addons.py | 41 ++++++++++++++--------
 tests/marionette/rp_puppeteer/ui/addons.py         | 12 +++++++
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/tests/marionette/rp_puppeteer/tests/test_addons.py b/tests/marionette/rp_puppeteer/tests/test_addons.py
index 5831ec4..673bd3f 100644
--- a/tests/marionette/rp_puppeteer/tests/test_addons.py
+++ b/tests/marionette/rp_puppeteer/tests/test_addons.py
@@ -74,15 +74,11 @@ class TestAddons(AddonsTestCase):
         self.assertTrue(self.addons.is_addon_installed(ADDON_ID))
 
     def test_uninstall_install(self):
-        def is_installed():
-            with self.addons.using_addon_list() as about_addons:
-                return about_addons.is_addon_installed(ADDON_ID)
-
-        self.assertTrue(is_installed())
+        self.assertTrue(self.addons.is_addon_installed(ADDON_ID))
         self.addons.remove_addon_by_id(ADDON_ID)
-        self.assertFalse(is_installed())
+        self.assertFalse(self.addons.is_addon_installed(ADDON_ID))
         self.addons.install_addon(INSTALL_URL)
-        self.assertTrue(is_installed())
+        self.assertTrue(self.addons.is_addon_installed(ADDON_ID))
 
     def test_multiple_uninstall_install(self):
         self.addons.remove_addon_by_id(ADDON_ID)
@@ -91,16 +87,11 @@ class TestAddons(AddonsTestCase):
         self.addons.install_addon(INSTALL_URL)
 
     def test_disable_enable(self):
-        def is_enabled():
-            with self.addons.using_addon_list() as about_addons:
-                addon = about_addons.get_addon_by_id(ADDON_ID)
-                return addon.is_enabled()
-
-        self.assertTrue(is_enabled())
+        self.assertTrue(self.addons.is_addon_enabled(ADDON_ID))
         self.addons.disable_addon_by_id(ADDON_ID)
-        self.assertFalse(is_enabled())
+        self.assertFalse(self.addons.is_addon_enabled(ADDON_ID))
         self.addons.enable_addon_by_id(ADDON_ID)
-        self.assertTrue(is_enabled())
+        self.assertTrue(self.addons.is_addon_enabled(ADDON_ID))
 
     def test_multiple_disable_enable(self):
         self.addons.disable_addon_by_id(ADDON_ID)
@@ -108,6 +99,26 @@ class TestAddons(AddonsTestCase):
         self.addons.enable_addon_by_id(ADDON_ID)
         self.addons.enable_addon_by_id(ADDON_ID)
 
+    def test_is_installed(self):
+        self.assertTrue(self.addons.is_addon_installed(ADDON_ID))
+        self.addons.disable_addon_by_id(ADDON_ID)
+        self.assertTrue(self.addons.is_addon_installed(ADDON_ID))
+        self.addons.remove_addon_by_id(ADDON_ID)
+        self.assertFalse(self.addons.is_addon_installed(ADDON_ID))
+        self.addons.install_addon(INSTALL_URL)
+        self.assertTrue(self.addons.is_addon_installed(ADDON_ID))
+        self.addons.enable_addon_by_id(ADDON_ID)
+
+    def test_is_enabled(self):
+        self.assertTrue(self.addons.is_addon_enabled(ADDON_ID))
+        self.addons.disable_addon_by_id(ADDON_ID)
+        self.assertFalse(self.addons.is_addon_enabled(ADDON_ID))
+        self.addons.remove_addon_by_id(ADDON_ID)
+        self.assertFalse(self.addons.is_addon_enabled(ADDON_ID))
+        self.addons.install_addon(INSTALL_URL)
+        self.addons.enable_addon_by_id(ADDON_ID)
+        self.assertTrue(self.addons.is_addon_enabled(ADDON_ID))
+
 
 class TestAboutAddons(AddonsTestCase):
     def setUp(self):
diff --git a/tests/marionette/rp_puppeteer/ui/addons.py b/tests/marionette/rp_puppeteer/ui/addons.py
index f1f7161..163ca80 100644
--- a/tests/marionette/rp_puppeteer/ui/addons.py
+++ b/tests/marionette/rp_puppeteer/ui/addons.py
@@ -145,6 +145,18 @@ class Addons(BaseLib):
             addon = about_addons.get_addon_by_id(addon_id)
             about_addons.disable_addon(addon)
 
+    def is_addon_installed(self, addon_id):
+        with self.using_addon_list() as about_addons:
+            addon = about_addons.get_addon_by_id(addon_id)
+            return addon != None
+
+    def is_addon_enabled(self, addon_id):
+        with self.using_addon_list() as about_addons:
+            addon = about_addons.get_addon_by_id(addon_id)
+            if addon == None:
+                return False
+            return addon.is_enabled()
+
 
 class AboutAddonsTab(BaseLib):
     """This class helps handling an `about:addons` tab.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git