Merge lp:~dobey/unity-scope-click/working-tests into lp:unity-scope-click

[dobey]

Get rid of tests that depend too heavily on external processes or data.

To test this:

sudo apt-get build-dep unity-scope-click
./autogen.sh
make
./src/click-scope-tests

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

[lp:~dobey/unity-scope-click/working-tests]

82. By dobey on 2013-12-04

Handle get_dotdesktop possibly returning null in the actual scope.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/working-tests]

83. By dobey on 2013-12-04

Revert the changes to get_dotdesktop and just delete that test for now too.

[Mike McCracken (mikemc)]

works for me

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

+1

review: Approve

=== modified file 'src/test-click-webservice.vala'
--- src/test-click-webservice.vala	2013-10-02 23:22:44 +0000
+++ src/test-click-webservice.vala	2013-12-04 13:32:30 +0000
@@ -92,70 +92,6 @@
         }
     }
 
-    public static void test_download_manager ()
-    {
-        HashTable<string, string> credentials = new HashTable<string, string> (str_hash, str_equal);
-        credentials["consumer_key"] = "...";
-        credentials["consumer_secret"] = "...";
-        credentials["token"] = "...";
-        credentials["token_secret"] = "...";
-
-        var sd = new SignedDownload (credentials);
-        var url = "http://alecu.com.ar/test/click/demo.php";
-        var app_id = "org.example.fake.app";
-
-        Download download = null;
-
-
-        MainLoop mainloop = new MainLoop ();
-        sd.start_download.begin(url, app_id, (obj, res) => {
-            try {
-                var download_object_path = sd.start_download.end (res);
-                debug ("download created for %s", url);
-                download = get_download (download_object_path);
-
-                download.started.connect( (success) => {
-                    debug ("Download started");
-                });
-                download.finished.connect( (error) => {
-                    debug ("Download finished");
-                    mainloop.quit ();
-                });
-                download.error.connect( (error) => {
-                    debug ("Download errored");
-                    mainloop.quit ();
-                });
-                download.progress.connect( (received, total) => {
-                    debug ("Download progressing: %llu/%llu", received, total);
-                });
-                debug ("Download starting");
-                download.start ();
-            } catch (GLib.Error e) {
-                error ("Can't start download: %s", e.message);
-            }
-        });
-        assert (run_with_timeout (mainloop, 60000));
-
-        debug ("actually starting download");
-    }
-
-    public static void test_fetch_credentials ()
-    {
-        MainLoop mainloop = new MainLoop ();
-        var u1creds = new UbuntuoneCredentials ();
-
-        u1creds.get_credentials.begin((obj, res) => {
-            mainloop.quit ();
-            try {
-                var creds = u1creds.get_credentials.end (res);
-                debug ("token: %s", creds["token"]);
-            } catch (GLib.Error e) {
-                error ("Can't fetch credentials: %s", e.message);
-            }
-        });
-        assert (run_with_timeout (mainloop, 10000));
-    }
-
     public static void test_click_interface ()
     {
         MainLoop mainloop = new MainLoop ();
@@ -165,7 +101,6 @@
             mainloop.quit ();
             try {
                 var installed = click_if.get_installed.end (res);
-                debug ("first installed: %s", installed[0].title);
             } catch (GLib.Error e) {
                 error ("Can't get list of installed click packages %s", e.message);
             }
@@ -213,23 +148,6 @@
         assert_cmpstr (versions["com.ubuntu.developer.pedrocan.evilapp"], OperatorType.EQUAL, "0.4");
     }
 
-    public static void test_click_get_dotdesktop ()
-    {
-        MainLoop mainloop = new MainLoop ();
-        var click_if = new ClickInterface ();
-
-        click_if.get_dotdesktop.begin("com.ubuntu.ubuntu-weather", (obj, res) => {
-            mainloop.quit ();
-            try {
-                var dotdesktop = click_if.get_dotdesktop.end (res);
-                debug ("got dotdesktop: %s", dotdesktop);
-            } catch (GLib.Error e) {
-                error ("Can't get dotdesktop: %s", e.message);
-            }
-        });
-        assert (run_with_timeout (mainloop, 10000));
-    }
-
     public static void test_available_apps ()
     {
         MainLoop mainloop = new MainLoop ();
@@ -247,38 +165,17 @@
         assert (run_with_timeout (mainloop, 10000));
     }
 
-    public static void test_app_details ()
-    {
-        MainLoop mainloop = new MainLoop ();
-        var click_ws = new ClickWebservice ();
-
-        click_ws.get_details.begin("org.example.full_app", (obj, res) => {
-            mainloop.quit ();
-            try {
-                var app_details = click_ws.get_details.end (res);
-                debug ("download_url: %s", app_details.download_url);
-            } catch (GLib.Error e) {
-                error ("Can't get details for a click package: %s", e.message);
-            }
-        });
-        assert (run_with_timeout (mainloop, 10000));
-    }
-
     public static int main (string[] args)
     {
         Test.init (ref args);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Architecture", test_click_architecture);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Get_Versions", test_click_get_versions);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Interface", test_click_interface);
-        Test.add_data_func ("/Unit/ClickChecker/Test_Click_Get_DotDesktop", test_click_get_dotdesktop);
         Test.add_data_func ("/Unit/ClickChecker/Test_Parse_Search_Result", test_parse_search_result);
         Test.add_data_func ("/Unit/ClickChecker/Test_Parse_Search_Result_Item", test_parse_search_result_item);
         Test.add_data_func ("/Unit/ClickChecker/Test_Parse_App_Details", test_parse_app_details);
         Test.add_data_func ("/Unit/ClickChecker/Test_Parse_Skinny_Details", test_parse_skinny_details);
-        Test.add_data_func ("/Unit/ClickChecker/Test_Download_Manager", test_download_manager);
-        Test.add_data_func ("/Unit/ClickChecker/Test_Fetch_Credentials", test_fetch_credentials);
         Test.add_data_func ("/Unit/ClickChecker/Test_Available_Apps", test_available_apps);
-        Test.add_data_func ("/Unit/ClickChecker/Test_App_Details", test_app_details);
         return Test.run ();
     }
 }