Merge lp:~mandel/libunity/libunity-add-music-payment into lp:libunity

[Manuel de la Peña]

Added extra preview to be used by the music store scope.

Added extra preview to be used by the music store scope.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:203
http://s-jenkins:8080/job/libunity-ci/13/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/13/console
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/13/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/13//rebuild/?

review: Needs Fixing (continuous-integration)

[lp:~mandel/libunity/libunity-add-music-payment]

204. By Manuel de la Peña on 2012-12-07

Merged with trunk.

205. By Manuel de la Peña on 2012-12-07

Updated protocol to hide the fact that there is more than one type of payment preview.

206. By Manuel de la Peña on 2012-12-07

Updated symbols.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:206
http://s-jenkins:8080/job/libunity-ci/16/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/16/console
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/16/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/16//rebuild/?

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Looking good, but pls add a few more checks in the test_preview_*_payment (mostly that the serialization and deserialization works).

[lp:~mandel/libunity/libunity-add-music-payment]

207. By Manuel de la Peña on 2012-12-10

Made changes in tests so that we test serialize and deserialize in all the diff payment preview types.

208. By Manuel de la Peña on 2012-12-10

Assert that the default type is music.

209. By Manuel de la Peña on 2012-12-10

Use the property to set the preview type and assert that everything works.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:207
http://s-jenkins:8080/job/libunity-ci/17/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/17/console
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/17/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/17//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:209
http://s-jenkins:8080/job/libunity-ci/18/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/18/console
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/18/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/18//rebuild/?

review: Needs Fixing (continuous-integration)

[lp:~mandel/libunity/libunity-add-music-payment]

210. By Manuel de la Peña on 2012-12-10

Ignore tests in translations.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:210
http://s-jenkins:8080/job/libunity-ci/19/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/19/console
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/19/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/19//rebuild/?

review: Approve (continuous-integration)

[lp:~mandel/libunity/libunity-add-music-payment]

211. By Manuel de la Peña on 2012-12-10

Change the renderer name to payment preview.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:211
http://s-jenkins:8080/job/libunity-ci/20/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/20/console
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/20/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/20//rebuild/?

review: Approve (continuous-integration)

[lp:~mandel/libunity/libunity-add-music-payment]

212. By Manuel de la Peña on 2012-12-11

Do not hardcode symbols version.

[Michal Hruby (mhr3)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:212
http://s-jenkins:8080/job/libunity-ci/21/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/21/console
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/21/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/21//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/libunity-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/22/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/libunity-ci/22//rebuild/?

review: Approve (continuous-integration)

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2012-12-05 09:26:30 +0000
+++ debian/libunity9.symbols	2012-12-11 11:21:24 +0000
@@ -399,6 +399,30 @@
  unity_options_filter_sort_type_get_type@Base 4.0.4
  unity_param_spec_string_array_wrapper@Base 3.4.6
  unity_param_spec_tools@Base 4.0.0
+ unity_payment_preview_construct@Base 0replaceme 
+ unity_payment_preview_construct_for_application@Base 0replaceme 
+ unity_payment_preview_construct_for_error@Base 0replaceme 
+ unity_payment_preview_construct_for_music@Base 0replaceme 
+ unity_payment_preview_construct_for_type@Base 0replaceme 
+ unity_payment_preview_get_email@Base 0replaceme 
+ unity_payment_preview_get_header@Base 0replaceme 
+ unity_payment_preview_get_payment_method@Base 0replaceme 
+ unity_payment_preview_get_preview_type@Base 0replaceme 
+ unity_payment_preview_get_purchase_prize@Base 0replaceme 
+ unity_payment_preview_get_purchase_type@Base 0replaceme 
+ unity_payment_preview_get_type@Base 0replaceme 
+ unity_payment_preview_new@Base 0replaceme 
+ unity_payment_preview_new_for_application@Base 0replaceme 
+ unity_payment_preview_new_for_error@Base 0replaceme 
+ unity_payment_preview_new_for_music@Base 0replaceme 
+ unity_payment_preview_new_for_type@Base 0replaceme 
+ unity_payment_preview_set_email@Base 0replaceme 
+ unity_payment_preview_set_header@Base 0replaceme 
+ unity_payment_preview_set_payment_method@Base 0replaceme 
+ unity_payment_preview_set_preview_type@Base 0replaceme 
+ unity_payment_preview_set_purchase_prize@Base 0replaceme 
+ unity_payment_preview_set_purchase_type@Base 0replaceme 
+ unity_payment_preview_type_get_type@Base 0replaceme 
  unity_playback_state_get_type@Base 4.0.0
  unity_playlist_construct@Base 4.0.0
  unity_playlist_details_copy@Base 4.0.0

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2012-09-26 07:34:03 +0000
+++ po/POTFILES.skip	2012-12-11 11:21:24 +0000
@@ -1,1 +1,2 @@
 tools/unity-tool.c
+test/vala/test-previews.c

=== modified file 'protocol/protocol-previews.vala'
--- protocol/protocol-previews.vala	2012-10-01 14:25:07 +0000
+++ protocol/protocol-previews.vala	2012-12-11 11:21:24 +0000
@@ -46,7 +46,7 @@
   {
     hints = new HashTable<string, Variant> (str_hash, str_equal);
   }
-  
+
   public static PreviewRaw? from_variant (Variant v)
   {
     return (PreviewRaw) v;
@@ -278,6 +278,7 @@
     typeof (GenericPreview).class_ref ();
     typeof (ApplicationPreview).class_ref ();
     typeof (MusicPreview).class_ref ();
+    typeof (PaymentPreview).class_ref ();
     typeof (MoviePreview).class_ref ();
     typeof (SocialPreview).class_ref ();
     typeof (SeriesPreview).class_ref ();
@@ -304,6 +305,9 @@
       case MusicPreview.RENDERER_NAME:
         result_obj = Dee.Serializable.parse (data, typeof (MusicPreview));
         break;
+      case PaymentPreview.RENDERER_NAME:
+        result_obj = Dee.Serializable.parse (data, typeof (PaymentPreview));
+        break;
       case MoviePreview.RENDERER_NAME:
         result_obj = Dee.Serializable.parse (data, typeof (MoviePreview));
         break;
@@ -529,6 +533,90 @@
   }
 }
 
