Merge lp:~dobey/unity-scope-click/fix-ppa-build into lp:unity-scope-click

[dobey]

Use a fake RNRClient to override network access in unit tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/70

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

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2014-01-13 22:24:22 +0000
+++ src/click-scope.vala	2014-01-17 18:51:50 +0000
@@ -1,5 +1,6 @@
+/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -84,7 +85,7 @@
   public ClickInterface click_if = new ClickInterface ();
   public UbuntuoneCredentials u1creds = new UbuntuoneCredentials ();
   public ClickWebservice webservice = new ClickWebservice ();
-  RNRClient rnrClient = new RNRClient();
+  public RNRClient rnrClient = new RNRClient();
 
   public ClickScope ()
   {

=== modified file 'src/rnrclient.vala'
--- src/rnrclient.vala	2014-01-09 13:53:51 +0000
+++ src/rnrclient.vala	2014-01-17 18:51:50 +0000
@@ -90,7 +90,7 @@
      * Returns: A Variant (list of dictionary) that containts the reviews.
      *
      */
-    public async Variant? get_reviews_by_filter(ReviewFilter filter) {
+    public virtual async Variant? get_reviews_by_filter(ReviewFilter filter) {
         Variant? ret = null;
         WebserviceError failure = null;
 
@@ -110,6 +110,7 @@
                                              filter.packagename);
         string response="";
 
+        debug ("Getting reviews from URL: %s", url);
         var message = new Soup.Message ("GET", url);
         http_session.queue_message(message, (http_session, message) => {
             if (message.status_code != Soup.KnownStatusCode.OK) {

=== modified file 'src/test-click-webservice.vala'
--- src/test-click-webservice.vala	2014-01-13 22:24:22 +0000
+++ src/test-click-webservice.vala	2014-01-17 18:51:50 +0000
@@ -1,5 +1,6 @@
+/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -184,6 +185,18 @@
         }
     }
 
+    class FakeRNRClient : RNRClient {
+        public override async Variant? get_reviews_by_filter (ReviewFilter filter) {
+            var parser = new Json.Parser ();
+            try {
+                parser.load_from_data (FAKE_RNR_REVIEW_RESULTS);
+            } catch (GLib.Error e) {
+                error ("Failed to parse RNR JSON: %s", e.message);
+            }
+            return convertJSONtoVariant (parser);
+        }
+    }
+
     class FakeSignedDownloadOK : SignedDownload {
         public async override new GLib.ObjectPath start_download (string uri, string app_id) throws DownloadError {
             return new GLib.ObjectPath (FAKE_OBJECT_PATH);
@@ -404,6 +417,7 @@
         MainLoop mainloop = new MainLoop ();
         ClickScope scope = new ClickScope ();
         scope.webservice = new FakeClickWebservice ();
+        scope.rnrClient = new FakeRNRClient ();
         var metadata = new HashTable<string, Variant> (str_hash, str_equal);
         metadata.insert(METADATA_APP_ID, new GLib.Variant.string(FAKE_APP_ID));
         var fake_result = Unity.ScopeResult.create("", "", 0,
@@ -445,6 +459,7 @@
         MainLoop mainloop = new MainLoop ();
         ClickScope scope = new ClickScope ();
         scope.webservice = new FakeClickWebservice ();
+        scope.rnrClient = new FakeRNRClient ();
         scope.click_if = new FakeClickInterface ();
         ((FakeClickInterface) scope.click_if).fake_can_uninstall = can_uninstall;