Merge lp:~bmastell/ubuntu-accomplishments-daemon/fix-for-1024015 into lp:ubuntu-accomplishments-daemon

[Brian Mastell]

fix for #1024015

[Matt Fischer (mfisch)]

You removed the 3 accomplishment files that we need to run tests. All the unit tests fail now.

review: Needs Fixing

[lp:~bmastell/ubuntu-accomplishments-daemon/fix-for-1024015]

129. By Brian Mastell on 2012-08-08

Fixed lack of 'adding' tests/accomps/ --> tests/accoms/ name change in commit.

[Matt Fischer (mfisch)]

Looks good. Rafal and Jono will also want to comment.

review: Approve

[Rafał Cieślak (rafalcieslak256)]

This looks all good. Of course the viewer and lens will need to be updated to these changes too.

Thanks for this awesome work Brian!

review: Approve

[Jono Bacon (jonobacon)]

Absolutely wonderful work, Brian! Many thanks, and I am merging this.

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-08-06 20:53:32 +0000
+++ accomplishments/daemon/api.py	2012-08-08 22:24:17 +0000
@@ -271,12 +271,12 @@
             # It happens that the .asc file is present, but we miss the
             # signal it triggers - so here we can re-check if it is not
             # present.
-            if self.parent._check_if_acc_is_completed(accomID):
+            if self.parent._check_if_accom_is_completed(accomID):
                 self.parent.accomplish(accomID)
             else:
                 # Okay, this one hasn't been yet completed.
-                # Run the acc script and determine exit code.
-                scriptpath = self.parent.get_acc_script_path(accomID)
+                # Run the accom script and determine exit code.
+                scriptpath = self.parent.get_accom_script_path(accomID)
                 if scriptpath is None:
                     log.msg("...No script for this accomplishment, skipping")
                 elif not self.parent._is_all_extra_information_available(accomID):
@@ -324,7 +324,7 @@
     No D-Bus required, so that it can be used for testing.
     """
     def __init__(self, service, show_notifications=None, test_mode=False):
-        self.accomplishments_installpaths = None
+        self.accoms_installpaths = None
         self.trophies_path = None
         self.has_u1 = False
         self.has_verif = None
@@ -378,7 +378,7 @@
 
         self._load_config_file()
 
-        print str("Accomplishments install paths: " + self.accomplishments_installpaths)
+        print str("Accomplishments install paths: " + self.accoms_installpaths)
         print str("Trophies path: " + self.trophies_path)
 
         self.show_notifications = show_notifications
@@ -420,7 +420,7 @@
         cols = self.list_collections()
 
         for col in cols:
-            col_imagespath = os.path.join(self.accDB[col]['base-path'],"trophyimages")
+            col_imagespath = os.path.join(self.accomDB[col]['base-path'],"trophyimages")
             cache_trophyimagespath = os.path.join(
                 self.dir_cache, "trophyimages", col)
             lock_image_path = os.path.join(media_dir, "lock.png")
@@ -537,7 +537,7 @@
 
         config.set('config', 'has_u1', self.has_u1)
         config.set('config', 'has_verif', self.has_verif)
-        config.set('config', 'accompath', self.accomplishments_installpaths)
+        config.set('config', 'accompath', self.accoms_installpaths)
         config.set('config', 'trophypath', self.trophies_path)
 
         with open(cfile, 'wb') as configfile:
@@ -558,10 +558,10 @@
         if config.read(cfile):
             log.msg("Loading configuration file: " + cfile)
             if config.get('config', 'accompath'):
-                self.accomplishments_installpaths = config.get('config', 'accompath')
+                self.accoms_installpaths = config.get('config', 'accompath')
                 log.msg(
                     "...setting accomplishments install paths to: "
-                    + self.accomplishments_installpaths)
+                    + self.accoms_installpaths)
             if config.get('config', 'trophypath'):
                 log.msg(
                     "...setting trophies path to: "
@@ -583,10 +583,10 @@
             log.msg("Configuration file not found...creating it!")
 
             self.has_verif = False
-            self.accomplishments_installpaths = accompath
+            self.accoms_installpaths = accompath
             log.msg(
                 "...setting accomplishments install paths to: "
-                + self.accomplishments_installpaths)
+                + self.accoms_installpaths)
             log.msg("You can set this to different locations in your config file.")
             self.trophies_path = os.path.join(self.dir_data, "trophies")
             log.msg("...setting trophies path to: " + self.trophies_path)
@@ -667,7 +667,7 @@
              {"collection" : "ubuntu-community", "needs-information" : "askubuntu-user-url", "label" : "AskUbuntu user profile URL", "description" : "The URL of your AskUbuntu usr profile page", "example" : "http://askubuntu.com/users/42/nick", "regex" : "", "value" : ""}]
         """
         # get a list of all accomplishments
-        accomplishments = self.list_accomplishments()
+        accoms = self.list_accoms()
         
         infoneeded = []
         # and prepend the path to the directory, where all extra-information 
@@ -681,30 +681,30 @@
             os.makedirs(trophyextrainfo)
 
         # now, for each accomplishment file that is available...
-        for acc in accomplishments:
+        for accom in accoms:
             # get the path to the directory of accomplishments set's
             # "extrainformation" dir - it is useful, because it contains
             # translated labels and descriptions
