Merge lp:~dobey/unity-scope-click/no-deb-dates into lp:unity-scope-click/devel

[dobey]

Only show extended info when download_url is not empty.

[Alejandro J. Cura (alecu)]

Fix looks good, branch needs tests.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:414
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/252
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/252

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/278/rebuild

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/no-deb-dates]

415. By dobey on 2014-08-20

Add fake json details for a deb package.
Add more tests for the description widgets.

[Alejandro J. Cura (alecu)]

Code looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:415
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/253
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/253

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/279/rebuild

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-08-19 21:42:44 +0000
+++ libclickscope/click/preview.cpp	2014-08-20 20:46:14 +0000
@@ -350,20 +350,22 @@
         widgets.push_back(summary);
     }
 
-    scopes::PreviewWidget other_metadata("other_metadata", "text");
-    other_metadata.add_attribute_value("text", scopes::Variant(build_other_metadata(details)));
-    widgets.push_back(other_metadata);
-
-    scopes::PreviewWidget updates("updates", "text");
-    updates.add_attribute_value("title", scopes::Variant(_("Updates")));
-    updates.add_attribute_value("text", scopes::Variant(build_updates_table(details)));
-    widgets.push_back(updates);
-
-    scopes::PreviewWidget whats_new("whats_new", "text");
-    whats_new.add_attribute_value("title", scopes::Variant(_("What's new")));
-    whats_new.add_attribute_value("text", scopes::Variant(build_whats_new(details)));
-    widgets.push_back(whats_new);
-
+    if (!details.download_url.empty())
+    {
+        scopes::PreviewWidget other_metadata("other_metadata", "text");
+        other_metadata.add_attribute_value("text", scopes::Variant(build_other_metadata(details)));
+        widgets.push_back(other_metadata);
+
+        scopes::PreviewWidget updates("updates", "text");
+        updates.add_attribute_value("title", scopes::Variant(_("Updates")));
+        updates.add_attribute_value("text", scopes::Variant(build_updates_table(details)));
+        widgets.push_back(updates);
+
+        scopes::PreviewWidget whats_new("whats_new", "text");
+        whats_new.add_attribute_value("title", scopes::Variant(_("What's new")));
+        whats_new.add_attribute_value("text", scopes::Variant(build_whats_new(details)));
+        widgets.push_back(whats_new);
+    }
     return widgets;
 }
 

=== modified file 'libclickscope/tests/fake_json.cpp'
--- libclickscope/tests/fake_json.cpp	2014-08-11 18:30:00 +0000
+++ libclickscope/tests/fake_json.cpp	2014-08-20 20:46:14 +0000
@@ -225,6 +225,16 @@
     }
 )foo";
 
+const std::string FAKE_JSON_PACKAGE_DETAILS_DEB = R"foo(
+    {
+        "name": "weather-app",
+        "icon_url": "theme://weather-app",
+        "title": "\u1F4A9 Weather",
+        "description": "A weather application.",
+        "keywords": "these, are, key, words"
+    }
+)foo";
+
 const std::string FAKE_JSON_BOOTSTRAP = R"(
       {
           "_embedded": {

=== modified file 'libclickscope/tests/fake_json.h'
--- libclickscope/tests/fake_json.h	2014-08-05 19:00:03 +0000
+++ libclickscope/tests/fake_json.h	2014-08-20 20:46:14 +0000
@@ -39,6 +39,7 @@
 extern const std::string FAKE_JSON_SEARCH_RESULT_MANY;
 extern const std::string FAKE_JSON_SEARCH_RESULT_RECOMMENDS;
 extern const std::string FAKE_JSON_PACKAGE_DETAILS;
+extern const std::string FAKE_JSON_PACKAGE_DETAILS_DEB;
 extern const std::string FAKE_JSON_BOOTSTRAP;
 extern const std::string FAKE_JSON_BROKEN_BOOTSTRAP;
 extern const std::string FAKE_JSON_DEPARTMENTS_ONLY;

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2014-08-19 21:42:44 +0000
+++ libclickscope/tests/test_preview.cpp	2014-08-20 20:46:14 +0000
@@ -111,10 +111,8 @@
     click::PackageDetails details;
     unity::scopes::PreviewWidgetList widgets;
 
-    PreviewStrategyDescriptionTest() : details(click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS))
+    PreviewStrategyDescriptionTest()
     {
-        widgets = preview.descriptionWidgets(details);
-
     }
     void assertWidgetAttribute(int n, std::string attribute_name, std::string expected_value)
     {
@@ -125,8 +123,11 @@
     }
 };
 
-TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgets)
+TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsFull)
 {
+    details = click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS);
+    widgets = preview.descriptionWidgets(details);
+
     assertWidgetAttribute(0, "title", "Info");
     assertWidgetAttribute(0, "text", details.description);
 
@@ -140,6 +141,23 @@
 
 }
 
+TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsMinimal)
+{
+    details = click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS_DEB);
+    widgets = preview.descriptionWidgets(details);
+
+    ASSERT_EQ(1, widgets.size());
+
+    assertWidgetAttribute(0, "title", "Info");
+    assertWidgetAttribute(0, "text", details.description);
+}
+
+TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsNone)
+{
+    widgets = preview.descriptionWidgets(details);
+    ASSERT_EQ(0, widgets.size());
+}
+
 class FakePreviewStrategy :  public click::PreviewStrategy
 {
 public: