about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/test_contact.c90
-rw-r--r--tests/test_server_events.c12
2 files changed, 51 insertions, 51 deletions
diff --git a/tests/test_contact.c b/tests/test_contact.c
index 88dd63c2..cad88907 100644
--- a/tests/test_contact.c
+++ b/tests/test_contact.c
@@ -118,11 +118,11 @@ void contact_presence_uses_highest_priority(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
         "is offline", FALSE);
 
-    Resource *resource10 = resource_new("resource10", RESOURCE_ONLINE, NULL, 10, NULL);
-    Resource *resource20 = resource_new("resource20", RESOURCE_CHAT, NULL, 20, NULL);
-    Resource *resource30 = resource_new("resource30", RESOURCE_AWAY, NULL, 30, NULL);
-    Resource *resource1 = resource_new("resource1", RESOURCE_XA, NULL, 1, NULL);
-    Resource *resource2 = resource_new("resource2", RESOURCE_DND, NULL, 2, NULL);
+    Resource *resource10 = resource_new("resource10", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource20 = resource_new("resource20", RESOURCE_CHAT, NULL, 20);
+    Resource *resource30 = resource_new("resource30", RESOURCE_AWAY, NULL, 30);
+    Resource *resource1 = resource_new("resource1", RESOURCE_XA, NULL, 1);
+    Resource *resource2 = resource_new("resource2", RESOURCE_DND, NULL, 2);
     p_contact_set_presence(contact, resource10);
     p_contact_set_presence(contact, resource20);
     p_contact_set_presence(contact, resource30);
@@ -141,11 +141,11 @@ void contact_presence_chat_when_same_prioroty(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
         "is offline", FALSE);
 
-    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10, NULL);
-    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10, NULL);
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_online);
     p_contact_set_presence(contact, resource_chat);
     p_contact_set_presence(contact, resource_away);
@@ -164,10 +164,10 @@ void contact_presence_online_when_same_prioroty(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
         "is offline", FALSE);
 
-    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10, NULL);
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_online);
     p_contact_set_presence(contact, resource_away);
     p_contact_set_presence(contact, resource_xa);
@@ -185,9 +185,9 @@ void contact_presence_away_when_same_prioroty(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
         "is offline", FALSE);
 
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_away);
     p_contact_set_presence(contact, resource_xa);
     p_contact_set_presence(contact, resource_dnd);
@@ -204,8 +204,8 @@ void contact_presence_xa_when_same_prioroty(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
         "is offline", FALSE);
 
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_xa);
     p_contact_set_presence(contact, resource_dnd);
 
@@ -221,7 +221,7 @@ void contact_presence_dnd(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
         "is offline", FALSE);
 
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_dnd);
 
     const char *presence = p_contact_presence(contact);
@@ -296,11 +296,11 @@ void contact_not_available_when_highest_priority_away(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
         "is offline", FALSE);
 
-    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10, NULL);
-    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10, NULL);
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 20, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 20);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_online);
     p_contact_set_presence(contact, resource_chat);
     p_contact_set_presence(contact, resource_away);
@@ -319,11 +319,11 @@ void contact_not_available_when_highest_priority_xa(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
         "is offline", FALSE);
 
-    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10, NULL);
-    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10, NULL);
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 20, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 20);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_online);
     p_contact_set_presence(contact, resource_chat);
     p_contact_set_presence(contact, resource_away);
@@ -342,11 +342,11 @@ void contact_not_available_when_highest_priority_dnd(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
         "is offline", FALSE);
 
-    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10, NULL);
-    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10, NULL);
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 20, NULL);
+    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 20);
     p_contact_set_presence(contact, resource_online);
     p_contact_set_presence(contact, resource_chat);
     p_contact_set_presence(contact, resource_away);
@@ -365,11 +365,11 @@ void contact_available_when_highest_priority_online(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
         "is offline", FALSE);
 
-    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 20, NULL);
-    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10, NULL);
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 20);
+    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_online);
     p_contact_set_presence(contact, resource_chat);
     p_contact_set_presence(contact, resource_away);
@@ -388,11 +388,11 @@ void contact_available_when_highest_priority_chat(void **state)
     PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
         "is offline", FALSE);
 
-    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10, NULL);
-    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 20, NULL);
-    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10, NULL);
-    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10, NULL);
-    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10, NULL);
+    Resource *resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 20);
+    Resource *resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
+    Resource *resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
+    Resource *resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
     p_contact_set_presence(contact, resource_online);
     p_contact_set_presence(contact, resource_chat);
     p_contact_set_presence(contact, resource_away);
diff --git a/tests/test_server_events.c b/tests/test_server_events.c
index 3296856c..cb8cd21e 100644
--- a/tests/test_server_events.c
+++ b/tests/test_server_events.c
@@ -21,7 +21,7 @@ void console_doesnt_show_online_presence_when_set_none(void **state)
     prefs_set_string(PREF_STATUSES_CONSOLE, "none");
     roster_init();
     roster_add("test1@server", "bob", NULL, "both", FALSE);
-    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10, "caps");
+    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
 
     handle_contact_online("test1@server", resource, NULL);
 
@@ -35,7 +35,7 @@ void console_shows_online_presence_when_set_online(void **state)
     prefs_set_string(PREF_STATUSES_CONSOLE, "online");
     roster_init();
     roster_add("test1@server", "bob", NULL, "both", FALSE);
-    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10, "caps");
+    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
     PContact contact = roster_get_contact("test1@server");
 
     expect_cons_show_contact_online(contact, resource, NULL);
@@ -52,7 +52,7 @@ void console_shows_online_presence_when_set_all(void **state)
     prefs_set_string(PREF_STATUSES_CONSOLE, "all");
     roster_init();
     roster_add("test1@server", "bob", NULL, "both", FALSE);
-    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10, "caps");
+    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
     PContact contact = roster_get_contact("test1@server");
 
     expect_cons_show_contact_online(contact, resource, NULL);
@@ -69,7 +69,7 @@ void console_doesnt_show_dnd_presence_when_set_none(void **state)
     prefs_set_string(PREF_STATUSES_CONSOLE, "none");
     roster_init();
     roster_add("test1@server", "bob", NULL, "both", FALSE);
-    Resource *resource = resource_new("resource", RESOURCE_DND, NULL, 10, "caps");
+    Resource *resource = resource_new("resource", RESOURCE_DND, NULL, 10);
 
     handle_contact_online("test1@server", resource, NULL);
 
@@ -83,7 +83,7 @@ void console_doesnt_show_dnd_presence_when_set_online(void **state)
     prefs_set_string(PREF_STATUSES_CONSOLE, "online");
     roster_init();
     roster_add("test1@server", "bob", NULL, "both", FALSE);
-    Resource *resource = resource_new("resource", RESOURCE_DND, NULL, 10, "caps");
+    Resource *resource = resource_new("resource", RESOURCE_DND, NULL, 10);
 
     handle_contact_online("test1@server", resource, NULL);
 
@@ -97,7 +97,7 @@ void console_shows_dnd_presence_when_set_all(void **state)
     prefs_set_string(PREF_STATUSES_CONSOLE, "all");
     roster_init();
     roster_add("test1@server", "bob", NULL, "both", FALSE);
-    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10, "caps");
+    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
     PContact contact = roster_get_contact("test1@server");
 
     expect_cons_show_contact_online(contact, resource, NULL);
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-06-26 20:42:03 +0000