-            accomextrainfo = os.path.join(self.accDB[acc]['base-path']
+            accomextrainfo = os.path.join(self.accomDB[accom]['base-path']
                 , "extrainformation")
                 
             # a temporary variable, representing a single entry of the list this function returns
             d = {}
             
             # Get collection name from accomOD
-            collection = self._coll_from_accomID(acc)
+            collection = self._coll_from_accomID(accom)
             
-            ei = self.get_acc_needs_info(acc)
+            ei = self.get_accom_needs_info(accom)
             if len(ei) is not 0:
             
                 # For each needed piece of information:
                 for i in ei:
-                    label = self.accDB[collection]['extra-information'][i]['label']
-                    desc = self.accDB[collection]['extra-information'][i]['description']
-                    example = self.accDB[collection]['extra-information'][i].get('example')
+                    label = self.accomDB[collection]['extra-information'][i]['label']
+                    desc = self.accomDB[collection]['extra-information'][i]['description']
+                    example = self.accomDB[collection]['extra-information'][i].get('example')
                     if example is None:
                         example = ''
-                    regex = self.accDB[collection]['extra-information'][i].get('regex')
+                    regex = self.accomDB[collection]['extra-information'][i].get('regex')
                     if regex is None:
                         regex = ''
                     # we also need to know whether user has already set this item's value.
@@ -829,7 +829,7 @@
     # Returns True if all extra information is available for an accom,
     # False otherwise
     def _is_all_extra_information_available(self, accomID):
-        info_reqd = self.get_acc_needs_info(accomID)
+        info_reqd = self.get_accom_needs_info(accomID)
         if len(info_reqd) == 0:
             return True
 
@@ -889,7 +889,7 @@
             log.msg("No such collection:" + coll)
             return None
 
-        label = self.accDB[coll]['extra-information'][item]['label']
+        label = self.accomDB[coll]['extra-information'][item]['label']
 
         try:
             f = open(authfile, "r")
@@ -904,13 +904,13 @@
 
     def reload_accom_database(self):
         """
-        This is the function that builds up the *accDB* accomplishments database. It scans all accomplishment installation directories (as set in the config file), looks for all installed collections, and caches all accomplishments' data in memory. If a translated .accomplishment file is available, it's contents are loaded instead.
+        This is the function that builds up the *accomDB* accomplishments database. It scans all accomplishment installation directories (as set in the config file), looks for all installed collections, and caches all accomplishments' data in memory. If a translated .accomplishment file is available, it's contents are loaded instead.
         
         It also groups collection categories, authors, finds accomplishment script paths, and counts accomplishments in collections.
         
-        All results are stored in an internal variable, *self.accDB*. They can be accessed afterwards using get_acc_* functions.
+        All results are stored in an internal variable, *self.accomDB*. They can be accessed afterwards using get_acc_* functions.
         
-        Running this function also calls _update_all_locked_and_completed_statuses(), which completes initialising the *accDB*, as it fills in it's "completed" and "locked" fields.
+        Running this function also calls _update_all_locked_and_completed_statuses(), which completes initialising the *accomDB*, as it fills in it's "completed" and "locked" fields.
         
         .. note::
             There is no need for clients to run this method manually when the daemon is started - this function is called by this class' __init__.
@@ -923,10 +923,10 @@
         
         """
         # First, clear the database.
-        self.accDB = {}
+        self.accomDB = {}
         # Get the list of all paths where accomplishments may be
         # installed...
-        installpaths = self.accomplishments_installpaths.split(":")
+        installpaths = self.accoms_installpaths.split(":")
         for installpath in installpaths:
             # Look for all accomplishment collections in this path
             path = os.path.join(installpath,'accomplishments')
@@ -936,7 +936,7 @@
             collections = os.listdir(path)
             for collection in collections:
                 # For each collection...
-                if collection in self.accDB:
+                if collection in self.accomDB:
                     # This collection has already been loaded from another install path!
                     continue
 
@@ -1019,13 +1019,13 @@
                             del accomdata['category']
                         else:
                             accomdata['categories'] = []
-                        self.accDB[accomID] = accomdata
+                        self.accomDB[accomID] = accomdata
                         accno = accno + 1
                     else:
                         # this is indeed a set!
                         setID = collection + ":" + accomset
                         setdata = {'type':"set",'name':accomset}
-                        self.accDB[setID] = setdata
+                        self.accomDB[setID] = setdata
                         setdir = os.path.join(langdefaultpath,accomset)
                         accomfiles = os.listdir(setdir)
                         for accomfile in accomfiles:
@@ -1086,7 +1086,7 @@
                                 del accomdata['category']
                             else:
                                 accomdata['categories'] = []
-                            self.accDB[accomID] = accomdata
+                            self.accomDB[accomID] = accomdata
                             accno = accno + 1
 
                 # Look for extrainformation dir
@@ -1135,23 +1135,23 @@
 
                 # Store data about this colection
                 collectiondata = {'langdefault':langdefault,'name':collectionname, 'acc_num':accno, 'type':"collection", 'base-path': collpath, 'categories' : collcategories, 'extra-information': extrainfo, 'authors':collauthors}
-                self.accDB[collection] = collectiondata
+                self.accomDB[collection] = collectiondata
 
         self._update_all_locked_and_completed_statuses()
         
         if not self.test_mode:
-            self.service.accomplishments_collections_reloaded()
+            self.service.accoms_collections_reloaded()
         # Uncomment following for debugging
-        # print self.accDB\
+        # print self.accomDB\
 
     # ======= Access functions =======
 
-    def get_acc_data(self,accomID):
-        return self.accDB[accomID]
+    def get_accom_data(self,accomID):
+        return self.accomDB[accomID]
         
-    def get_acc_exists(self,accomID):
+    def get_accom_exists(self,accomID):
         """
-        Returns False if given accomplishmentID is not valid, or such accomplishment is not installed on the system.
+        Returns False if given **accomID** is not valid, or such accomplishment is not installed on the system.
         
         Args:
             * **accomID** - (str) The accomplishmentID.
@@ -1160,33 +1160,33 @@
             * **(bool)** - True if this accomplishmentID is valid AND available for this installation.
             
         Example:
-            >>> acc.get_acc_exists("blah")
-            False
-            >>> acc.get_acc_exists("ubuntu-community")
-            False
-            >>> acc.get_acc_exists("ubuntu-community/no-such-accomplishment")
-            False
-            >>> acc.get_acc_exists("ubuntu-community/registered-on-launchpad")
+            >>> acc.get_accom_exists("blah")
+            False
+            >>> acc.get_accom_exists("ubuntu-community")
+            False
+            >>> acc.get_accom_exists("ubuntu-community/no-such-accomplishment")
+            False
+            >>> acc.get_accom_exists("ubuntu-community/registered-on-launchpad")
             True
         """
         
-        if not accomID in self.accDB:
+        if not accomID in self.accomDB:
             return False
             
-        if self.accDB[accomID]['type'] is "accomplishment":
+        if self.accomDB[accomID]['type'] is "accomplishment":
             return True
         else:
             return False
         
-    def get_acc_title(self,accomID):
-        return self.accDB[accomID]['title']
-        
-    def get_acc_description(self,accomID):
-        return self.accDB[accomID]['description']
-        
-    def get_acc_needs_signing(self,accomID):
+    def get_accom_title(self,accomID):
+        return self.accomDB[accomID]['title']
+        
+    def get_accom_description(self,accomID):
+        return self.accomDB[accomID]['description']
+        
+    def get_accom_needs_signing(self,accomID):
         """
-        This function states whether an accomplishment needs verification by external server. It does not state, hoewver, whether this trophy has been already signed or not, use get_acc_is_completed instead.
+        This function states whether an accomplishment needs verification by external server. It does not state, hoewver, whether this trophy has been already signed or not, use get_accom_is_completed instead.
         
         Args:
             * **accomID** - (str) The accomplishmentID.
@@ -1195,19 +1195,19 @@
             * **(bool)** - True if the accomplishment needs signing.
             
         Example:
-            >>> acc.get_acc_needs_signing("ubuntu-community/registered-on-launchpad")
+            >>> acc.get_accom_needs_signing("ubuntu-community/registered-on-launchpad")
             True
-            >>> acc.get_acc_needs_signing("ubuntu-desktop/gwibber-twitter")
+            >>> acc.get_accom_needs_signing("ubuntu-desktop/gwibber-twitter")
             False
         """
-        if not 'needs-signing' in self.accDB[accomID]:
+        if not 'needs-signing' in self.accomDB[accomID]:
             return False
-        elif (self.accDB[accomID]['needs-signing'] == "false" or self.accDB[accomID]['needs-signing'] == "False" or self.accDB[accomID]['needs-signing'] == "no"):
+        elif (self.accomDB[accomID]['needs-signing'] == "false" or self.accomDB[accomID]['needs-signing'] == "False" or self.accomDB[accomID]['needs-signing'] == "no"):
             return False
         else:
             return True
     
-    def get_acc_depends(self,accomID):
+    def get_accom_depends(self,accomID):
         """
         Returns a list of accomplishments a chosen accomplishment depends on (meaning: they all need to be completed in order to unlock the given one).
         
@@ -1218,19 +1218,19 @@
             * **(list[str])** - List of accomplishmentIDs of accomplishments that need to be completed before this one is unlocked.
             
         Example:
-            >>> acc.get_acc_depends("ubuntu-community/registered-on-launchpad")
+            >>> acc.get_accom_depends("ubuntu-community/registered-on-launchpad")
             []
-            >>> acc.get_acc_depends("ubuntu-community/ubuntu-member")
+            >>> acc.get_accom_depends("ubuntu-community/ubuntu-member")
             ["ubuntu-community/registered-on-launchpad", "ubuntu-community/signed-ubuntu-code-of-conduct"]
-            >>> acc.get_acc_depends("ubuntu-desktop/gnomine_small-5-times")
+            >>> acc.get_accom_depends("ubuntu-desktop/gnomine_small-5-times")
             ["ubuntu-desktop/gnomine_win-small"]
         """
-        if 'depends' in self.accDB[accomID]:
-            return [a.rstrip().lstrip() for a in self.accDB[accomID]['depends'].split(",")]
+        if 'depends' in self.accomDB[accomID]:
+            return [a.rstrip().lstrip() for a in self.accomDB[accomID]['depends'].split(",")]
         else:
             return []
     
-    def get_acc_is_unlocked(self,accomID):
+    def get_accom_is_unlocked(self,accomID):
         """
         Returns True if this accomplishment is unlocked (ready to be achieved), False otherwise.
         
@@ -1241,23 +1241,23 @@
             * **(bool)** - Whether this accomplishment is unlocked.
         
         Example:
-            >>> acc.get_acc_is_unlocked("ubuntu-community/askubuntu-teacher")
+            >>> acc.get_accom_is_unlocked("ubuntu-community/askubuntu-teacher")
             False
-            >>> acc.get_acc_depends("ubuntu-community/askubuntu-teacher")
+            >>> acc.get_accom_depends("ubuntu-community/askubuntu-teacher")
             ["ubuntu-community/registered-on-askubuntu"]
-            >>> acc.get_acc_is_completed("ubuntu-community/registered-on-askubuntu")
+            >>> acc.get_accom_is_completed("ubuntu-community/registered-on-askubuntu")
             False
             >>> acc.accomplish("ubuntu-community/registered-on-askubuntu")
-            >>> acc.get_acc_is_completed("ubuntu-community/registered-on-askubuntu")
+            >>> acc.get_accom_is_completed("ubuntu-community/registered-on-askubuntu")
             True
-            >>> acc.get_acc_is_unlocked("ubuntu-community/askubuntu-teacher")
+            >>> acc.get_accom_is_unlocked("ubuntu-community/askubuntu-teacher")
             True
         """
-        return not self.accDB[accomID]['locked']
+        return not self.accomDB[accomID]['locked']
     
     def get_trophy_path(self,accomID):
         """
-        This function returns a path to the .trophy file related to given **accomplishmentID**. The trophy file may or may not exist.
+        This function returns a path to the .trophy file related to given **accomID**. The trophy file may or may not exist.
         
         Args:
             * **accomID** - (str) The accomplishmentID.
@@ -1269,13 +1269,13 @@
             >>> acc.get_trophy_path("ubuntu-community/registered-on-launchpad")
             /home/cielak/.local/share/accomplishments/trophies/ubuntu-community/registered-on-launchpad.trophy
         """
-        if not self.get_acc_exists(accomID):
+        if not self.get_accom_exists(accomID):
             # hopefully an empty path will break something...
             return ""
         else:
             return os.path.join(self.trophies_path,accomID + ".trophy")
         
-    def get_acc_is_completed(self,accomID):
+    def get_accom_is_completed(self,accomID):
         """
         Returns whether this accomplishment is completed (if it needs to be verified by the external server, this will return False if the .asc signature is not present)
         
@@ -1286,46 +1286,46 @@
             * **(bool)** - Whether this accomplishment is completed.
             
         Example:
-            >>> acc.get_acc_is_completed("ubuntu-community/registered-on-askubuntu")
+            >>> acc.get_accom_is_completed("ubuntu-community/registered-on-askubuntu")
             False
             >>> acc.accomplish("ubuntu-community/registered-on-askubuntu")
-            >>> acc.get_acc_is_completed("ubuntu-community/registered-on-askubuntu")
+            >>> acc.get_accom_is_completed("ubuntu-community/registered-on-askubuntu")
             True
         """
-        return self.accDB[accomID]['completed']
+        return self.accomDB[accomID]['completed']
         
-    def get_acc_script_path(self,accomID):
-        res = self.accDB[accomID]['script-path']
+    def get_accom_script_path(self,accomID):
+        res = self.accomDB[accomID]['script-path']
         if not os.path.exists(res):
             return None
         else:
             return res
 
-    def get_acc_icon(self,accomID):
-        return self.accDB[accomID]['icon']
+    def get_accom_icon(self,accomID):
+        return self.accomDB[accomID]['icon']
 
-    def get_acc_icon_path(self,accomID):
+    def get_accom_icon_path(self,accomID):
         imagesdir = os.path.join(self.dir_cache,'trophyimages')
-        imagesdir = os.path.join(imagesdir,self.get_acc_collection(accomID))
-        iconfile = self.get_acc_icon(accomID)
+        imagesdir = os.path.join(imagesdir,self.get_accom_collection(accomID))
+        iconfile = self.get_accom_icon(accomID)
         iconfilename, iconfileext = os.path.splitext(iconfile)
 
         # safely handle files without extensions
         if not iconfileext:
             iconfileext = ""
-        if not self.get_acc_is_unlocked(accomID):
+        if not self.get_accom_is_unlocked(accomID):
             iconfilename = iconfilename + '-locked'
-        elif not self.get_acc_is_completed(accomID):
+        elif not self.get_accom_is_completed(accomID):
             iconfilename = iconfilename + '-opportunity'
         iconfile = iconfilename + iconfileext
         return os.path.join(imagesdir,iconfile)
 
-    def get_acc_needs_info(self,accomID):
-        if not 'needs-information' in self.accDB[accomID]:
+    def get_accom_needs_info(self,accomID):
+        if not 'needs-information' in self.accomDB[accomID]:
             return []
-        return [a.rstrip().lstrip() for a in self.accDB[accomID]['needs-information'].split(",")]
+        return [a.rstrip().lstrip() for a in self.accomDB[accomID]['needs-information'].split(",")]
     
-    def get_acc_collection(self,accomID):
+    def get_accom_collection(self,accomID):
         """
         Returns the name of the collection this accomplishment orginates from.
         
@@ -1334,12 +1334,12 @@
         Returns:
             * **str** - Collection name.
         Example:
-            >>> acc.get_acc_collection("ubuntu-community/signed-code-of-conduct")
+            >>> acc.get_accom_collection("ubuntu-community/signed-code-of-conduct")
             ubuntu-community
         """
-        return self.accDB[accomID]['collection']
+        return self.accomDB[accomID]['collection']
         
-    def get_acc_categories(self,accomID):
+    def get_accom_categories(self,accomID):
         """
         Returns a list of categories for a given accomplishment. This can
         include sub-categories (which are formatted like 'category:subcategory'
@@ -1350,15 +1350,15 @@
         Returns:
             * **list(str)** The list of categories.
         Example:
-            >>> obj.get_acc_categories("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_categories("ubuntu-community/registered-on-launchpad")
             ["Launchpad"]
-            >>> obj.get_acc_categories("some_other_collection/another-accomplishment")
+            >>> obj.get_accom_categories("some_other_collection/another-accomplishment")
             ["Category One", "Category Two:Subcategory"]
         """
 
-        return self.accDB[accomID]['categories']
+        return self.accomDB[accomID]['categories']
 
-    def get_acc_date_completed(self,accomID):
+    def get_accom_date_completed(self,accomID):
         """
         Returns the date that the accomplishment specified by 'accomID' was
         completed.
@@ -1368,11 +1368,11 @@
         Returns:
             (string) The completed date
         Example:
-            >>> obj.get_acc_date_completed("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_date_completed("ubuntu-community/registered-on-launchpad")
             "2012-06-15 12:32"
         """
 
-        return self.accDB[accomID]['date-completed']
+        return self.accomDB[accomID]['date-completed']
 
     def get_trophy_data(self,accomID):
         """
@@ -1388,7 +1388,7 @@
             >>> acc.get_trophy_data("ubuntu-community/registered-on-launchpad")
             {'needs-signing': 'true', 'date-accomplished': '1990-04-12 02:22', 'needs-information': 'launchpad-email', 'version': '0.2', '__name__': 'trophy', 'launchpad-email': '[e-mail]', 'id': 'ubuntu-community/registered-on-launchpad'}
         """
-        if not self.get_acc_is_completed(accomID):
+        if not self.get_accom_is_completed(accomID):
             return None
         else:
             cfg = ConfigParser.RawConfigParser()
@@ -1407,7 +1407,7 @@
             >>> acc.get_collection_name("ubuntu-desktop")
             Ubuntu Desktop
         """
-        return self.accDB[collection]['name']
+        return self.accomDB[collection]['name']
         
     def get_collection_exists(self,collection):
         """
@@ -1437,7 +1437,7 @@
             >>> acc.get_collection_authors("ubuntu-community")
             set(['Surgemcgee <[e-mail]>', 'Silver Fox <[e-mail]>', 'Hernando Torque <[e-mail]>', 'Nathan Osman <[e-mail]>', 'Rafa\xc5\x82 Cie\xc5\x9blak <[e-mail]>', 'Michael Hall <[e-mail]>', 'Angelo Compagnucci <[e-mail]>', 'Matt Fischer <[e-mail]>', 'Bruno Girin <[e-mail]>', 'Jorge O. Castro <[e-mail]>', 'Andrea Grandi <[e-mail]>', 'Marco Ceppi <[e-mail]>', 'Agmenor <[e-mail]>', 'Christopher Kyle Horton <[e-mail]>', 'Jos\xc3\xa9 Antonio Rey <[e-mail]>', 's.fox <[e-mail]>', 'Jono Bacon <[e-mail]>'])
         """
-        return self.accDB[collection]['authors']
+        return self.accomDB[collection]['authors']
         
     def get_collection_categories(self,collection):
         """
@@ -1462,11 +1462,11 @@
              'Forums': [],
              'Events': []  }
         """
-        return self.accDB[collection]['categories']
+        return self.accomDB[collection]['categories']
     
     def get_collection_data(self,collection):
         """