+public enum PreviewPaymentType {
+  APPLICATION,
+  MUSIC,
+  ERROR,
+}
+
+public class PaymentPreview : Preview
+{
+  internal const string RENDERER_NAME = "preview-payment";
+
+  public string header { get; set; }
+  public string email { get; set; }
+  public string payment_method { get; set; }
+  public string purchase_prize { get; set; }
+  public string purchase_type { get; set; }
+  public PreviewPaymentType preview_type { get; set; default = PreviewPaymentType.MUSIC; }
+
+  public PaymentPreview ()
+  {
+    Object ();
+  }
+
+  internal override unowned string get_renderer_name ()
+  {
+    return RENDERER_NAME;
+  }
+
+  internal override void add_properties (HashTable<string, Variant> properties)
+  {
+    base.add_properties (properties);
+
+    if (header != null)
+      properties["header"] = header;
+
+    if (email != null)
+      properties["email"] = email;
+
+    if (payment_method != null)
+      properties["payment-method"] = payment_method;
+
+    if (purchase_prize != null)
+      properties["purchase-prize"] = purchase_prize;
+
+    if (purchase_type != null)
+      properties["purchase-type"] = purchase_type;
+
+    properties["preview-type"] = preview_type;
+  }
+
+  static construct
+  {
+    Dee.Serializable.register_parser (typeof (PaymentPreview),
+                                      new VariantType (PreviewRaw.SIGNATURE),
+                                      (data) =>
+    {
+      unowned string renderer = data.get_child_value (0).get_string ();
+      warn_if_fail (renderer == RENDERER_NAME);
+
+      HashTable<string, Variant> properties;
+      PaymentPreview result = Preview.deserialize<PaymentPreview> (
+        data, out properties);
+
+      Preview.checked_set (properties["title"],
+        (v) => { result.title = v.get_string (); });
+      Preview.checked_set (properties["subtitle"],
+        (v) => { result.subtitle = v.get_string (); });
+      Preview.checked_set (properties["header"],
+        (v) => { result.header = v.get_string (); });
+      Preview.checked_set (properties["email"],
+        (v) => { result.email = v.get_string (); });
+      Preview.checked_set (properties["payment-method"],
+        (v) => { result.payment_method = v.get_string (); });
+      Preview.checked_set (properties["purchase-prize"],
+        (v) => { result.purchase_prize = v.get_string (); });
+      Preview.checked_set (properties["purchase-type"],
+        (v) => { result.purchase_type = v.get_string (); });
+      Preview.checked_set (properties["preview-type"],
+        (v) => { result.preview_type = (PreviewPaymentType) v.get_int32 (); });
+
+      return result;
+    });
+  }
+}
+
 public class MoviePreview : Preview
 {
   internal const string RENDERER_NAME = "preview-movie";

=== modified file 'src/unity-previews.vala'
--- src/unity-previews.vala	2012-10-05 15:15:54 +0000
+++ src/unity-previews.vala	2012-12-11 11:21:24 +0000
@@ -467,6 +467,100 @@
 }
 
 
