Merge lp:~ara/mago/shotwell into lp:~mago-contributors/mago/mago-1.0

[Ara Pulido]

This change include the shotwell wrapper and a test to import one image.

[Nagappan Alagappan (nagappan)]

Changes looks fine to me. Thanks

review: Approve

[Jean-Baptiste Lallement (jibel)]

I've changed 'Wastebasket' (en_GB) to 'Trash' to match the C locale otherwise the test fails.
Note that this test fails in Natty because txtLocation vanished from the 'Open' dialog.

review: Approve

=== added file 'mago/application/shotwell.py'
--- mago/application/shotwell.py	1970-01-01 00:00:00 +0000
+++ mago/application/shotwell.py	2010-11-04 10:33:55 +0000
@@ -0,0 +1,114 @@
+PACKAGE = "mago"
+
+# -*- coding : utf-8 -*-
+
+"""
+This is the "shotwell" module.
+
+This module provides a wrapper for LDTP to make writing Shotwell tests easier.
+"""
+import ooldtp
+import ldtp
+import os
+from .main import Application
+from ..gconfwrapper import GConf
+from ..cmd import globals
+import time
+import gettext
+import re
+
+gettext.install (True)
+gettext.bindtextdomain (PACKAGE, globals.LOCALE_SHARE)
+gettext.textdomain (PACKAGE)
+t = gettext.translation(PACKAGE, globals.LOCALE_SHARE, fallback = True)
+_ = t.gettext
+
+
+class Shotwell(Application):
+    """
+    Shotwell manages the Shotwell application.
+    """
+    WINDOW     = _("frmShotwell")
+    LAUNCHER   = "shotwell"
+    MNU_IMPORT_FROM_FOLDER = _("mnuImportFromFolder...")
+    DLG_IMPORT = _("dlgImportFromFolder")
+    TXT_LOCATION = _("txtLocation")
+    BTN_CLOSE = _("btnClose")
+    BTN_OK = _("btnOK")
+    MNU_QUIT = _("mnuQuit")
+    DLG_QUESTION = _("dlgQuestion")
+    BTN_COPY = _("btnCopyintoLibrary")
+    BTN_LINK = _("btnCreateLinks")
+    DLG_INFORMATION = _("dlgInformation")
+    DLG_WARNING = _("dlgWarning")
+    LBL_SUCCESSFUL = _("*photosuccessfullyimported")
+    MNU_SELECTALL = _("mnuSelectAll")
+    MNU_DELETE = _("mnuMovetoWastebasket")
+    MNU_EMPTYTRASH = _("mnuEmptyWastebasket")
+    BTN_ONLYREMOVE = _("btnOnlyRemove")
+    
+    def __init__(self):
+        Application.__init__(self)
+
+
+    def import_from_folder(self, path, copy=True):
+        """
+        It imports a folder
+
+        @type path: string
+        @param path: The path to the folder to import
+        @type copy: boolean
+        @param copy: True, to copy the images. Falso, to just create links
+        
+        @return int: Number of images successfully imported
+        """
+
+        shotwell = ooldtp.context(self.name)
+        
+        # Click on the import folder menu item
+        shotwell.getchild(self.MNU_IMPORT_FROM_FOLDER).selectmenuitem()
+
+        # Wait for the dialog
+        ldtp.waittillguiexist(self.DLG_IMPORT)
+        
+        # Import the folder
+        dlgImport = ooldtp.context(self.DLG_IMPORT)
+        txtLocation = dlgImport.getchild(self.TXT_LOCATION)
+        txtLocation.settextvalue(path)
+        
+        # Workaround due to bug in shotwell
+        ldtp.wait(2)
+        ldtp.enterstring("<backspace>")
+        
+        ldtp.wait(2)
+        # Close the dialog
+        dlgImport.getchild(self.BTN_OK).click()
+        
+        ldtp.waittillguiexist(self.DLG_QUESTION)
+        
+        # Copy the images or create links
+        question = ooldtp.context(self.DLG_QUESTION)
+        
+        if copy:
+            question.getchild(self.BTN_COPY).click()
+        else:
+            question.getchild(self.BTN_LINK).click()
+            
+        ldtp.waittillguiexist(self.DLG_INFORMATION)
+        
+        dlgInfo = ooldtp.context(self.DLG_INFORMATION)
+        
+        lblSuccess = dlgInfo.getchild(self.LBL_SUCCESSFUL)
+        lblSuccess = lblSuccess.gettextvalue()
+
+        btn_ok = dlgInfo.getchild(self.BTN_OK)
+        btn_ok.click()
+                
+        # Find how many photos were successfully imported
+        pattern = re.compile("(\d+)")
+        
+        if (re.match(pattern, lblSuccess)):
+            return re.match(pattern, lblSuccess).groups()[0]
+        else:
+            return 0
+        

