Merge lp:~gary-lasker/software-center/for-3.0-fix-lp684077 into lp:software-center/3.0

[Gary Lasker]

This fix for bug 684077 is cherrypicked from natty. It includes unit tests updated for the 3.0 branch.

Thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-10 08:25:06 +0000
+++ debian/changelog	2011-03-03 02:19:29 +0000
@@ -1,3 +1,14 @@
+software-center (3.0.9) UNRELEASED; urgency=low
+
+  * softwarecenter/db/update.py,
+    test/test_appview.py,
+    test/test_database.py:
+    - track cataloged_time for items not in axi (e.g. for-purchase apps)
+      so that they will show up in What's New, add/modify unit tests
+      per the changes (LP: #684077)
+
+ -- Gary Lasker <[e-mail]>  Wed, 02 Mar 2011 17:29:11 -0500
+
 software-center (3.0.8) maverick-proposed; urgency=low
 
   [ Gary Lasker ]
 
=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2010-09-29 11:19:48 +0000
+++ softwarecenter/db/update.py	2011-03-03 02:19:29 +0000
@@ -426,9 +426,14 @@
         doc.add_value(XAPIAN_VALUE_PKGNAME, pkgname)
         doc.add_value(XAPIAN_VALUE_DESKTOP_FILE, parser.desktopf)
         # cataloged_times
-        if pkgname in cataloged_times and "catalogedtime" in axi_values:
-            doc.add_value(axi_values["catalogedtime"], 
-                          xapian.sortable_serialise(cataloged_times[pkgname]))
+        if "catalogedtime" in axi_values:
+            if pkgname in cataloged_times:
+                doc.add_value(axi_values["catalogedtime"], 
+                              xapian.sortable_serialise(cataloged_times[pkgname]))
+            else:
+                # also catalog apps not found in axi (e.g. for-purchase apps)
+                doc.add_value(axi_values["catalogedtime"], 
+                              xapian.sortable_serialise(time.time()))
         # pocket (main, restricted, ...)
         if parser.has_option_desktop("X-AppInstall-Section"):
             archive_section = parser.get_desktop("X-AppInstall-Section")
 
=== modified file 'test/test_appview.py'
--- test/test_appview.py	2010-09-08 03:13:07 +0000
+++ test/test_appview.py	2011-03-03 02:19:29 +0000
@@ -86,16 +86,22 @@
         enquire.set_query(query)
         valueno = self.db._axi_values["catalogedtime"]
         enquire.set_sort_by_value(int(valueno), reverse=True)
-        matches = enquire.get_mset(0, 20)
+        matches = enquire.get_mset(0, 10)
         for m in matches:
             doc = db.get_document(m.docid)
             #print xapian.sortable_unserialise(doc.get_value(valueno))
             sorted_by_axi.append(self.db.get_pkgname(doc))
         # now compare to what we get from the store
         sorted_by_appstore = []
+        # we don't want to include items for purchase in the compare,
+        # since although tagged with cataloged_time values, they don't
+        # actually appear in the axi
+        for_purchase_query = xapian.Query("AH" + AVAILABLE_FOR_PURCHASE_MAGIC_CHANNEL_NAME)
+        store_query = xapian.Query(xapian.Query.OP_AND_NOT, 
+                                   query, for_purchase_query)
         store = AppStore(self.cache, self.db, self.mock_icons, 
                          sortmode=SORT_BY_CATALOGED_TIME,
-                         limit=20, search_query=query,
+                         limit=10, search_query=store_query,
                          nonapps_visible=True)
         for item in store:
             sorted_by_appstore.append(item[AppStore.COL_PKGNAME])
 
=== modified file 'test/test_database.py'
--- test/test_database.py	2010-09-21 13:52:00 +0000
+++ test/test_database.py	2011-03-03 02:19:29 +0000
@@ -224,6 +224,24 @@
             doc = m.document
             doc.get_value(value_time) >= last_time
             last_time = doc.get_value(value_time)
+            
+    def test_non_axi_apps_cataloged_time(self):
+        db = xapian.WritableDatabase("./data/test.db", 
+                                     xapian.DB_CREATE_OR_OVERWRITE)
+        res = update_from_app_install_data(db, self.cache, datadir="./data/")
+        db = StoreDatabase("./data/test.db", self.cache)
+        db.open(use_axi=True)
+
+        axi_value_time = db._axi_values["catalogedtime"]
+        sc_app = Application("Ubuntu Software Center Test", "software-center")
+        sc_doc = db.get_xapian_document(sc_app.appname, sc_app.pkgname)
+        sc_cataloged_time = sc_doc.get_value(axi_value_time)
+        so_app = Application("Scintillant Orange", "scintillant-orange")
+        so_doc = db.get_xapian_document(so_app.appname, so_app.pkgname)
+        so_cataloged_time = so_doc.get_value(axi_value_time)
+        # the test package Scintillant Orange should be cataloged at a
+        # later time than axi package Ubuntu Software Center
+        self.assertTrue(so_cataloged_time > sc_cataloged_time)
 
     def test_parse_axi_values_file(self):
         s = """