[hamster-applet] updated unit tests for tags

[Toms Baugis <tbaugis src gnome org>]

commit 35067d7a990dee2f9d03d27f89dcc598773bfd79
Author: James Westby <jw+debian jameswestby net>
Date:   Wed Feb 10 12:23:57 2010 +0000

    updated unit tests for tags

 src/hamster/hamsterdbus.py |    3 ++-
 tests/hamsterdbus_test.py  |    7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/hamster/hamsterdbus.py b/src/hamster/hamsterdbus.py
index 50ef0e8..21fa1bc 100644
--- a/src/hamster/hamsterdbus.py
+++ b/src/hamster/hamsterdbus.py
@@ -27,6 +27,7 @@ from calendar import timegm
 from configuration import runtime
 
 # DBus service parameters
+HAMSTER_PATH = "/org/gnome/Hamster"
 HAMSTER_URI = "org.gnome.Hamster"
 
 
@@ -40,7 +41,7 @@ class HamsterDbusController(dbus.service.Object):
         between dbus types and hamster-applet data types
         """
         try:
-            dbus.service.Object.__init__(self, bus_name, "/org/gnome/Hamster")
+            dbus.service.Object.__init__(self, bus_name, HAMSTER_PATH)
         except KeyError:
             # KeyError is thrown when the dbus interface is taken
             # that is there is other hamster running somewhere
diff --git a/tests/hamsterdbus_test.py b/tests/hamsterdbus_test.py
index 70879c2..ce73a5a 100644
--- a/tests/hamsterdbus_test.py
+++ b/tests/hamsterdbus_test.py
@@ -37,7 +37,7 @@ class TestTracking(unittest.TestCase):
         fact = self.__rndfactgenerator()
 
         activity = fact['name'] + '@' + fact['category'] + ',' + \
-                fact['description']
+                fact['description'] + "".join([" #%s" % x for x in fact['tags']])
         fact_id = self.addfact(activity, fact['start_time'], fact['end_time'])
         self.failUnless(type(fact_id) == dbus.Int32 and fact_id != 0,
             'expected non-zero dbus.Int32 as return value')
@@ -53,6 +53,8 @@ class TestTracking(unittest.TestCase):
                 'expected same start_time')
         self.assertEqual(fact['end_time'], dbfact['end_time'],
                 'expected same end_time')
+        self.assertEqual(set(fact['tags']), set(dbfact['tags']),
+                'expected same tags')
 
         facts = self.getfacts(dbfact['start_time'], dbfact['end_time'])
         in_facts = False
@@ -144,7 +146,8 @@ class TestTracking(unittest.TestCase):
                 'description':description or rndstr(),
                 'start_time':start_time or timegm(dt.datetime.now().timetuple()),
                 'end_time':end_time or timegm((dt.datetime.now() + \
-                        dt.timedelta(hours=1)).timetuple())}
+                        dt.timedelta(hours=1)).timetuple()),
+                'tags': [rndstr(), rndstr()]}
         return fact
 
     def __findactivity(self, act, cat):