Merge lp:~aacid/unity-greeter/remote_test_fake_rls_signals into lp:unity-greeter

[Albert Astals Cid]

Add some more tests for cases that reproduce what a r-l-s signal would call

Add some more tests for cases that reproduce what a r-l-s signal would call

[Michael Terry (mterry)]

This acts weird. I entered "password" first, acted normally. Then I went back and entered delay1, and it replaced my normal "Remote Login" with "Corporate Remote Login", which I didn't expect?

Also, the "delay" options seem to add the normal options, then wait 5 seconds, then replace them with their own? I think we don't want to add the normal options at all?

review: Needs Fixing

[Albert Astals Cid (aacid)]

Well, this is actually the expected outcome.

The remote-login-service daemon can send signals at any time saying the "Remote Login" servers changed ("delay1"), saying the available servers in a given "Remote Login" server changed ("delay2") or saying you need to re-autenticate against the current "Remote Login" server (delay3). So to exercise correctly those situations we add the normal servers and then execute the code.

For delay1 it means the "Remote Login" server we were using disappeared, so we need to clear it from the list along with the available servers in it

For delay2 it means the available servers to login changed and we need to update the list

For delay3 it means we need to reautenticate against the "Remote Login" server and thus drop the list of the servers to login since you're not allowed to see them anymore

Maybe i should have included this in the commit log :)

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-08-22 14:24:18 +0000
+++ src/user-list.vala	2012-08-23 13:55:29 +0000
@@ -367,8 +367,29 @@
                 string url = url_from_remote_loding_server_list_name (selected_entry.id);
                 if (UnityGreeter.test_mode)
                 {
-                    test_fill_remote_login_servers (out server_list);
-                    login_success = true;
+                    if (password_field.text == "password")
+                    {
+                        test_fill_remote_login_servers (out server_list);
+                        login_success = true;
+                    }
+                    else if (password_field.text == "delay1")
+                    {
+                        test_fill_remote_login_servers (out server_list);
+                        login_success = true;
+                        Timeout.add (5000, () => {test_call_set_remote_directory_servers (); return false;});
+                    }
+                    else if (password_field.text == "delay2")
+                    {
+                        test_fill_remote_login_servers (out server_list);
+                        login_success = true;
+                        Timeout.add (5000, () => {test_call_remote_login_servers_updated (); return false;});
+                    }
+                    else if (password_field.text == "delay3")
+                    {
+                        test_fill_remote_login_servers (out server_list);
+                        login_success = true;
+                        Timeout.add (5000, () => {remote_login_changed (currently_browsing_server_url, currently_browsing_server_email); return false;});
+                    }
                 }
                 else
                     yield remote_login_service.get_servers_for_login(url, email, password_field.text, true, out login_success, out dataType, out server_list);
@@ -984,6 +1005,65 @@
 
     }
 
+    private void test_call_set_remote_directory_servers ()
+    {
+        RemoteServer[] test_server_list = {};
+        RemoteServer remote_server = RemoteServer();
+        remote_server.type = "uccs";
+        remote_server.name = "Corporate Remote Login";
+        remote_server.url = "http://internalcompayserver.com";
+        remote_server.last_used_server = false;
+        remote_server.fields = {};
+        RemoteServerField field1 = RemoteServerField();
+        field1.type = "email";
+        RemoteServerField field2 = RemoteServerField();
+        field2.type = "password";
+        remote_server.fields += field1;
+        remote_server.fields += field2;
+
+        test_server_list += remote_server;
+        set_remote_directory_servers (test_server_list);
+    }
+
+    private void test_call_remote_login_servers_updated ()
+    {
+        RemoteServer[] server_list = {};
+        RemoteServer remote_server1 = RemoteServer();
+        remote_server1.type = "rdp";
+        remote_server1.name = "Cool RDP server";
+        remote_server1.url = "http://coolrdpserver.com";
+        remote_server1.last_used_server = false;
+        remote_server1.fields = {};
+        RemoteServerField field1 = RemoteServerField();
+        field1.type = "username";
+        RemoteServerField field2 = RemoteServerField();
+        field2.type = "password";
+        RemoteServerField field3 = RemoteServerField();
+        field3.type = "domain";
+        remote_server1.fields += field1;
+        remote_server1.fields += field2;
+        remote_server1.fields += field3;
+
+        RemoteServer remote_server2 = RemoteServer();
+        remote_server2.type = "rdp";
+        remote_server2.name = "MegaCool RDP server";
+        remote_server2.url = "http://megacoolrdpserver.com";
+        remote_server2.last_used_server = false;
+        remote_server2.fields = {};
+        RemoteServerField field21 = RemoteServerField();
+        field21.type = "username";
+        RemoteServerField field22 = RemoteServerField();
+        field22.type = "password";
+        remote_server2.fields += field21;
+        remote_server2.fields += field22;
+
+        server_list.resize(2);
+        server_list[0] = remote_server1;
+        server_list[1] = remote_server2;
+
+        remote_login_servers_updated (currently_browsing_server_url, currently_browsing_server_email, "", server_list);
+    }
+
     private void test_fill_remote_login_servers (out RemoteServer[] server_list)
     {
         string[] domains = {"SCANNERS", "PRINTERS", "ROUTERS"};