Merge lp:~mvo/software-center/lp955005 into lp:software-center

[Michael Vogt]

This branch fixes bug #955005 and does a bit of drive-by improving the scope of the test for the
detailsview layout. Test case is:
$ ./software-center wireframesketcherstudio
and verify that there is no review_stats widget visible anymore. But for e.g. abiword this should still
be the case.

[Gary Lasker (gary-lasker)]

Very nice work and great test too, many thanks mvo!!

review: Approve

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2012-03-13 18:35:14 +0000
+++ softwarecenter/enums.py	2012-03-15 09:09:22 +0000
@@ -180,10 +180,11 @@
     FORCE_VERSION,
     # the package is not found in the DB or cache
     NOT_FOUND,
+    # its purchased but not found for the current series
+    PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES,
     # this *needs* to be last (for test_appdetails.py) and means
     # something went wrong and we don't have a state for this PKG
     UNKNOWN,
-    PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES,
     ) = range(17)
 
 # visibility of non applications in the search results

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-03-14 23:44:30 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-03-15 09:09:22 +0000
@@ -302,13 +302,11 @@
                      PkgStates.INSTALLING_PURCHASED,
                      PkgStates.REMOVING,
                      PkgStates.UPGRADING,
+                     PkgStates.ERROR,
                      AppActions.APPLY):
             self.show()
         elif state == PkgStates.NOT_FOUND:
             self.hide()
-        elif state == PkgStates.ERROR:
-            # error details are set below
-            self.show()
         else:
             # mvo: why do we override state here again?
             state = app_details.pkg_state
@@ -426,7 +424,7 @@
             self.set_label(_(u'Changing Add-ons\u2026'))
             self.button.set_sensitive(False)
         elif state == PkgStates.UNKNOWN:
-            self.set_button_label("")
+            self.button.hide()
             self.set_label(_("Error"))
         elif state == PkgStates.ERROR:
             # this is used when the pkg can not be installed
@@ -439,7 +437,7 @@
             # this is used when the pkg is not in the cache and there is no
             # request we display the error in the summary field and hide the
             # rest
-            pass
+            self.button.hide()
         elif state == PkgStates.NEEDS_SOURCE:
             channelfile = self.app_details.channelfile
             # it has a price and is not available
@@ -454,9 +452,15 @@
                 #        components that are not enabled or that just
                 #        lack the "Packages" files (but are in sources.list)
                 self.set_button_label(_("Update Now"))
-        if (self.app_details.warning and not self.app_details.error and
-           not state in (PkgStates.INSTALLING, PkgStates.INSTALLING_PURCHASED,
-           PkgStates.REMOVING, PkgStates.UPGRADING, AppActions.APPLY)):
+
+        # this maybe a region or hw compatibilty warning
+        if (self.app_details.warning and 
+            not self.app_details.error and
+            not state in (PkgStates.INSTALLING, 
+                          PkgStates.INSTALLING_PURCHASED,
+                          PkgStates.REMOVING, 
+                          PkgStates.UPGRADING, 
+                          AppActions.APPLY)):
             self.set_label(self.app_details.warning)
 
         sensitive = network_state_is_connected()
@@ -1165,9 +1169,12 @@
         #~ self.usage = mkit.BubbleLabel()
         #~ vb_inner.pack_start(self.usage, True, True, 0)
 
-        # star rating widget
+        # star rating box/widget
         self.review_stats_widget = StarRatingsWidget()
+        self.review_stats = Gtk.HBox()
         vb_inner.pack_start(
+            self.review_stats, False, False, 0)
+        self.review_stats.pack_start(
             self.review_stats_widget, False, False, StockEms.SMALL)
 
         #~ vb_inner.set_property("can-focus", True)
@@ -1375,6 +1382,7 @@
         if pkg_error:
             self.addon_view.hide()
             self.reviews.hide()
+            self.review_stats.hide()
             self.screenshot.hide()
             #~ self.info_header.hide()
             self.info_vb.hide()
@@ -1383,6 +1391,7 @@
         else:
             self.addon_view.show()
             self.reviews.show()
+            self.review_stats.show()
             self.screenshot.show()
             #~ self.info_header.show()
             self.info_vb.show()

=== modified file 'test/gtk3/test_appdetailsview.py'
--- test/gtk3/test_appdetailsview.py	2012-02-23 16:40:27 +0000
+++ test/gtk3/test_appdetailsview.py	2012-03-15 09:09:22 +0000
@@ -51,7 +51,7 @@
         do_events()
         self.assertTrue(self.view.videoplayer.get_property("visible"))
     
-    def test_page_pkgstatusbar(self):
+    def test_page_pkgstates(self):
         # show app 
         app = Application("", "abiword")
         self.view.show_app(app)
@@ -68,7 +68,7 @@
         mock_details._error_not_found = "error not found"
         mock_details.price = "1.00"
         mock_details.pkgname = "abiword"
-        mock_details.error = ""
+        mock_details.error = "error-text"
         self.view.app_details = mock_details
 
         # the states and what labels we expect in the pkgstatusbar
@@ -79,18 +79,25 @@
             PkgStates.NEEDS_PURCHASE : ('US$ 1.00', u'Buy\u2026'),
             PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED : ('Purchased on 2011-11-20', 'Install'),
         }
+        # this describes if a button is visible or invisible
+        button_invisible = [ PkgStates.ERROR,
+                             PkgStates.NOT_FOUND,
+                             PkgStates.INSTALLING_PURCHASED,
+                             PkgStates.PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES,
+                             PkgStates.UNKNOWN,
+                           ]
 
-        # show a app through the various states
+        # show a app through the various states and test if the right ui
+        # elements are visible and have the right text
         for var in vars(PkgStates):
-            # FIXME: this just ensures we are not crashing, also
-            # add functional tests to ensure on error we show
-            # the right info etc
             state = getattr(PkgStates, var)
             mock_details.pkg_state = state
             # reset app to ensure its shown again
             self.view.app = None
             # show it
             self.view.show_app(mock_app)
+            #do_events()
+            # check button label
             if state in pkg_states_to_labels:
                 label, button_label = pkg_states_to_labels[state]
                 self.assertEqual(
@@ -99,6 +106,19 @@
                 self.assertEqual(
                     self.view.pkg_statusbar.get_button_label().decode("utf-8"),
                     button_label)
+            # check if button should be there or not
+            if state in button_invisible:
+                self.assertFalse(
+                    self.view.pkg_statusbar.button.get_property("visible"),
+                    "button visible error for state %s" % state)
+            else:
+                self.assertTrue(
+                    self.view.pkg_statusbar.button.get_property("visible"),
+                    "button visible error for state %s" % state)
+            # regression test for #955005
+            if state == PkgStates.NOT_FOUND:
+                self.assertFalse(self.view.review_stats.get_property("visible"))
+                self.assertFalse(self.view.reviews.get_property("visible"))
 
     def test_app_icon_loading(self):
         # get icon