-        This function returns all data stored in accDB for a given collection. It may be only useful if you need to access any data that don't have their own get_collection_* function.
+        This function returns all data stored in accomDB for a given collection. It may be only useful if you need to access any data that don't have their own get_collection_* function.
         
         Args:
             * **collection** - (str) Sellected collection name (e.g. "ubuntu-community")
@@ -1481,35 +1481,35 @@
                 * *extra-information* - dict(str:dict(str:str)) list of all extra-information used with it's medatada, use get_extra_information or get_all_extra_information instead
                 * *categories* - dict(str:list(str)) list of all categories and subcategories, use get_collection_categories instead
         """
-        return self.accDB[collection]
+        return self.accomDB[collection]
         
     # ====== Listing functions ======
     
-    def list_accomplishments(self):
-        return [acc for acc in self.accomslist()]
+    def list_accoms(self):
+        return [accom for accom in self.accomslist()]
         
     def list_trophies(self):
-        return [acc for acc in self.accomslist() if self.get_acc_is_completed(acc)]
+        return [accom for accom in self.accomslist() if self.get_accom_is_completed(accom)]
         
     def list_opportunitues(self):
-        return [acc for acc in self.accomslist() if not self.get_acc_is_completed(acc)]
+        return [accom for accom in self.accomslist() if not self.get_accom_is_completed(accom)]
         
     def list_depending_on(self,accomID):
-        return [acc for acc in self.accomslist() if accomID in self.get_acc_depends(acc)]
+        return [accom for accom in self.accomslist() if accomID in self.get_accom_depends(accom)]
         
     def list_unlocked(self):
-        return [acc for acc in self.accomslist() if self.get_acc_is_unlocked(acc)]
+        return [accom for accom in self.accomslist() if self.get_accom_is_unlocked(accom)]
         
     def list_unlocked_not_completed(self):
-        return [acc for acc in self.accomslist() if self.get_acc_is_unlocked(acc) and not self.get_acc_is_completed(acc)]        
+        return [accom for accom in self.accomslist() if self.get_accom_is_unlocked(accom) and not self.get_accom_is_completed(accom)]
     
     def list_collections(self):
-        return [col for col in self.accDB if self.accDB[col]['type'] == 'collection']
+        return [col for col in self.accomDB if self.accomDB[col]['type'] == 'collection']
 
     # ====== Scriptrunner functions ======
 
     def run_script(self,accomID):
-        if not self.get_acc_exists(accomID):
+        if not self.get_accom_exists(accomID):
             return
         self.run_scripts([accomID])
 
@@ -1536,20 +1536,20 @@
     # ====== Viewer-specific functions ======
 
     def build_viewer_database(self):
-        accs = self.list_accomplishments()
+        accoms = self.list_accoms()
         db = []
-        for acc in accs:
+        for accom in accoms:
             db.append({ 
-                'title' :           self.get_acc_title(acc),
-                'accomplished' :    self.get_acc_is_completed(acc),
-                'locked' :      not self.get_acc_is_unlocked(acc),
-                'date-completed' :      self.get_acc_date_completed(acc),
-                'iconpath' :        self.get_acc_icon_path(acc),
-                'collection' :      self.get_acc_collection(acc),
+                'title' :           self.get_accom_title(accom),
+                'accomplished' :    self.get_accom_is_completed(accom),
+                'locked' :      not self.get_accom_is_unlocked(accom),
+                'date-completed' :      self.get_accom_date_completed(accom),
+                'iconpath' :        self.get_accom_icon_path(accom),
+                'collection' :      self.get_accom_collection(accom),
                 'collection-human' :self.get_collection_name(
-                                        self.get_acc_collection(acc) ),
-                'categories' :      self.get_acc_categories(acc),
-                'id' :              acc 
+                                        self.get_accom_collection(accom) ),
+                'categories' :      self.get_accom_categories(accom),
+                'id' :              accom
                 })
         return db
         
@@ -1568,32 +1568,32 @@
 
     def accomplish(self,accomID):
         log.msg("Accomplishing: %s" % accomID)
-        if not self.get_acc_exists(accomID):
+        if not self.get_accom_exists(accomID):
             log.msg("There is no such accomplishment.")
             return False #failure
 
         # Check if is hasn't been already completed
-        if self.get_acc_is_completed(accomID):
+        if self.get_accom_is_completed(accomID):
             log.msg("Not accomplishing " + accomID + ", it has already been completed.")
             return True #success
 
         # Check if this accomplishment is unlocked
-        if not self.get_acc_is_unlocked(accomID):
+        if not self.get_accom_is_unlocked(accomID):
             log.msg("This accomplishment cannot be completed; it's locked.")
             return False
 
         coll = self._coll_from_accomID(accomID)
-        accdata = self.get_acc_data(accomID)
+        accdata = self.get_accom_data(accomID)
 
         # Prepare extra-info
-        needsinformation = self.get_acc_needs_info(accomID)
+        needsinformation = self.get_accom_needs_info(accomID)
         for i in needsinformation:
             accdata[i] = self.get_extra_information(coll,i)[0][i]
 
         # Create .trophy file
         self._create_trophy_file(accdata, accomID)
 
-        if not self.get_acc_needs_signing(accomID):
+        if not self.get_accom_needs_signing(accomID):
             # The accomplishment does not need signing!
             if not self.test_mode:
                 self.service.trophy_received(accomID)
@@ -1718,8 +1718,8 @@
             Notify.is_initted() or Notify.init("icon-summary-body")):
             n = Notify.Notification.new(
                 _("You have accomplished something!"),
-                self.get_acc_title(accomID),
-                self.get_acc_icon_path(accomID) )
+                self.get_accom_title(accomID),
+                self.get_accom_icon_path(accomID) )
             n.set_hint_string('append', 'allowed')
             n.show()
 
@@ -1735,8 +1735,8 @@
                 n.show()
     
     def accomslist(self):
-        for k in self.accDB:
-            if self.accDB[k]['type'] is "accomplishment":
+        for k in self.accomDB:
+            if self.accomDB[k]['type'] is "accomplishment":
                 yield k
             
     def _get_is_asc_correct(self,filepath):
@@ -1766,12 +1766,12 @@
             log.msg("Cannot check if signature is correct, because file %s does not exist" % filepath)
             return False
             
-    def _check_if_acc_is_completed(self,accomID):
+    def _check_if_accom_is_completed(self,accomID):
         trophypath = self.get_trophy_path(accomID)
         if not os.path.exists(trophypath):
             # There is no trophy file
             return False
-        if not self.get_acc_needs_signing(accomID):
+        if not self.get_accom_needs_signing(accomID):
             # The trophy does not need a signature
             return True
         else:
@@ -1782,29 +1782,29 @@
             else:
                 return self._get_is_asc_correct(ascpath)
         
-    def _check_if_acc_is_locked(self,accomID):
-        dep = self.get_acc_depends(accomID)
+    def _check_if_accom_is_locked(self,accomID):
+        dep = self.get_accom_depends(accomID)
         if not dep:
             return False
         else:
             locked = False
             for d in dep:
                 # If at least one dependency is not completed...
-                if not self.get_acc_is_completed(d):
+                if not self.get_accom_is_completed(d):
                     locked = True
                     break
             return locked
             
     def _update_all_locked_and_completed_statuses(self):
-        accs = self.list_accomplishments()
-        for acc in accs:
-            self.accDB[acc]['completed'] = self._check_if_acc_is_completed(acc)
-            if self.accDB[acc]['completed'] == True:
-                self.accDB[acc]['date-completed'] = self._get_trophy_date_completed(acc)
+        accoms = self.list_accoms()
+        for accom in accoms:
+            self.accomDB[accom]['completed'] = self._check_if_accom_is_completed(accom)
+            if self.accomDB[accom]['completed'] == True:
+                self.accomDB[accom]['date-completed'] = self._get_trophy_date_completed(accom)
             else:
-                self.accDB[acc]['date-completed'] = "None"
-        for acc in accs:
-            self.accDB[acc]['locked'] = self._check_if_acc_is_locked(acc)
+                self.accomDB[accom]['date-completed'] = "None"
+        for accom in accoms:
+            self.accomDB[accom]['locked'] = self._check_if_accom_is_locked(accom)
          
     def _get_trophy_date_completed(self, accomID):
         trophypath = self.get_trophy_path(accomID)
@@ -1820,18 +1820,18 @@
             return config.get("trophy", "date-accomplished")
 
     def _mark_as_completed(self,accomID):
-        # Marks accomplishments as completed int the accDB, and returns a list
+        # Marks accomplishments as completed int the accomDB, and returns a list
         # of accomIDs that just got unlocked.
-        self.accDB[accomID]['completed'] = True
-        self.accDB[accomID]['date-completed'] = self._get_trophy_date_completed(accomID)
-        accs = self.list_depending_on(accomID)
+        self.accomDB[accomID]['completed'] = True
+        self.accomDB[accomID]['date-completed'] = self._get_trophy_date_completed(accomID)
+        accoms = self.list_depending_on(accomID)
         res = []
-        for acc in accs:
-            before = self.accDB[acc]['locked']
-            self.accDB[acc]['locked'] = self._check_if_acc_is_locked(acc)
+        for accom in accoms:
+            before = self.accomDB[accom]['locked']
+            self.accomDB[accom]['locked'] = self._check_if_accom_is_locked(accom)
             # If it just got unlocked...
-            if (before == True and self.accDB[acc]['locked'] == False):
-                res.append(acc)
+            if (before == True and self.accomDB[accom]['locked'] == False):
+                res.append(accom)
         return res
             
     #Other significant system functions

=== modified file 'accomplishments/daemon/dbusapi.py'
--- accomplishments/daemon/dbusapi.py	2012-08-06 12:06:10 +0000
+++ accomplishments/daemon/dbusapi.py	2012-08-08 22:24:17 +0000
@@ -290,7 +290,7 @@
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="a{sv}")
-    def get_acc_data(self,accomID):
+    def get_accom_data(self,accomID):
         """
         Returns a database of accomplishment information on the system.
 