+public class PaymentPreview : Preview
+{
+  public enum Type {
+    APPLICATION,
+    MUSIC,
+    ERROR
+  }
+
+  public string header
+  {
+    get { return _raw.header; }
+    set { _raw.header = value;}
+  }
+
+  public string email
+  {
+    get { return _raw.email; }
+    set { _raw.email = value; }
+  }
+
+  public string payment_method
+  {
+    get { return _raw.payment_method; }
+    set { _raw.payment_method = value; }
+  }
+
+  public string purchase_prize
+  {
+    get { return _raw.purchase_prize; }
+    set { _raw.purchase_prize = value; }
+  }
+
+  public string purchase_type
+  {
+    get { return _raw.purchase_type; }
+    set { _raw.purchase_type = value; }
+  }
+
+  public Type preview_type
+  {
+    get { return (Type) _raw.preview_type; }
+    set { _raw.preview_type = (Unity.Protocol.PreviewPaymentType) value; }
+  }
+
+  public PaymentPreview (string title, string subtitle, Icon? image)
+  {
+    Object (title: title, subtitle: subtitle, image: image);
+  }
+
+  public PaymentPreview.for_type (string title, string subtitle, Icon? image,
+    Type type)
+  {
+    this (title, subtitle, image);
+    preview_type = type;
+  }
+
+  public PaymentPreview.for_application (string title, string subtitle,
+    Icon? image)
+  {
+    this.for_type (title, subtitle, image, Type.APPLICATION);
+  }
+
+  public PaymentPreview.for_music (string title, string subtitle, Icon? image)
+  {
+    this.for_type (title, subtitle, image, Type.MUSIC);
+  }
+
+  public PaymentPreview.for_error (string title, string subtitle, Icon? image)
+  {
+    this.for_type (title, subtitle, image, Type.ERROR);
+  }
+
+  static construct
+  {
+    // perform assertion so that we do not have bad castings if
+    // someone forgot to keep the enums synced
+    static_assert ((int) Protocol.PreviewPaymentType.APPLICATION ==
+                   (int) Type.APPLICATION);
+    static_assert ((int) Protocol.PreviewPaymentType.MUSIC ==
+                   (int) Type.MUSIC);
+    static_assert ((int) Protocol.PreviewPaymentType.ERROR ==
+                   (int) Type.ERROR);
+  }
+
+  private unowned Protocol.PaymentPreview _raw;
+  internal override Object create_raw ()
+  {
+    var raw = new Protocol.PaymentPreview ();
+    _raw = raw;
+    return _raw;
+  }
+}
+
+
 public class MoviePreview : Preview
 {
   public string year
@@ -497,6 +591,7 @@
   }
 }
 
+
 public class SocialPreview : Preview
 {
   public class Comment : InitiallyUnowned

=== modified file 'test/vala/test-previews.vala'
--- test/vala/test-previews.vala	2012-09-24 13:53:47 +0000
+++ test/vala/test-previews.vala	2012-12-11 11:21:24 +0000
@@ -39,6 +39,14 @@
                                test_preview_social);
       GLib.Test.add_data_func ("/Unit/Preview/MusicPreview",
                                test_preview_music);
+      GLib.Test.add_data_func ("/Unit/Preview/PaymentPreview",
+                               test_preview_payment);
+      GLib.Test.add_data_func ("/Unit/Preview/MusicPaymentPreview",
+                               test_preview_music_payment);
+      GLib.Test.add_data_func ("/Unit/Preview/ApplicationPaymentPreview",
+                               test_preview_app_payment);
+      GLib.Test.add_data_func ("/Unit/Preview/ErrorPaymentPreview",
+                               test_preview_error_payment);
       GLib.Test.add_data_func ("/Unit/Preview/MusicPreview/WithTracks",
                                test_preview_music_with_tracks);
       GLib.Test.add_data_func ("/Unit/Preview/MoviePreview",
@@ -290,6 +298,118 @@
       assert (previews_equal (data, reconstructed.serialize ()));
     }
 