=== modified file 'mago/test_suite/main.py'
--- mago/test_suite/main.py	2009-07-22 18:58:59 +0000
+++ mago/test_suite/main.py	2010-11-04 10:33:55 +0000
@@ -4,7 +4,7 @@
 """
 from ..application.main import Application
 from inspect import getsourcefile
-from os.path import dirname
+from os.path import dirname, abspath
 
 class TestSuite:
     """
@@ -21,7 +21,7 @@
         pass
 
     def get_test_dir(cls):
-        return dirname(getsourcefile(cls))
+        return dirname(abspath(getsourcefile(cls)))
     get_test_dir = classmethod(get_test_dir)
 
 

=== added file 'mago/test_suite/shotwell.py'
--- mago/test_suite/shotwell.py	1970-01-01 00:00:00 +0000
+++ mago/test_suite/shotwell.py	2010-11-04 10:33:55 +0000
@@ -0,0 +1,37 @@
+"""
+This module contains the definition of the test suite for Shotwell testing.
+"""
+import ldtp, ooldtp
+from .main import SingleApplicationTestSuite
+from ..application.shotwell import Application, Shotwell
+
+class ShotwellTestSuite(SingleApplicationTestSuite):
+    """
+    Default test suite for Shotwell
+    """
+    APPLICATION_FACTORY = Shotwell
+    def setup(self):
+        self.application.open()
+
+    def teardown(self):
+        # Clean the library
+        shotwell = ooldtp.context(self.application.name)
+        selectall = shotwell.getchild(self.application.MNU_SELECTALL)
+        selectall.selectmenuitem()
+        delete = shotwell.getchild(self.application.MNU_DELETE)
+        delete.selectmenuitem()
+        emptytrash = shotwell.getchild(self.application.MNU_EMPTYTRASH)
+        emptytrash.selectmenuitem()
+        
+        ldtp.waittillguiexist(self.application.DLG_WARNING)
+        
+        warning = ooldtp.context(self.application.DLG_WARNING)
+        
+        onlyremove = warning.getchild(self.application.BTN_ONLYREMOVE)
+        onlyremove.click()
+
+        ldtp.waittillguinotexist(self.application.DLG_WARNING)
+        self.application.close()
+
+    def cleanup(self):
+        pass
\ No newline at end of file

=== added directory 'shotwell'
=== added file 'shotwell/README'
--- shotwell/README	1970-01-01 00:00:00 +0000
+++ shotwell/README	2010-11-04 10:33:55 +0000
@@ -0,0 +1,20 @@
+SHOTWELL TESTS
+--------------
+Tests that verify shotwell basic functionality.
+
+Safety
+------
+None of these tests touches any configuration or system files. They are safe to run.
+
+Configuration
+-------------
+An image call test_shotwell.png needs to be inside the data folder
+
+Available Tests
+---------------
+ 
+* GEdit Chains
+  - Unicode Tests
+    Test Unicode text saving.
+  - ASCII Tests
+    Test ASCII text saving.

=== added directory 'shotwell/data'
=== added file 'shotwell/data/test_shotwell.png'
Binary files shotwell/data/test_shotwell.png	1970-01-01 00:00:00 +0000 and shotwell/data/test_shotwell.png	2010-11-04 10:33:55 +0000 differ
=== added file 'shotwell/shotwell_basics.py'
--- shotwell/shotwell_basics.py	1970-01-01 00:00:00 +0000
+++ shotwell/shotwell_basics.py	2010-11-04 10:33:55 +0000
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+import os
+from time import time, gmtime, strftime
+
+from mago.test_suite.shotwell import ShotwellTestSuite 
+from mago.check import FileComparison, FAIL
+
+class ShotwellBasics(ShotwellTestSuite):
+    def import_folder(self, path, number):
+        import_path = os.path.join(self.get_test_dir(), path)
+        success = self.application.import_from_folder(import_path)
+
+        if int(success) != int(number):
+            raise AssertionError, "The number of successful imported images expected: %s ; got %s" % (number, success)
+            
+if __name__ == "__main__":
+    shotwell_test =  ShotwellBasics()
+    shotwell_test.run()

=== added file 'shotwell/shotwell_basics.xml'
--- shotwell/shotwell_basics.xml	1970-01-01 00:00:00 +0000
+++ shotwell/shotwell_basics.xml	2010-11-04 10:33:55 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<suite name="Shotwell Basics">
+  <class>shotwell_basics.ShotwellBasics</class>
+  <description>
+    Tests which verify shotwell basics file functionality.
+  </description>
+  <case name="Import Folder">
+    <method>import_folder</method>
+    <description>Import Folder.</description>
+    <args>
+        <path>data/</path>
+        <number>1</number>
+    </args>
+  </case>
+</suite>