Merge lp:~jamesh/unity/bug-1178046 into lp:~unity-team/unity/libunity-7.0-breakage

[James Henstridge]

Hide the ratings widget in the movie preview if the rating is less than zero.

Hide the ratings widget in the Movie preview if the rating is < 0. We need this to fix some problems brought up in the Design review of some scope previews.

This patch is analogous to the one for bug 1170715, which covered application previews.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3140
http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-raring-amd64-ci/80

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-libunity-7.0-breakage-ci/80/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

LGTM.

review: Approve

[Nick Dedekind (nick-dedekind)]

although, a unit tests would be great.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3142
http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-raring-amd64-ci/81

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-libunity-7.0-breakage-ci/81/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp	2013-01-16 15:43:38 +0000
+++ dash/previews/MoviePreview.cpp	2013-05-13 12:26:24 +0000
@@ -163,13 +163,15 @@
       }
       /////////////////////
       
-      rating_ = new PreviewRatingsWidget();
-      AddChild(rating_.GetPointer());
-      rating_->SetMaximumHeight(style.GetRatingWidgetHeight());
-      rating_->SetMinimumHeight(style.GetRatingWidgetHeight());
-      rating_->SetRating(movie_preview_model->rating);
-      rating_->SetReviews(movie_preview_model->num_ratings);
-      rating_->request_close().connect([this]() { preview_container_->request_close.emit(); });
+      if (movie_preview_model->rating >= 0) {
+        rating_ = new PreviewRatingsWidget();
+        AddChild(rating_.GetPointer());
+        rating_->SetMaximumHeight(style.GetRatingWidgetHeight());
+        rating_->SetMinimumHeight(style.GetRatingWidgetHeight());
+        rating_->SetRating(movie_preview_model->rating);
+        rating_->SetReviews(movie_preview_model->num_ratings);
+        rating_->request_close().connect([this]() { preview_container_->request_close.emit(); });
+      }
 
       /////////////////////
       // Description
@@ -210,7 +212,8 @@
       ///////////////////
 
     full_data_layout_->AddLayout(app_data_layout, 0);
-    full_data_layout_->AddView(rating_.GetPointer(), 0);
+    if (rating_ != NULL)
+      full_data_layout_->AddView(rating_.GetPointer(), 0);
     full_data_layout_->AddView(preview_info, 1);
     full_data_layout_->AddView(actions_layout, 0);
     /////////////////////

=== modified file 'tests/test_previews_movie.cpp'
--- tests/test_previews_movie.cpp	2013-01-24 03:17:58 +0000
+++ tests/test_previews_movie.cpp	2013-05-13 12:26:24 +0000
@@ -63,14 +63,16 @@
 {
 public:
   TestPreviewMovie()
-  : parent_window_(new nux::BaseWindow("TestPreviewMovie"))
+  : parent_window_(new nux::BaseWindow("TestPreviewMovie")) {}
+
+  void create_preview_model(double rating)
   {
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_movie_preview_new()));
 
     GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
     g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£1.00"));
 
-    unity_protocol_movie_preview_set_rating(UNITY_PROTOCOL_MOVIE_PREVIEW(proto_obj.RawPtr()), 0.8);
+    unity_protocol_movie_preview_set_rating(UNITY_PROTOCOL_MOVIE_PREVIEW(proto_obj.RawPtr()), rating);
     unity_protocol_movie_preview_set_num_ratings(UNITY_PROTOCOL_MOVIE_PREVIEW(proto_obj.RawPtr()), 12);
 
     unity_protocol_preview_set_image_source_uri(proto_obj, "http://ia.media-imdb.com/images/M/MV5BMTM3NDM5MzY5Ml5BMl5BanBnXkFtZTcwNjExMDUwOA@@._V1._SY317_.jpg");
@@ -100,6 +102,7 @@
 
 TEST_F(TestPreviewMovie, TestCreate)
 {
+  create_preview_model(0.8);
   previews::Preview::Ptr preview_view = previews::Preview::PreviewForModel(preview_model_);
 
   EXPECT_TRUE(dynamic_cast<previews::MoviePreview*>(preview_view.GetPointer()) != NULL);
@@ -107,6 +110,7 @@
 
 TEST_F(TestPreviewMovie, TestUIValues)
 {
+  create_preview_model(0.8);
   MockMoviePreview::Ptr preview_view(new MockMoviePreview(preview_model_));
 
   EXPECT_EQ(preview_view->title_->GetText(), "Movie Title &amp; special char");
@@ -135,4 +139,13 @@
   }
 }
 
+TEST_F(TestPreviewMovie, TestHideRatings)
+{
+  create_preview_model(-1);
+  MockMoviePreview::Ptr preview_view(new MockMoviePreview(preview_model_));
+
+  EXPECT_EQ(preview_view->rating_, NULL);
+}
+
+
 }