+    delegate PaymentPreview PreviewConstructor (string title, string subtitle,
+      FileIcon icon);
+
+    static void assert_payment_deserialization(PreviewConstructor constructor,
+      string artwork_path)
+    {
+      var artwork = new FileIcon (File.new_for_path (artwork_path));
+      var preview = constructor ("Beatles", "Help", artwork);
+
+      // set the diff data for the preview
+      preview.header = "Hi %s, you purchased in the past from Ubuntu One,"
+      + " would you like to use the same payment details?"
+      + " Please review your order.";
+      preview.email = "[e-mail]";
+      preview.payment_method = "****** ** *** ***34";
+      preview.purchase_prize = "2 eur";
+      preview.purchase_type = "Digital CD";
+
+      // check if serialization works properly
+      var data = preview.serialize ();
+      var reconstructed =
+        Protocol.Preview.parse (data) as Protocol.PaymentPreview;
+
+      assert (preview.title == reconstructed.title);
+      assert (preview.subtitle == reconstructed.subtitle);
+      assert (preview.header == reconstructed.header);
+      assert (preview.email == reconstructed.email);
+      assert (preview.payment_method == reconstructed.payment_method);
+      assert (preview.purchase_prize == reconstructed.purchase_prize);
+      assert (preview.purchase_type == reconstructed.purchase_type);
+      assert ((int) preview.preview_type == (int) reconstructed.preview_type);
+      assert (preview.image.equal (reconstructed.image));
+      assert (artwork.equal (reconstructed.image));
+
+      assert (previews_equal (data, reconstructed.serialize ()));
+    }
+
+    static void test_preview_payment ()
+    {
+      assert_payment_deserialization (
+        (title, subtitle, artwork) => {
+          var preview = new PaymentPreview (title, subtitle, artwork);
+          assert (preview.preview_type == PaymentPreview.Type.MUSIC);
+          return preview;
+        },
+        "/usr/share/icons/beatles.jpg");
+    }
+
+    static void test_preview_music_payment ()
+    {
+      assert_payment_deserialization (
+        (title, subtitle, artwork) => {
+          var preview = new PaymentPreview.for_music (title, subtitle, artwork);
+          assert (preview.preview_type == PaymentPreview.Type.MUSIC);
+          return preview;
+        },
+        "/usr/share/icons/beatles.jpg");
+
+      // same assert but using the property
+      assert_payment_deserialization (
+        (title, subtitle, artwork) => {
+          var preview = new PaymentPreview (title, subtitle, artwork);
+          preview.preview_type = PaymentPreview.Type.MUSIC;
+          assert (preview.preview_type == PaymentPreview.Type.MUSIC);
+          return preview;
+        },
+        "/usr/share/icons/beatles.jpg");
+    }
+
+    static void test_preview_app_payment ()
+    {
+      assert_payment_deserialization (
+        (title, subtitle, artwork) => {
+          var preview = new PaymentPreview.for_application (title, subtitle,
+                          artwork);
+          assert (preview.preview_type == PaymentPreview.Type.APPLICATION);
+          return preview;
+        },
+        "/usr/share/icons/beatles.jpg");
+
+      // same assert but using the property
+      assert_payment_deserialization (
+        (title, subtitle, artwork) => {
+          var preview = new PaymentPreview (title, subtitle, artwork);
+          preview.preview_type = PaymentPreview.Type.APPLICATION;
+          assert (preview.preview_type == PaymentPreview.Type.APPLICATION);
+          return preview;
+        },
+        "/usr/share/icons/beatles.jpg");
+    }
+
+    static void test_preview_error_payment ()
+    {
+      assert_payment_deserialization (
+        (title, subtitle, artwork) => {
+          var preview = new PaymentPreview.for_error (title, subtitle, artwork);
+          assert (preview.preview_type == PaymentPreview.Type.ERROR);
+          return preview;
+        },
+        "/usr/share/icons/beatles.jpg");
+
+      // same assert but using the property
+      assert_payment_deserialization (
+        (title, subtitle, artwork) => {
+          var preview = new PaymentPreview (title, subtitle, artwork);
+          preview.preview_type = PaymentPreview.Type.ERROR;
+          assert (preview.preview_type == PaymentPreview.Type.ERROR);
+          return preview;
+        },
+        "/usr/share/icons/beatles.jpg");
+    }
+
     static void test_preview_movie ()
     {
       var artwork = new FileIcon (File.new_for_path ("/usr/share/icons/my_favourite_movie.png"));