@@ -310,11 +310,11 @@
             >>> obj.build_viewer_database()
             { dbus.String(u'lang'): dbus.String(u'en', variant_level=1), dbus.String(u'needs-signing'): dbus.String(u'true', variant_level=1), dbus.String(u'date-completed'): dbus.String(u'2012-06-12 22:12', variant_level=1), dbus.String(u'set'): dbus.String(u'infrastructure', variant_level=1), dbus.String(u'locked'): dbus.Boolean(False, variant_level=1), dbus.String(u'help'): dbus.String(u'#launchpad on Freenode', variant_level=1), dbus.String(u'links'): dbus.String(u'http://www.launchpad.net', variant_level=1), dbus.String(u'title'): dbus.String(u'Registered on Launchpad', variant_level=1), dbus.String(u'script-path'): dbus.String(u'/home/jono/source/ubuntu-community-accomplishments/scripts/ubuntu-community/infrastructure/registered-on-launchpad.py', variant_level=1), dbus.String(u'base-path'): dbus.String(u'/home/jono/source/ubuntu-community-accomplishments/accomplishments/ubuntu-community', variant_level=1), dbus.String(u'completed'): dbus.Boolean(True, variant_level=1), dbus.String(u'author'): dbus.String(u'Jono Bacon <[e-mail]>', variant_level=1), dbus.String(u'collection'): dbus.String(u'ubuntu-community', variant_level=1), dbus.String(u'summary'): dbus.String(u'Launchpad is a website in which we do much of our work in Ubuntu. There we build packages, file and fix bugs, perform translations, manage code, and other activities.\\nYou will need to register an account with Launchpad to participate in much of the Ubuntu community. Fortunately, registering is simple, safe, and free.', variant_level=1), dbus.String(u'needs-information'): dbus.String(u'launchpad-email', variant_level=1), dbus.String(u'steps'): dbus.String(u'Load a web browser on your computer.\\nIn your web browser go to <tt>http://www.launchpad.net</tt>.\\nClick the <i>Register</i> link in the corner of the screen to register.', variant_level=1), dbus.String(u'icon'): dbus.String(u'default.png', variant_level=1), dbus.String(u'type'): dbus.String(u'accomplishment', variant_level=1), dbus.String(u'categories'): dbus.Array([dbus.String(u'Launchpad')], signature=dbus.Signature('s'), variant_level=1), dbus.String(u'description'): dbus.String(u'Registered a Launchpad account', variant_level=1) }
         """
-        return self.api.get_acc_data(accomID)
+        return self.api.get_accom_data(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="b")   
-    def get_acc_exists(self,accomID):
+    def get_accom_exists(self,accomID):
         """
         Returns whether the specified accomplishment is recognized on the system.
         
@@ -328,15 +328,15 @@
         Returns:
             * **(bool)** - returns `True` is the accomplishment exists, and `False` if not.
         Example:
