diff options
| -rw-r--r-- | tests/dbus-interface.c | 28 | ||||
| -rw-r--r-- | tests/server-test.c | 2 | ||||
| -rwxr-xr-x | tests/slmock | 14 |
3 files changed, 22 insertions, 22 deletions
diff --git a/tests/dbus-interface.c b/tests/dbus-interface.c index 560a971..3156404 100644 --- a/tests/dbus-interface.c +++ b/tests/dbus-interface.c @@ -30,33 +30,33 @@ slmock_server_t citrix_server_table[] = { {NULL, NULL, NULL} }; -slmock_server_t freerdp_server_table[] = { - {"FreeRDP US", "23.21.151.133", "freerdp", TRUE, "Administrator", "", ""}, - {"FreeRDP Asia", "46.137.222.181", "freerdp", FALSE, "Administrator", "", ""}, - {"FreeRDP UK", "46.137.189.194", "freerdp", FALSE, "Administrator", "", ""}, +slmock_server_t freerdp2_server_table[] = { + {"FreeRDP US", "23.21.151.133", "freerdp2", TRUE, "Administrator", "", ""}, + {"FreeRDP Asia", "46.137.222.181", "freerdp2", FALSE, "Administrator", "", ""}, + {"FreeRDP UK", "46.137.189.194", "freerdp2", FALSE, "Administrator", "", ""}, {NULL, NULL, NULL} }; -slmock_server_t freerdp_server_table_after_set_last_used[] = { - {"FreeRDP US", "23.21.151.133", "freerdp", FALSE, "Administrator", "", ""}, - {"FreeRDP Asia", "46.137.222.181", "freerdp", TRUE, "Administrator", "", ""}, - {"FreeRDP UK", "46.137.189.194", "freerdp", FALSE, "Administrator", "", ""}, +slmock_server_t freerdp2_server_table_after_set_last_used[] = { + {"FreeRDP US", "23.21.151.133", "freerdp2", FALSE, "Administrator", "", ""}, + {"FreeRDP Asia", "46.137.222.181", "freerdp2", TRUE, "Administrator", "", ""}, + {"FreeRDP UK", "46.137.189.194", "freerdp2", FALSE, "Administrator", "", ""}, {NULL, NULL, NULL} }; slmock_server_t big_server_table[] = { {"XenServer", "107.21.17.35", "ica", FALSE, "", "", "ASIA"}, {"Citrix2", "http://1.2.3.4", "ica", FALSE, "fakeuser", "fakepassword", "DOMAIN1"}, - {"Accenture", "10.21.17.35", "freerdp", FALSE, "fakeuser", "", "EUROPE"}, - {"Accenture 2", "https://4.5.6.7", "freerdp", TRUE, "", "", "domain2"}, + {"Accenture", "10.21.17.35", "freerdp2", FALSE, "fakeuser", "", "EUROPE"}, + {"Accenture 2", "https://4.5.6.7", "freerdp2", TRUE, "", "", "domain2"}, {NULL, NULL, NULL} }; slmock_table_t slmock_table[] = { {"c", "c", citrix_server_table}, - {"f", "f", freerdp_server_table}, + {"f", "f", freerdp2_server_table}, {"b", "b", big_server_table}, - {"f", "f", freerdp_server_table_after_set_last_used} + {"f", "f", freerdp2_server_table_after_set_last_used} }; static gboolean @@ -524,7 +524,7 @@ test_setlastused_basic (void) "/org/ArcticaProject/RemoteLogon", "org.ArcticaProject.RemoteLogon", "SetLastUsedServer", - g_variant_new("(ss)", "Landscape", freerdp_server_table[1].uri), /* params */ + g_variant_new("(ss)", "Landscape", freerdp2_server_table[1].uri), /* params */ NULL, /* ret type */ G_DBUS_CALL_FLAGS_NONE, -1, @@ -558,7 +558,7 @@ test_dbus_suite (void) g_test_add_func ("/dbus/interface/GetServers/None", test_getservers_none); g_test_add_func ("/dbus/interface/GetServers/UCCS", test_getservers_uccs); g_test_add_data_func ("/dbus/interface/GetServers/SLMock/citrix", &slmock_table[0], test_getservers_slmock); - g_test_add_data_func ("/dbus/interface/GetServers/SLMock/freerdp", &slmock_table[1], test_getservers_slmock); + g_test_add_data_func ("/dbus/interface/GetServers/SLMock/freerdp2", &slmock_table[1], test_getservers_slmock); g_test_add_data_func ("/dbus/interface/GetServers/SLMock/big", &slmock_table[2], test_getservers_slmock); g_test_add_func ("/dbus/interface/GetServers/SLMock/none", test_getservers_slmock_none); g_test_add_func ("/dbus/interface/GetServers/SLMock/two", test_getservers_slmock_two); diff --git a/tests/server-test.c b/tests/server-test.c index f5e50c7..9b55246 100644 --- a/tests/server-test.c +++ b/tests/server-test.c @@ -124,7 +124,7 @@ struct _type_data_t { type_data_t type_data[3] = { {0, "ica", CONFIG_SERVER_TYPE_ICA}, - {0, "freerdp", CONFIG_SERVER_TYPE_RDP}, + {0, "freerdp2", CONFIG_SERVER_TYPE_RDP}, {0, "uccs", CONFIG_SERVER_TYPE_UCCS} }; diff --git a/tests/slmock b/tests/slmock index e7026f1..7b60c0e 100755 --- a/tests/slmock +++ b/tests/slmock @@ -66,13 +66,13 @@ def convert_to_builtin_type(obj): d.update(obj.__dict__) return d -def freerdp(email): +def freerdp2(email): ms = ManagementServer("http://tc.arctica-project.org", "Landscape") - ts1 = TerminalServer("23.21.151.133", "FreeRDP US", "freerdp", False, + ts1 = TerminalServer("23.21.151.133", "FreeRDP US", "freerdp2", False, "Administrator") - ts2 = TerminalServer("46.137.222.181", "FreeRDP Asia", "freerdp", False, + ts2 = TerminalServer("46.137.222.181", "FreeRDP Asia", "freerdp2", False, "Administrator") - ts3 = TerminalServer("46.137.189.194", "FreeRDP UK", "freerdp", False, + ts3 = TerminalServer("46.137.189.194", "FreeRDP UK", "freerdp2", False, "Administrator") ms.add_terminal_server(ts1) ms.add_terminal_server(ts2) @@ -176,9 +176,9 @@ def big(email): ts1 = TerminalServer("107.21.17.35", "XenServer", "ICA") ts2 = TerminalServer("http://1.2.3.4", "Citrix2", "ICA", True, "fakeuser", "fakepassword") - ts3 = TerminalServer("10.21.17.35", "Accenture", "freerdp", True, + ts3 = TerminalServer("10.21.17.35", "Accenture", "freerdp2", True, "fakeuser") - ts4 = TerminalServer("https://4.5.6.7", "Accenture 2", "freerdp", False) + ts4 = TerminalServer("https://4.5.6.7", "Accenture 2", "freerdp2", False) ts5 = TerminalServer("5.21.17.35", "VmWare Cloud", "vmware", False, "fakeuser", "fakepassword") ts6 = TerminalServer("http://8.9.10.11", "Canonicloud", "vmware", True) @@ -216,7 +216,7 @@ emailaddrs = {"b" : big, #lots of domains/servers "c" : citrix, "d" : defaults, #for easy testing of default ts "e" : error, - "f" : freerdp, + "f" : freerdp2, "x" : x2go, "g" : garbage, "m" : missing_fields, #json missing some fields |