-            >>> obj.get_acc_exists("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_exists("ubuntu-community/registered-on-launchpad")
             True
         """
         
-        return self.api.get_acc_exists(accomID)
+        return self.api.get_accom_exists(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
-    def get_acc_title(self,accomID):
+    def get_accom_title(self,accomID):
         """
         Returns the title name of the specified accomplishment.
         
@@ -350,20 +350,20 @@
         Returns:
             * **(str)** - the title of the accomplishment.
         Example:
-            >>> obj.get_acc_exists("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_exists("ubuntu-community/registered-on-launchpad")
             'Registered on Launchpad'
         """
         
-        return self.api.get_acc_title(accomID)
-        
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
-        in_signature="s", out_signature="s")
-    def get_acc_description(self,accomID):
-        return self.api.get_acc_description(accomID)
-        
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
-        in_signature="s", out_signature="s")
-    def get_acc_collection(self,accomID):
+        return self.api.get_accom_title(accomID)
+        
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="s", out_signature="s")
+    def get_accom_description(self,accomID):
+        return self.api.get_accom_description(accomID)
+        
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="s", out_signature="s")
+    def get_accom_collection(self,accomID):
         """
         Returns the collection that a given accomplishment is part of.
         
@@ -379,15 +379,15 @@
         Returns:
             * **(str)** - the collection name.
         Example:
-            >>> obj.get_acc_collection("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_collection("ubuntu-community/registered-on-launchpad")
             ubuntu-community
         """
         
-        return self.api.get_acc_collection(accomID)
+        return self.api.get_accom_collection(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="as")
-    def get_acc_categories(self,accomID):
+    def get_accom_categories(self,accomID):
         """
         Returns a list of categories that the specified accomplishment is part of.
         
@@ -404,14 +404,14 @@
         Returns:
             * **(list)** - the list of categories.
         Example:
-            >>> obj.get_acc_categories("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_categories("ubuntu-community/registered-on-launchpad")
             ["Launchpad"]
         """
-        return self.api.get_acc_categories(accomID)
+        return self.api.get_accom_categories(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="b")
-    def get_acc_needs_signing(self,accomID):
+    def get_accom_needs_signing(self,accomID):
         """
         Returns whether the specified accomplishment needs to be signed (verified) or not.
         
@@ -431,15 +431,15 @@
         Returns:
             * **(bool)** - `True` if the accomplishment needs signing, `False` if not.
         Example:
-            >>> obj.get_acc_categories("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_categories("ubuntu-community/registered-on-launchpad")
             True
         """
         
-        return self.api.get_acc_needs_signing(accomID)
+        return self.api.get_accom_needs_signing(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="as")
-    def get_acc_depends(self,accomID):
+    def get_accom_depends(self,accomID):
         """
         Returns a list of accomplishments that the accomplishment you pass depends on.
         
@@ -460,15 +460,15 @@
         Returns:
             * **(list)** - the list of dependencies for the accomplishment.
         Example:
-            >>> obj.get_acc_depends("ubuntu-community/ubuntu-member")
+            >>> obj.get_accom_depends("ubuntu-community/ubuntu-member")
             ["ubuntu-community/registered-on-launchpad"]
         """
         
-        return self.api.get_acc_depends(accomID)
+        return self.api.get_accom_depends(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="b")
-    def get_acc_is_unlocked(self,accomID):
+    def get_accom_is_unlocked(self,accomID):
         """
         Returns whether the specified accomplishment is unlocked or not (whether it's dependencies have been satisfied or not).
         
@@ -486,11 +486,11 @@
         Returns:
             * **(bool)** - `True` if the dependencies have been completed, `False` if not.
         Example:
-            >>> obj.get_acc_is_unlocked("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_is_unlocked("ubuntu-community/registered-on-launchpad")
             True
         """
         
-        return self.api.get_acc_is_unlocked(accomID)
+        return self.api.get_accom_is_unlocked(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
@@ -499,7 +499,7 @@
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="b")
-    def get_acc_is_completed(self,accomID):
+    def get_accom_is_completed(self,accomID):
         """
         Returns whether the specified accomplishment is accomplished or not.
         
@@ -513,11 +513,11 @@
         Returns:
             * **(bool)** - `True` if the accomplishment has been completed, `False` if not.
         Example:
-            >>> obj.get_acc_is_completed("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_is_completed("ubuntu-community/registered-on-launchpad")
             True
         """
         
-        return self.api.get_acc_is_completed(accomID)
+        return self.api.get_accom_is_completed(accomID)
 
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="b")
@@ -538,7 +538,7 @@
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
-    def get_acc_script_path(self,accomID):
+    def get_accom_script_path(self,accomID):
         """
         Returns the corrosponsing script for the accomplishment.
         
@@ -555,15 +555,15 @@
         Returns:
             * **(str)** - the full path to the script.
         Example:
-            >>> obj.get_acc_script_path("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_script_path("ubuntu-community/registered-on-launchpad")
             /usr/share/accomplishments/scripts/ubuntu-community/infrastructure/registered-on-launchpad.py
         """
         
-        return self.api.get_acc_script_path(accomID)
+        return self.api.get_accom_script_path(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
-    def get_acc_icon(self,accomID):
+    def get_accom_icon(self,accomID):
         """
         Returns the icon name for the specified accomplishment.
         
@@ -573,21 +573,21 @@
         `Accomplishment ID` as it's parameter.
         
         Note: this function only passes the icon name and not the full path to the icon. If you need this you should use
-        `get_acc_icon_path()`.
+        `get_accom_icon_path()`.
                         
         Args:
             * **accomID** - (str) the `Accomplishment ID` for a given accomplishment (e.g. `ubuntu-community/registered-on-launchpad`).
         Returns:
             * **(str)** - the name of the icon.
         Example:
-            >>> obj.get_acc_icon("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_icon("ubuntu-community/registered-on-launchpad")
             default.png
         """
-        return self.api.get_acc_icon(accomID)        
+        return self.api.get_accom_icon(accomID)        
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
-    def get_acc_icon_path(self,accomID):
+    def get_accom_icon_path(self,accomID):
         """
         Returns the icon name for the specified accomplishment.
         
@@ -596,23 +596,23 @@
         accomplishment has an accomplishment ID of `ubuntu-community/registered-on-launchpad`). You pass this function this
         `Accomplishment ID` as it's parameter.
         
-        If you don't need the full path and just need the icon name, use `get_acc_icon()`.
+        If you don't need the full path and just need the icon name, use `get_accom_icon()`.
                                 
         Args:
             * **accomID** - (str) the `Accomplishment ID` for a given accomplishment (e.g. `ubuntu-community/registered-on-launchpad`).
         Returns:
             * **(str)** - the full path to the icon.
         Example:
-            >>> obj.get_acc_icon_path("ubuntu-community/registered-on-launchpad")
+            >>> obj.get_accom_icon_path("ubuntu-community/registered-on-launchpad")
             /home/jono/.cache/accomplishments/trophyimages/ubuntu-community/default.png
         """
-        return self.api.get_acc_icon_path(accomID)
+        return self.api.get_accom_icon_path(accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="v")
-    def get_acc_needs_info(self,accomID):
+    def get_accom_needs_info(self,accomID):
         """DOCS NEEDED"""
-        return self.api.get_acc_needs_info(self,accomID)
+        return self.api.get_accom_needs_info(self,accomID)
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="a{sv}")
@@ -719,7 +719,7 @@
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="as")
-    def list_accomplishments(self):
+    def list_accoms(self):
         """
         Returns a list of accomplishment IDs for the all available accomplishments. This includes all accomplishment IDs
         from all collections.
@@ -729,11 +729,11 @@
         Returns:
             * **(list)** - the list of accomplishment IDs.
         Example:
-            >>> obj.list_accomplishments()
+            >>> obj.list_accoms()
             ["ubuntu-community/registered-on-launchpad", "ubuntu-community/ubuntu-member", . . .]
         """
         
-        return self.api.list_accomplishments()
+        return self.api.list_accoms()
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="as")
@@ -928,6 +928,6 @@
         pass
 
     @dbus.service.signal(dbus_interface='org.ubuntu.accomplishments')
-    def accomplishments_collections_reloaded(self):
+    def accoms_collections_reloaded(self):
         pass
         

=== removed directory 'tests/accomps'
=== removed file 'tests/accomps/first.accomplishment'
--- tests/accomps/first.accomplishment	2012-07-13 23:00:12 +0000
+++ tests/accomps/first.accomplishment	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[accomplishment]
-title=My First Accomplishment
-icon=first.jpg
-description=An example accomplishment for the test suite
-needs-information=info,info2
-collection = testaccomp
-author = Tester <tester@tester>

=== removed file 'tests/accomps/second.accomplishment'
--- tests/accomps/second.accomplishment	2012-07-19 19:47:52 +0000
+++ tests/accomps/second.accomplishment	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[accomplishment]
-title=My Second Accomplishment
-icon=second
-description=An example accomplishment for the test suite, with dependency
-depends=testaccomp/first
-needs-signing=True
-collection=testaccomp
-author = Tester <tester@tester>

=== removed file 'tests/accomps/third.accomplishment'
--- tests/accomps/third.accomplishment	2012-07-13 23:00:12 +0000
+++ tests/accomps/third.accomplishment	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[accomplishment]
-title=My Third Accomplishment
-icon=third.jpg
-description=An example accomplishment for the test suite, no dependency
-needs-signing=False
-collection=testaccomp
-category=testing,                                              unit test
-# comment should be ignored
-# comment
-author = Someone

=== added directory 'tests/accoms'
=== added file 'tests/accoms/first.accomplishment'
--- tests/accoms/first.accomplishment	1970-01-01 00:00:00 +0000
+++ tests/accoms/first.accomplishment	2012-08-08 22:24:17 +0000
@@ -0,0 +1,7 @@
+[accomplishment]
+title=My First Accomplishment
+icon=first.jpg
+description=An example accomplishment for the test suite
+needs-information=info,info2
+collection = testaccom
+author = Tester <tester@tester>

=== added file 'tests/accoms/second.accomplishment'
--- tests/accoms/second.accomplishment	1970-01-01 00:00:00 +0000
+++ tests/accoms/second.accomplishment	2012-08-08 22:24:17 +0000
@@ -0,0 +1,8 @@
+[accomplishment]
+title=My Second Accomplishment
+icon=second
+description=An example accomplishment for the test suite, with dependency
+depends=testaccom/first
+needs-signing=True
+collection=testaccom
+author = Tester <tester@tester>

=== added file 'tests/accoms/third.accomplishment'
--- tests/accoms/third.accomplishment	1970-01-01 00:00:00 +0000
+++ tests/accoms/third.accomplishment	2012-08-08 22:24:17 +0000
@@ -0,0 +1,10 @@
+[accomplishment]
+title=My Third Accomplishment
+icon=third.jpg
+description=An example accomplishment for the test suite, no dependency
+needs-signing=False
+collection=testaccom
+category=testing,                                              unit test
+# comment should be ignored
+# comment
+author = Someone

=== modified file 'tests/tests.py'
--- tests/tests.py	2012-08-01 22:07:39 +0000
+++ tests/tests.py	2012-08-08 22:24:17 +0000
@@ -33,7 +33,7 @@
 
 class TestDaemon(unittest.TestCase):
 
-    ACCOMP_SET = "testaccomp"
+    ACCOM_SET = "testaccom"
     LANG = "en"
 
     def util_copy_extrainfo(self, extrainfo_dir, extrainfo_name):
@@ -42,30 +42,30 @@
         dest = os.path.join(extrainfo_dir, extrainfo_name)
         shutil.copyfile(src, dest)
 
-    def util_copy_accomp(self, accomp_dir, accomp_name):
+    def util_copy_accom(self, accom_dir, accom_name):
         testdir = os.path.dirname(__file__)
-        src = os.path.join(testdir, "accomps",
-            "%s.accomplishment" % accomp_name)
-        dest = os.path.join(accomp_dir, "%s.accomplishment" % accomp_name)
+        src = os.path.join(testdir, "accoms",
+            "%s.accomplishment" % accom_name)
+        dest = os.path.join(accom_dir, "%s.accomplishment" % accom_name)
         shutil.copyfile(src, dest)
 
     # This function is not really needed because when tearDown runs it
     # removes the entire tree, but when debugging tests it's useful to comment
     # out the rmtree in tearDown, so then this is critical to make the tests
     # work.
-    def util_remove_all_accomps(self, accomp_dir):
-        for f in os.listdir(accomp_dir):
-            os.remove(os.path.join(self.accomp_dir, f))
+    def util_remove_all_accoms(self, accom_dir):
+        for f in os.listdir(accom_dir):
+            os.remove(os.path.join(self.accom_dir, f))
 
-    def util_write_about_file(self, accomp_dir):
-        fp = open(os.path.join(accomp_dir, "ABOUT"), "w")
+    def util_write_about_file(self, accom_dir):
+        fp = open(os.path.join(accom_dir, "ABOUT"), "w")
         fp.write("""[general]
 name = Test Collection
 langdefault=%s""" % self.LANG)
         fp.close()
 
-    def util_write_config_file(self, accomp_dir):
-        fp = open(os.path.join(accomp_dir, ".accomplishments"), "w")
+    def util_write_config_file(self, accom_dir):
+        fp = open(os.path.join(accom_dir, ".accomplishments"), "w")
         fp.write("""[config]
 has_u1 = true
 has_verif = 1
@@ -75,8 +75,8 @@
 extrainfo_seen = 1""" % (self.td, self.td))
         fp.close()
 
-    def util_write_file(self, accomp_dir, name, content):
-        fp = open(os.path.join(accomp_dir, name), "w")
+    def util_write_file(self, accom_dir, name, content):
+        fp = open(os.path.join(accom_dir, name), "w")
         fp.write(content)
         fp.close()
 
@@ -84,10 +84,10 @@
         self.td = tempfile.mkdtemp()
 
         # /tmp/foo/accomplishments
-        self.accomps_root = os.path.join(self.td, "accomplishments",
+        self.accoms_root = os.path.join(self.td, "accomplishments",
             "accomplishments")
-        if not os.path.exists(self.accomps_root):
-            os.makedirs(self.accomps_root)
+        if not os.path.exists(self.accoms_root):
+            os.makedirs(self.accoms_root)
 
         # /tmp/foo/accomplishments/accomplishments/.config
         self.config_dir = os.path.join(self.td, "accomplishments", ".config",
@@ -95,18 +95,18 @@
         if not os.path.exists(self.config_dir):
             os.makedirs(self.config_dir)
 
-        # /tmp/foo/accomplishments/accomplishments/testaccomp
-        self.accomp_root = os.path.join(self.accomps_root, self.ACCOMP_SET)
-        if not os.path.exists(self.accomp_root):
-            os.makedirs(self.accomp_root)
-
-        # /tmp/foo/accomplishments/accomplishments/testaccomp/en
-        self.accomp_dir = os.path.join(self.accomp_root, self.LANG)
-        if not os.path.exists(self.accomp_dir):
-            os.makedirs(self.accomp_dir)
-
-        # /tmp/foo/accomplishments/accomplishments/testaccomp/extrainformation
-        self.extrainfo_dir = os.path.join(self.accomp_root, "extrainformation")
+        # /tmp/foo/accomplishments/accomplishments/testaccom
+        self.accom_root = os.path.join(self.accoms_root, self.ACCOM_SET)
+        if not os.path.exists(self.accom_root):
+            os.makedirs(self.accom_root)
+
+        # /tmp/foo/accomplishments/accomplishments/testaccom/en
+        self.accom_dir = os.path.join(self.accom_root, self.LANG)
+        if not os.path.exists(self.accom_dir):
+            os.makedirs(self.accom_dir)
+
+        # /tmp/foo/accomplishments/accomplishments/testaccom/extrainformation
+        self.extrainfo_dir = os.path.join(self.accom_root, "extrainformation")
         if not os.path.exists(self.extrainfo_dir):
             os.makedirs(self.extrainfo_dir)
 
@@ -115,8 +115,8 @@
         if not os.path.exists(self.scripts_root):
             os.makedirs(self.scripts_root)
 
-        # /tmp/foo/accomplishments/accomplishments/scripts/testaccomp
-        self.script_root = os.path.join(self.scripts_root, self.ACCOMP_SET)
+        # /tmp/foo/accomplishments/accomplishments/scripts/testaccom
+        self.script_root = os.path.join(self.scripts_root, self.ACCOM_SET)
         if not os.path.exists(self.script_root):
             os.makedirs(self.script_root)
 
@@ -126,7 +126,7 @@
         if not os.path.exists(self.trophy_dir):
             os.makedirs(self.trophy_dir)
 
-        self.util_write_about_file(self.accomp_root)
+        self.util_write_about_file(self.accom_root)
 
         self.util_write_config_file(self.config_dir)
 
@@ -141,7 +141,7 @@
         # it will pop off the test, but in a pbuilder or build system
         # there will be no daemon, so we can just ensure that this
         # doesn't crash
-        self.util_copy_accomp(self.accomp_dir, "third")
+        self.util_copy_accom(self.accom_dir, "third")
         a = api.Accomplishments(None, None, True)
 
         # pass in None
@@ -151,45 +151,45 @@
         self.assertEqual(a.run_scripts(122), None)
 
         # pass in a specific item
-        self.assertEqual(a.run_scripts(["%s/third" % self.ACCOMP_SET]), None)
+        self.assertEqual(a.run_scripts(["%s/third" % self.ACCOM_SET]), None)
 
     def test_run_script(self):
         # due to LP1030208, if the daemon is running (like on a dev box)
         # it will pop off the test, but in a pbuilder or build system
         # there will be no daemon, so we can just ensure that this
         # doesn't crash
-        self.util_copy_accomp(self.accomp_dir, "third")
+        self.util_copy_accom(self.accom_dir, "third")
         a = api.Accomplishments(None, None, True)
-        self.assertEqual(a.run_script("%s/wrong" % self.ACCOMP_SET), None)
+        self.assertEqual(a.run_script("%s/wrong" % self.ACCOM_SET), None)
         self.assertEqual(a.run_script("wrong"), None)
 
-        self.assertEqual(a.run_script("%s/third" % self.ACCOMP_SET), None)
+        self.assertEqual(a.run_script("%s/third" % self.ACCOM_SET), None)
 
-    def test_get_acc_date_completed(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
-        self.util_copy_accomp(self.accomp_dir, "third")
+    def test_get_accom_date_completed(self):
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
+        self.util_copy_accom(self.accom_dir, "third")
         self.util_copy_extrainfo(self.extrainfo_dir, "info")
         self.util_copy_extrainfo(self.extrainfo_dir, "info2")
         a = api.Accomplishments(None, None, True)
         a.write_extra_information_file("info", "whatever")
         a.write_extra_information_file("info2", "whatever2")
 
-        self.assertTrue(a.accomplish("%s/first" % self.ACCOMP_SET))
-        self.assertTrue(a.accomplish("%s/second" % self.ACCOMP_SET))
-        self.assertTrue(a.accomplish("%s/third" % self.ACCOMP_SET))
+        self.assertTrue(a.accomplish("%s/first" % self.ACCOM_SET))
+        self.assertTrue(a.accomplish("%s/second" % self.ACCOM_SET))
+        self.assertTrue(a.accomplish("%s/third" % self.ACCOM_SET))
 
         trophies = a.list_trophies()
         # since "second" requires signing, it shouldn't be listed
         self.assertEqual(len(trophies), 2)
 
-        d1 = a.get_acc_date_completed("%s/first" % self.ACCOMP_SET)
+        d1 = a.get_accom_date_completed("%s/first" % self.ACCOM_SET)
         self.assertTrue(isinstance(d1, basestring))
         dt1 = datetime.datetime.strptime(d1, "%Y-%m-%d %H:%M")
         self.assertTrue(dt1 is not None)
 
-        d3 = a.get_acc_date_completed("%s/third" % self.ACCOMP_SET)
+        d3 = a.get_accom_date_completed("%s/third" % self.ACCOM_SET)
         self.assertTrue(isinstance(d3, basestring))
         dt3 = datetime.datetime.strptime(d3, "%Y-%m-%d %H:%M")
         self.assertTrue(dt3 is not None)
@@ -202,206 +202,206 @@
     # list_unlocked_not_completed
     # get_trophy_data
     def test_accomplish(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
-        self.util_copy_accomp(self.accomp_dir, "third")
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
+        self.util_copy_accom(self.accom_dir, "third")
         a = api.Accomplishments(None, None, True)
 
         # before accomplishing
         opps = a.list_opportunitues()
         self.assertEqual(len(opps), 3)
         for accom in opps:
-            self.assertTrue(accom in ["%s/first" % self.ACCOMP_SET,
-                "%s/second" % self.ACCOMP_SET, "%s/third" % self.ACCOMP_SET])
+            self.assertTrue(accom in ["%s/first" % self.ACCOM_SET,
+                "%s/second" % self.ACCOM_SET, "%s/third" % self.ACCOM_SET])
 
         unlocked = a.list_unlocked()
         self.assertEqual(len(unlocked), 2)
         for accom in unlocked:
-            self.assertTrue(accom in ["%s/first" % self.ACCOMP_SET,
-                "%s/third" % self.ACCOMP_SET])
+            self.assertTrue(accom in ["%s/first" % self.ACCOM_SET,
+                "%s/third" % self.ACCOM_SET])
 
         unlocked_nc = a.list_unlocked_not_completed()
         self.assertEqual(len(unlocked_nc), 2)
         for accom in unlocked_nc:
-            self.assertTrue(accom in ["%s/first" % self.ACCOMP_SET,
-                "%s/third" % self.ACCOMP_SET])
+            self.assertTrue(accom in ["%s/first" % self.ACCOM_SET,
+                "%s/third" % self.ACCOM_SET])
 
         trophies = a.list_trophies()
         self.assertEqual(len(trophies), 0)
 
-        self.assertTrue(a.get_trophy_data("%s/first" % self.ACCOMP_SET) is None)
-        self.assertTrue(a.get_trophy_data("%s/second" % self.ACCOMP_SET)
+        self.assertTrue(a.get_trophy_data("%s/first" % self.ACCOM_SET) is None)
+        self.assertTrue(a.get_trophy_data("%s/second" % self.ACCOM_SET)
             is None)
-        self.assertTrue(a.get_trophy_data("%s/third" % self.ACCOMP_SET) is None)
+        self.assertTrue(a.get_trophy_data("%s/third" % self.ACCOM_SET) is None)
 
         # now let's accomplish something, it should fail without extra info
-        self.assertRaises(KeyError, a.accomplish, "%s/first" % self.ACCOMP_SET)
+        self.assertRaises(KeyError, a.accomplish, "%s/first" % self.ACCOM_SET)
 
         # this time it will work
         self.util_copy_extrainfo(self.extrainfo_dir, "info")
         self.util_copy_extrainfo(self.extrainfo_dir, "info2")
         a.reload_accom_database()
-        self.assertTrue(a.accomplish("%s/first" % self.ACCOMP_SET))
+        self.assertTrue(a.accomplish("%s/first" % self.ACCOM_SET))
 
         opps = a.list_opportunitues()
         self.assertEqual(len(opps), 2)
         for accom in opps:
-            self.assertTrue(accom in ["%s/second" % self.ACCOMP_SET,
-                "%s/third" % self.ACCOMP_SET])
+            self.assertTrue(accom in ["%s/second" % self.ACCOM_SET,
+                "%s/third" % self.ACCOM_SET])
 
         unlocked = a.list_unlocked()
         self.assertEqual(len(unlocked), 3)
         for accom in unlocked:
-            self.assertTrue(accom in ["%s/first" % self.ACCOMP_SET,
-                "%s/second" % self.ACCOMP_SET,
-                "%s/third" % self.ACCOMP_SET])
+            self.assertTrue(accom in ["%s/first" % self.ACCOM_SET,
+                "%s/second" % self.ACCOM_SET,
+                "%s/third" % self.ACCOM_SET])
 
         unlocked_nc = a.list_unlocked_not_completed()
         self.assertEqual(len(unlocked_nc), 2)
         for accom in unlocked_nc:
-            self.assertTrue(accom in ["%s/second" % self.ACCOMP_SET,
-                "%s/third" % self.ACCOMP_SET])
+            self.assertTrue(accom in ["%s/second" % self.ACCOM_SET,
+                "%s/third" % self.ACCOM_SET])
 
         trophies = a.list_trophies()
         self.assertEqual(len(trophies), 1)
         for accom in trophies:
-            self.assertTrue(accom in ["%s/first" % self.ACCOMP_SET])
+            self.assertTrue(accom in ["%s/first" % self.ACCOM_SET])
 
-        td = a.get_trophy_data("%s/first" % self.ACCOMP_SET)
+        td = a.get_trophy_data("%s/first" % self.ACCOM_SET)
         self.assertTrue(isinstance(td, dict))
 
         self.assertTrue(td['date-accomplished'] is not None)
         self.assertTrue(td['version'] is not None)
         self.assertTrue(td['__name__'] == "trophy")
-        self.assertTrue(td['id'] == "%s/first" % self.ACCOMP_SET)
+        self.assertTrue(td['id'] == "%s/first" % self.ACCOM_SET)
         self.assertTrue(td['needs-information'] is not None)
 
     def test_list_depending_on(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
-        self.util_copy_accomp(self.accomp_dir, "third")
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
+        self.util_copy_accom(self.accom_dir, "third")
         a = api.Accomplishments(None, None, True)
 
         self.assertEquals(len(a.list_depending_on("%s/first" %
-            self.ACCOMP_SET)), 1)
+            self.ACCOM_SET)), 1)
         self.assertEquals(len(a.list_depending_on("%s/second" %
-            self.ACCOMP_SET)), 0)
+            self.ACCOM_SET)), 0)
         self.assertEquals(len(a.list_depending_on("%s/third" %
-            self.ACCOMP_SET)), 0)
+            self.ACCOM_SET)), 0)
 
-    # tests all the get_acc_* functions, except for:
-    # get_acc_icon
-    # get_acc_icon_path
+    # tests all the get_accom_* functions, except for:
+    # get_accom_icon
+    # get_accom_icon_path
     # get_date_completed
-    def test_get_acc_all_funcs(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
-        self.util_copy_accomp(self.accomp_dir, "third")
+    def test_get_accom_all_funcs(self):
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
+        self.util_copy_accom(self.accom_dir, "third")
         a = api.Accomplishments(None, None, True)
 
-        # get_acc_data
-        data = a.get_acc_data("%s/first" % self.ACCOMP_SET)
+        # get_accom_data
+        data = a.get_accom_data("%s/first" % self.ACCOM_SET)
         self.assertTrue(isinstance(data, dict))
         self.assertEquals(data['title'], "My First Accomplishment")
-        data = a.get_acc_data("%s/third" % self.ACCOMP_SET)
+        data = a.get_accom_data("%s/third" % self.ACCOM_SET)
         self.assertTrue(isinstance(data, dict))
         self.assertEquals(data['title'], "My Third Accomplishment")
 
-        # get_acc_exists
-        self.assertTrue(a.get_acc_exists("%s/first" % self.ACCOMP_SET))
-        self.assertTrue(a.get_acc_exists("%s/second" % self.ACCOMP_SET))
-        self.assertTrue(a.get_acc_exists("%s/third" % self.ACCOMP_SET))
-        self.assertFalse(a.get_acc_exists("%s/something" % self.ACCOMP_SET))
-        self.assertFalse(a.get_acc_exists("wrong/first"))
+        # get_accom_exists
+        self.assertTrue(a.get_accom_exists("%s/first" % self.ACCOM_SET))
+        self.assertTrue(a.get_accom_exists("%s/second" % self.ACCOM_SET))
+        self.assertTrue(a.get_accom_exists("%s/third" % self.ACCOM_SET))
+        self.assertFalse(a.get_accom_exists("%s/something" % self.ACCOM_SET))
+        self.assertFalse(a.get_accom_exists("wrong/first"))
 
-        # get_acc_title
-        self.assertEquals(a.get_acc_title("%s/first" % self.ACCOMP_SET),
+        # get_accom_title
+        self.assertEquals(a.get_accom_title("%s/first" % self.ACCOM_SET),
             "My First Accomplishment")
-        self.assertEquals(a.get_acc_title("%s/second" % self.ACCOMP_SET),
+        self.assertEquals(a.get_accom_title("%s/second" % self.ACCOM_SET),
             "My Second Accomplishment")
-        self.assertEquals(a.get_acc_title("%s/third" % self.ACCOMP_SET),
+        self.assertEquals(a.get_accom_title("%s/third" % self.ACCOM_SET),
             "My Third Accomplishment")
-        self.assertRaises(KeyError, a.get_acc_title, "wrong")
-
-        # get_acc_description
-        self.assertTrue("example" in a.get_acc_description("%s/first" %
-            self.ACCOMP_SET))
-        self.assertTrue("example" in a.get_acc_description("%s/second" %
-            self.ACCOMP_SET))
-        self.assertTrue("example" in a.get_acc_description("%s/third" %
-            self.ACCOMP_SET))
-        self.assertRaises(KeyError, a.get_acc_description, "wrong")
-
-        # get_acc_needs_signing
-        self.assertFalse(a.get_acc_needs_signing("%s/first" % self.ACCOMP_SET))
-        self.assertTrue(a.get_acc_needs_signing("%s/second" % self.ACCOMP_SET))
-        self.assertFalse(a.get_acc_needs_signing("%s/first" % self.ACCOMP_SET))
-        self.assertRaises(KeyError, a.get_acc_needs_signing, "wrong")
-
-        # get_acc_depends
-        self.assertTrue(a.get_acc_depends("%s/first" % self.ACCOMP_SET) == [])
-        deps = a.get_acc_depends("%s/second" % self.ACCOMP_SET)
+        self.assertRaises(KeyError, a.get_accom_title, "wrong")
+
+        # get_accom_description
+        self.assertTrue("example" in a.get_accom_description("%s/first" %
+            self.ACCOM_SET))
+        self.assertTrue("example" in a.get_accom_description("%s/second" %
+            self.ACCOM_SET))
+        self.assertTrue("example" in a.get_accom_description("%s/third" %
+            self.ACCOM_SET))
+        self.assertRaises(KeyError, a.get_accom_description, "wrong")
+
+        # get_accom_needs_signing
+        self.assertFalse(a.get_accom_needs_signing("%s/first" % self.ACCOM_SET))
+        self.assertTrue(a.get_accom_needs_signing("%s/second" % self.ACCOM_SET))
+        self.assertFalse(a.get_accom_needs_signing("%s/first" % self.ACCOM_SET))
+        self.assertRaises(KeyError, a.get_accom_needs_signing, "wrong")
+
+        # get_accom_depends
+        self.assertTrue(a.get_accom_depends("%s/first" % self.ACCOM_SET) == [])
+        deps = a.get_accom_depends("%s/second" % self.ACCOM_SET)
         self.assertEquals(len(deps), 1)
-        self.assertTrue(deps[0] == "%s/first" % self.ACCOMP_SET)
-        self.assertTrue(a.get_acc_depends("%s/third" % self.ACCOMP_SET) == [])
-        self.assertRaises(KeyError, a.get_acc_depends, "wrong")
-
-        # get_acc_is_unlocked
-        self.assertTrue(a.get_acc_is_unlocked("%s/first" % self.ACCOMP_SET))
-        self.assertFalse(a.get_acc_is_unlocked("%s/second" % self.ACCOMP_SET))
-        self.assertTrue(a.get_acc_is_unlocked("%s/third" % self.ACCOMP_SET))
-        self.assertRaises(KeyError, a.get_acc_is_unlocked, "wrong")
-
-        # get_acc_is_completed
+        self.assertTrue(deps[0] == "%s/first" % self.ACCOM_SET)
+        self.assertTrue(a.get_accom_depends("%s/third" % self.ACCOM_SET) == [])
+        self.assertRaises(KeyError, a.get_accom_depends, "wrong")
+
+        # get_accom_is_unlocked
+        self.assertTrue(a.get_accom_is_unlocked("%s/first" % self.ACCOM_SET))
+        self.assertFalse(a.get_accom_is_unlocked("%s/second" % self.ACCOM_SET))
+        self.assertTrue(a.get_accom_is_unlocked("%s/third" % self.ACCOM_SET))
+        self.assertRaises(KeyError, a.get_accom_is_unlocked, "wrong")
+
+        # get_accom_is_completed
         # XXX - when we get the accomplish() code working, make some of these
         # true
-        self.assertFalse(a.get_acc_is_completed("%s/first" % self.ACCOMP_SET))
-        self.assertFalse(a.get_acc_is_completed("%s/second" % self.ACCOMP_SET))
-        self.assertFalse(a.get_acc_is_completed("%s/third" % self.ACCOMP_SET))
-        self.assertRaises(KeyError, a.get_acc_is_completed, "wrong")
+        self.assertFalse(a.get_accom_is_completed("%s/first" % self.ACCOM_SET))
+        self.assertFalse(a.get_accom_is_completed("%s/second" % self.ACCOM_SET))
+        self.assertFalse(a.get_accom_is_completed("%s/third" % self.ACCOM_SET))
+        self.assertRaises(KeyError, a.get_accom_is_completed, "wrong")
 
-        # get_acc_script_path
-        self.assertEqual(a.get_acc_script_path("%s/first" % self.ACCOMP_SET),
+        # get_accom_script_path
+        self.assertEqual(a.get_accom_script_path("%s/first" % self.ACCOM_SET),
             None)
-        self.assertEqual(a.get_acc_script_path("%s/second" % self.ACCOMP_SET),
+        self.assertEqual(a.get_accom_script_path("%s/second" % self.ACCOM_SET),
             None)
         self.util_write_file(self.script_root, "third.py", "print 'hello'")
-        sp = a.get_acc_script_path("%s/third" % self.ACCOMP_SET)
+        sp = a.get_accom_script_path("%s/third" % self.ACCOM_SET)
         self.assertTrue(sp.endswith("third.py"))
-        self.assertRaises(KeyError, a.get_acc_script_path, "wrong")
+        self.assertRaises(KeyError, a.get_accom_script_path, "wrong")
 
-        # get_acc_needs_info
-        info = a.get_acc_needs_info("%s/first" % self.ACCOMP_SET)
+        # get_accom_needs_info
+        info = a.get_accom_needs_info("%s/first" % self.ACCOM_SET)
         self.assertEqual(len(info),2)
         for i in info:
            self.assertTrue(i in ["info", "info2"])
-        self.assertEqual(a.get_acc_needs_info("%s/second" % self.ACCOMP_SET),
-            [])
-        self.assertEqual(a.get_acc_needs_info("%s/third" % self.ACCOMP_SET),
-            [])
-        self.assertRaises(KeyError, a.get_acc_needs_info, "wrong")
-
-        # get_acc_collection
-        self.assertEqual(a.get_acc_collection("%s/first" % self.ACCOMP_SET),
-            self.ACCOMP_SET)
-        self.assertEqual(a.get_acc_collection("%s/second" % self.ACCOMP_SET),
-            self.ACCOMP_SET)
-        self.assertEqual(a.get_acc_collection("%s/third" % self.ACCOMP_SET),
-            self.ACCOMP_SET)
-        self.assertRaises(KeyError, a.get_acc_collection, "wrong")
-
-        # get_acc_categories
-        self.assertEqual(a.get_acc_categories("%s/first" % self.ACCOMP_SET), [])
-        self.assertEqual(a.get_acc_categories("%s/second" % self.ACCOMP_SET),
-            [])
-        categories = a.get_acc_categories("%s/third" % self.ACCOMP_SET)
+        self.assertEqual(a.get_accom_needs_info("%s/second" % self.ACCOM_SET),
+            [])
+        self.assertEqual(a.get_accom_needs_info("%s/third" % self.ACCOM_SET),
+            [])
+        self.assertRaises(KeyError, a.get_accom_needs_info, "wrong")
+
+        # get_accom_collection
+        self.assertEqual(a.get_accom_collection("%s/first" % self.ACCOM_SET),
+            self.ACCOM_SET)
+        self.assertEqual(a.get_accom_collection("%s/second" % self.ACCOM_SET),
+            self.ACCOM_SET)
+        self.assertEqual(a.get_accom_collection("%s/third" % self.ACCOM_SET),
+            self.ACCOM_SET)
+        self.assertRaises(KeyError, a.get_accom_collection, "wrong")
+
+        # get_accom_categories
+        self.assertEqual(a.get_accom_categories("%s/first" % self.ACCOM_SET), [])
+        self.assertEqual(a.get_accom_categories("%s/second" % self.ACCOM_SET),
+            [])
+        categories = a.get_accom_categories("%s/third" % self.ACCOM_SET)
         self.assertEqual(len(info),2)
         for category in categories:
            self.assertTrue(category in ["testing", "unit test"])
-        self.assertRaises(KeyError, a.get_acc_categories, "wrong")
+        self.assertRaises(KeyError, a.get_accom_categories, "wrong")
 
     def test_get_block_ubuntuone_notification_bubbles(self):
         a = api.Accomplishments(None, None, True)
@@ -442,26 +442,26 @@
         version = a.get_API_version()
         self.assertTrue(isinstance(version, basestring))
 
-    # also tests get_acc_icon_path
-    def test_get_acc_icon(self):
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
+    # also tests get_accom_icon_path
+    def test_get_accom_icon(self):
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
         a = api.Accomplishments(None, None, True)
-        self.assertEquals(a.get_acc_icon('%s/first' % self.ACCOMP_SET),
+        self.assertEquals(a.get_accom_icon('%s/first' % self.ACCOM_SET),
            'first.jpg')
-        icon_path = a.get_acc_icon_path('%s/first' % self.ACCOMP_SET)
+        icon_path = a.get_accom_icon_path('%s/first' % self.ACCOM_SET)
         self.assertTrue(icon_path.endswith("first-opportunity.jpg"))
 
         # LP 1024052 - make sure this works without a . in the filename
-        self.assertEquals(a.get_acc_icon('%s/second' % self.ACCOMP_SET),
+        self.assertEquals(a.get_accom_icon('%s/second' % self.ACCOM_SET),
            'second')
-        icon_path = a.get_acc_icon_path('%s/second' % self.ACCOMP_SET)
+        icon_path = a.get_accom_icon_path('%s/second' % self.ACCOM_SET)
         self.assertTrue(icon_path.endswith("second-locked"))
 
     def test_build_viewer_database(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
         a = api.Accomplishments(None, None, True)
         viewer_db = a.build_viewer_database()
         self.assertEquals(len(viewer_db), 2)
@@ -472,76 +472,76 @@
         self.assertEquals(viewer_db[1]['collection-human'],
             "Test Collection")
 
-        self.assertEquals(viewer_db[0]['collection'], "testaccomp")
-        self.assertEquals(viewer_db[1]['collection'], "testaccomp")
+        self.assertEquals(viewer_db[0]['collection'], "testaccom")
+        self.assertEquals(viewer_db[1]['collection'], "testaccom")
 
         # test a few random fields
         for item in viewer_db:
             if item['title'] == "My First Accomplishment":
                 self.assertTrue("opportunity" in item['iconpath'])
-                self.assertTrue(item['id'] == "%s/first" % self.ACCOMP_SET)
+                self.assertTrue(item['id'] == "%s/first" % self.ACCOM_SET)
             elif item['title'] == "My Second Accomplishment":
                 self.assertTrue("locked" in item['iconpath'])
-                self.assertTrue(item['id'] == "%s/second" % self.ACCOMP_SET)
+                self.assertTrue(item['id'] == "%s/second" % self.ACCOM_SET)
             # this shouldn't happen
             else:
                 self.assertTrue(False)
 
     # also tests reloading the database
     def test_list_all(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
-        self.util_copy_accomp(self.accomp_dir, "third")
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
+        self.util_copy_accom(self.accom_dir, "third")
 
         a = api.Accomplishments(None, None, True)
-        self.assertEqual(len(a.list_accomplishments()), 3)
+        self.assertEqual(len(a.list_accoms()), 3)
 
         # add a new accomp
-        self.util_write_file(self.accomp_dir, "fourth.accomplishment",
+        self.util_write_file(self.accom_dir, "fourth.accomplishment",
             "[accomplishment]\n"\
             "title=My Fourth Accomplishment\n"\
             "description=An example accomplishment for the test suite\n")
-        self.assertEqual(len(a.list_accomplishments()), 3)
+        self.assertEqual(len(a.list_accoms()), 3)
         a.reload_accom_database()
-        self.assertEqual(len(a.list_accomplishments()), 4)
+        self.assertEqual(len(a.list_accoms()), 4)
 
         # remove the new accomp
-        os.remove(os.path.join(self.accomp_dir, "fourth.accomplishment"))
+        os.remove(os.path.join(self.accom_dir, "fourth.accomplishment"))
         a.reload_accom_database()
-        self.assertEqual(len(a.list_accomplishments()), 3)
+        self.assertEqual(len(a.list_accoms()), 3)
 
-        self.util_remove_all_accomps(self.accomp_dir)
+        self.util_remove_all_accoms(self.accom_dir)
 
     def test_missing_about_file(self):
-        os.remove(os.path.join(self.accomp_root, "ABOUT"))
+        os.remove(os.path.join(self.accom_root, "ABOUT"))
         self.assertRaises(LookupError, api.Accomplishments, None, None, True)
 
         # put the file back
-        self.util_write_about_file(self.accomp_root)
+        self.util_write_about_file(self.accom_root)
 
     def test_bad_accomplishment_list(self):
         # this test ensures that a bad accompishment doesn't crash the
         # daemon or get into the list
 
         # ensure a clean start
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
         a = api.Accomplishments(None, None, True)
-        self.assertEqual(len(a.list_accomplishments()), 1)
-        self.util_write_file(self.accomp_dir, "bad.accomplishment",
+        self.assertEqual(len(a.list_accoms()), 1)
+        self.util_write_file(self.accom_dir, "bad.accomplishment",
             "[accomplishment]\n"\
             "descriptionbad desc\n")
         a.reload_accom_database()
-        self.assertEqual(len(a.list_accomplishments()), 1)
+        self.assertEqual(len(a.list_accoms()), 1)
 
-        self.util_write_file(self.accomp_dir, "bad.accomplishment",
+        self.util_write_file(self.accom_dir, "bad.accomplishment",
             "descriptionbad desc\n")
         a.reload_accom_database()
-        self.assertEqual(len(a.list_accomplishments()), 1)
+        self.assertEqual(len(a.list_accoms()), 1)
 
         # cleanup
-        self.util_remove_all_accomps(self.accomp_dir)
+        self.util_remove_all_accoms(self.accom_dir)
 
     # also tests get_config_value()
     def test_write_config_file_item(self):
@@ -563,16 +563,16 @@
 
     # this tests the get_collection_* functions and list_collections():
     def test_get_collection_all_funcs(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
-        self.util_copy_accomp(self.accomp_dir, "third")
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
+        self.util_copy_accom(self.accom_dir, "third")
         a = api.Accomplishments(None, None, True)
 
         # list_collections
         collections = a.list_collections()
         self.assertEqual(len(collections), 1)
-        self.assertEqual(collections[0], self.ACCOMP_SET)
+        self.assertEqual(collections[0], self.ACCOM_SET)
 
         # get_collection_name
         self.assertEqual(a.get_collection_name(collections[0]),
@@ -610,18 +610,18 @@
 
     # get trophy path
     def test_get_trophy_path(self):
-        self.util_remove_all_accomps(self.accomp_dir)
-        self.util_copy_accomp(self.accomp_dir, "first")
-        self.util_copy_accomp(self.accomp_dir, "second")
-        self.util_copy_accomp(self.accomp_dir, "third")
+        self.util_remove_all_accoms(self.accom_dir)
+        self.util_copy_accom(self.accom_dir, "first")
+        self.util_copy_accom(self.accom_dir, "second")
+        self.util_copy_accom(self.accom_dir, "third")
         a = api.Accomplishments(None, None, True)
 
         self.assertTrue(a.get_trophy_path("%s/first" %
-            self.ACCOMP_SET).endswith("first.trophy"))
+            self.ACCOM_SET).endswith("first.trophy"))
         self.assertTrue(a.get_trophy_path("%s/second" %
-            self.ACCOMP_SET).endswith("second.trophy"))
+            self.ACCOM_SET).endswith("second.trophy"))
         self.assertTrue(a.get_trophy_path("%s/third" %
-            self.ACCOMP_SET).endswith("third.trophy"))
+            self.ACCOM_SET).endswith("third.trophy"))
 
     def test_write_extra_information_file(self):
         a = api.Accomplishments(None, None, True)
@@ -648,11 +648,11 @@
         a = api.Accomplishments(None, None, True)
         self.util_copy_extrainfo(self.extrainfo_dir, "info")
         self.util_copy_extrainfo(self.extrainfo_dir, "info2")
-        self.util_copy_accomp(self.accomp_dir, "first")
+        self.util_copy_accom(self.accom_dir, "first")
 
         # get extra information
         # these won't show up until we reload
-        self.assertRaises(KeyError, a.get_extra_information, self.ACCOMP_SET,
+        self.assertRaises(KeyError, a.get_extra_information, self.ACCOM_SET,
             "info")
 
         # should return None when the collection doesn't exist
@@ -663,15 +663,15 @@
 
         # will throw a KeyError if collection is right, but extrainfo is
         # wrong
-        self.assertRaises(KeyError, a.get_extra_information, self.ACCOMP_SET,
+        self.assertRaises(KeyError, a.get_extra_information, self.ACCOM_SET,
             "wrong")
 
-        ei = a.get_extra_information(self.ACCOMP_SET, "info")
+        ei = a.get_extra_information(self.ACCOM_SET, "info")
         self.assertTrue(isinstance(ei, list))
         self.assertTrue(len(ei) == 1)
         self.assertEqual(ei[0]['info'], '')
         self.assertEqual(ei[0]['label'], 'Some info')
-        ei = a.get_extra_information(self.ACCOMP_SET, "info2")
+        ei = a.get_extra_information(self.ACCOM_SET, "info2")
         self.assertTrue(isinstance(ei, list))
         self.assertTrue(len(ei) == 1)
         self.assertEqual(ei[0]['info2'], '')
@@ -679,10 +679,10 @@
 
         # write some data out and reload the DB
         a.write_extra_information_file("info", "whatever")
-        ei = a.get_extra_information(self.ACCOMP_SET, "info")
+        ei = a.get_extra_information(self.ACCOM_SET, "info")
         self.assertEqual(ei[0]['info'], 'whatever')
         a.write_extra_information_file("info2", "whatever2")
-        ei = a.get_extra_information(self.ACCOMP_SET, "info2")
+        ei = a.get_extra_information(self.ACCOM_SET, "info2")
         self.assertEqual(ei[0]['info2'], 'whatever2')
 
         # get all extra information
@@ -691,7 +691,7 @@
         self.assertTrue(len(all_extra_info) == 2)
         for ei in all_extra_info:
             self.assertTrue(isinstance(ei, dict))
-            self.assertEquals(ei['collection'], self.ACCOMP_SET)
+            self.assertEquals(ei['collection'], self.ACCOM_SET)
             self.assertTrue(ei['description'] is not None)
             self.assertTrue(ei['example'] is not None)
             self.assertTrue(ei['needs-information'] is not None)