Skip to content

Commit e1fa5ca

Browse files
iphydfiphydf
committed
refactor: Rename Queries to Query to align with other enums.
1 parent be82a3e commit e1fa5ca

11 files changed

+118
-118
lines changed

‎auto_tests/group_general_test.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,13 @@ static void group_peer_self_join_handler(const Tox_Event_Group_Self_Join *event,
194194
ck_assert(tox_group_get_name_size(autotox->tox, groupnumber, nullptr) == GROUP_NAME_LEN);
195195
ck_assert(tox_group_get_topic_size(autotox->tox, groupnumber, nullptr) == TOPIC_LEN);
196196

197-
Tox_Err_Group_State_Queries query_err;
197+
Tox_Err_Group_State_Query query_err;
198198
tox_group_get_name(autotox->tox, groupnumber, group_name, &query_err);
199-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "%d", query_err);
199+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "%d", query_err);
200200
ck_assert(memcmp(group_name, GROUP_NAME, GROUP_NAME_LEN) == 0);
201201

202202
tox_group_get_topic(autotox->tox, groupnumber, topic, &query_err);
203-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "%d", query_err);
203+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "%d", query_err);
204204
ck_assert(memcmp(topic, TOPIC, TOPIC_LEN) == 0);
205205

206206
uint32_t peer_id = tox_group_self_get_peer_id(autotox->tox, groupnumber, nullptr);
@@ -307,10 +307,10 @@ static void group_announce_test(AutoTox *autotoxes)
307307
ck_assert(tp_err == TOX_ERR_GROUP_TOPIC_SET_OK);
308308

309309
// get the chat id of the new group.
310-
Tox_Err_Group_State_Queries err_id;
310+
Tox_Err_Group_State_Query err_id;
311311
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
312312
tox_group_get_chat_id(tox0, groupnumber, chat_id, &err_id);
313-
ck_assert(err_id == TOX_ERR_GROUP_STATE_QUERIES_OK);
313+
ck_assert(err_id == TOX_ERR_GROUP_STATE_QUERY_OK);
314314

315315
// tox1 joins it.
316316
Tox_Err_Group_Join err_join;

‎auto_tests/group_invite_test.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ static void group_invite_test(AutoTox *autotoxes)
134134

135135
iterate_all_wait(autotoxes, NUM_GROUP_TOXES, ITERATION_INTERVAL);
136136

137-
Tox_Err_Group_State_Queries id_err;
137+
Tox_Err_Group_State_Query id_err;
138138
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
139139

140140
tox_group_get_chat_id(tox0, groupnumber, chat_id, &id_err);
141-
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "%d", id_err);
141+
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERY_OK, "%d", id_err);
142142

143143
// peer 1 joins public group with no password
144144
Tox_Err_Group_Join join_err;

‎auto_tests/group_moderation_test.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -382,13 +382,13 @@ static void voice_state_message_test(AutoTox *autotox, Tox_Group_Voice_State voi
382382
static bool all_peers_got_voice_state_change(AutoTox *autotoxes, uint32_t num_toxes,
383383
Tox_Group_Voice_State expected_voice_state)
384384
{
385-
Tox_Err_Group_State_Queries query_err;
385+
Tox_Err_Group_State_Query query_err;
386386

387387
for (uint32_t i = 0; i < num_toxes; ++i) {
388388
const State *state = (State *)autotoxes[i].state;
389389

390390
Tox_Group_Voice_State voice_state = tox_group_get_voice_state(autotoxes[i].tox, state->group_number, &query_err);
391-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
391+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
392392

393393
if (voice_state != expected_voice_state) {
394394
return false;
@@ -472,11 +472,11 @@ static void group_moderation_test(AutoTox *autotoxes)
472472
ck_assert_msg(err_new == TOX_ERR_GROUP_NEW_OK, "Failed to create group. error: %d\n", err_new);
473473

474474
/* Founder gets chat ID */
475-
Tox_Err_Group_State_Queries id_err;
475+
Tox_Err_Group_State_Query id_err;
476476
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
477477
tox_group_get_chat_id(tox0, state0->group_number, chat_id, &id_err);
478478

479-
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get chat ID. error: %d", id_err);
479+
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get chat ID. error: %d", id_err);
480480

481481
fprintf(stderr, "Peers attemping to join DHT group via the chat ID\n");
482482

‎auto_tests/group_save_test.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -58,28 +58,28 @@ static void group_peer_join_handler(const Tox_Event_Group_Peer_Join *event, void
5858
*/
5959
static int has_correct_group_state(const Tox *tox, uint32_t group_number, const uint8_t *expected_chat_id)
6060
{
61-
Tox_Err_Group_State_Queries query_err;
61+
Tox_Err_Group_State_Query query_err;
6262

6363
Tox_Group_Privacy_State priv_state = tox_group_get_privacy_state(tox, group_number, &query_err);
64-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
64+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
6565

6666
if (priv_state != NEW_PRIV_STATE) {
6767
return -1;
6868
}
6969

7070
size_t pass_len = tox_group_get_password_size(tox, group_number, &query_err);
71-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
71+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
7272

7373
uint8_t password[TOX_GROUP_MAX_PASSWORD_SIZE];
7474
tox_group_get_password(tox, group_number, password, &query_err);
75-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
75+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
7676

7777
if (pass_len != PASS_LEN || memcmp(password, PASSWORD, pass_len) != 0) {
7878
return -2;
7979
}
8080

8181
size_t gname_len = tox_group_get_name_size(tox, group_number, &query_err);
82-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
82+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
8383

8484
uint8_t group_name[TOX_GROUP_MAX_GROUP_NAME_LENGTH];
8585
tox_group_get_name(tox, group_number, group_name, &query_err);
@@ -93,17 +93,17 @@ static int has_correct_group_state(const Tox *tox, uint32_t group_number, const
9393
}
9494

9595
Tox_Group_Topic_Lock topic_lock = tox_group_get_topic_lock(tox, group_number, &query_err);
96-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
96+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
9797

9898
if (topic_lock != TOX_GROUP_TOPIC_LOCK_DISABLED) {
9999
return -5;
100100
}
101101

102-
Tox_Err_Group_State_Queries id_err;
102+
Tox_Err_Group_State_Query id_err;
103103
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
104104
tox_group_get_chat_id(tox, group_number, chat_id, &id_err);
105105

106-
ck_assert(id_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
106+
ck_assert(id_err == TOX_ERR_GROUP_STATE_QUERY_OK);
107107

108108
if (memcmp(chat_id, expected_chat_id, TOX_GROUP_CHAT_ID_SIZE) != 0) {
109109
return -6;
@@ -174,9 +174,9 @@ static void group_save_test(AutoTox *autotoxes)
174174

175175
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
176176

177-
Tox_Err_Group_State_Queries id_err;
177+
Tox_Err_Group_State_Query id_err;
178178
tox_group_get_chat_id(tox0, group_number, chat_id, &id_err);
179-
ck_assert(id_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
179+
ck_assert(id_err == TOX_ERR_GROUP_STATE_QUERY_OK);
180180

181181
uint8_t founder_pk[TOX_GROUP_PEER_PUBLIC_KEY_SIZE];
182182

‎auto_tests/group_state_test.c

+21-21
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ static void group_topic_lock_handler(const Tox_Event_Group_Topic_Lock *event,
6969
const uint32_t groupnumber = tox_event_group_topic_lock_get_group_number(event);
7070
const Tox_Group_Topic_Lock topic_lock = tox_event_group_topic_lock_get_topic_lock(event);
7171

72-
Tox_Err_Group_State_Queries err;
72+
Tox_Err_Group_State_Query err;
7373
Tox_Group_Topic_Lock current_topic_lock = tox_group_get_topic_lock(autotox->tox, groupnumber, &err);
7474

75-
ck_assert(err == TOX_ERR_GROUP_STATE_QUERIES_OK);
75+
ck_assert(err == TOX_ERR_GROUP_STATE_QUERY_OK);
7676
ck_assert_msg(current_topic_lock == topic_lock, "topic locks don't match in callback: %d %d",
7777
topic_lock, current_topic_lock);
7878
}
@@ -86,10 +86,10 @@ static void group_voice_state_handler(const Tox_Event_Group_Voice_State *event,
8686
const uint32_t groupnumber = tox_event_group_voice_state_get_group_number(event);
8787
const Tox_Group_Voice_State voice_state = tox_event_group_voice_state_get_voice_state(event);
8888

89-
Tox_Err_Group_State_Queries err;
89+
Tox_Err_Group_State_Query err;
9090
Tox_Group_Voice_State current_voice_state = tox_group_get_voice_state(autotox->tox, groupnumber, &err);
9191

92-
ck_assert(err == TOX_ERR_GROUP_STATE_QUERIES_OK);
92+
ck_assert(err == TOX_ERR_GROUP_STATE_QUERY_OK);
9393
ck_assert_msg(current_voice_state == voice_state, "voice states don't match in callback: %d %d",
9494
voice_state, current_voice_state);
9595
}
@@ -103,10 +103,10 @@ static void group_privacy_state_handler(const Tox_Event_Group_Privacy_State *eve
103103
const uint32_t groupnumber = tox_event_group_privacy_state_get_group_number(event);
104104
const Tox_Group_Privacy_State privacy_state = tox_event_group_privacy_state_get_privacy_state(event);
105105

106-
Tox_Err_Group_State_Queries err;
106+
Tox_Err_Group_State_Query err;
107107
Tox_Group_Privacy_State current_pstate = tox_group_get_privacy_state(autotox->tox, groupnumber, &err);
108108

109-
ck_assert(err == TOX_ERR_GROUP_STATE_QUERIES_OK);
109+
ck_assert(err == TOX_ERR_GROUP_STATE_QUERY_OK);
110110
ck_assert_msg(current_pstate == privacy_state, "privacy states don't match in callback");
111111
}
112112

@@ -118,10 +118,10 @@ static void group_peer_limit_handler(const Tox_Event_Group_Peer_Limit *event, vo
118118
const uint32_t groupnumber = tox_event_group_peer_limit_get_group_number(event);
119119
const uint32_t peer_limit = tox_event_group_peer_limit_get_peer_limit(event);
120120

121-
Tox_Err_Group_State_Queries err;
121+
Tox_Err_Group_State_Query err;
122122
uint32_t current_plimit = tox_group_get_peer_limit(autotox->tox, groupnumber, &err);
123123

124-
ck_assert(err == TOX_ERR_GROUP_STATE_QUERIES_OK);
124+
ck_assert(err == TOX_ERR_GROUP_STATE_QUERY_OK);
125125
ck_assert_msg(peer_limit == current_plimit,
126126
"Peer limits don't match in callback: %u, %u\n", peer_limit, current_plimit);
127127
}
@@ -136,16 +136,16 @@ static void group_password_handler(const Tox_Event_Group_Password *event,
136136
const uint8_t *password = tox_event_group_password_get_password(event);
137137
const size_t length = tox_event_group_password_get_password_length(event);
138138

139-
Tox_Err_Group_State_Queries err;
139+
Tox_Err_Group_State_Query err;
140140
size_t curr_pwlength = tox_group_get_password_size(autotox->tox, groupnumber, &err);
141141

142-
ck_assert(err == TOX_ERR_GROUP_STATE_QUERIES_OK);
142+
ck_assert(err == TOX_ERR_GROUP_STATE_QUERY_OK);
143143
ck_assert(length == curr_pwlength);
144144

145145
uint8_t current_password[TOX_GROUP_MAX_PASSWORD_SIZE];
146146
tox_group_get_password(autotox->tox, groupnumber, current_password, &err);
147147

148-
ck_assert(err == TOX_ERR_GROUP_STATE_QUERIES_OK);
148+
ck_assert(err == TOX_ERR_GROUP_STATE_QUERY_OK);
149149
ck_assert_msg(memcmp(current_password, password, length) == 0,
150150
"Passwords don't match: %s, %s", password, current_password);
151151
}
@@ -168,24 +168,24 @@ static int check_group_state(const Tox *tox, uint32_t groupnumber, uint32_t peer
168168
Tox_Group_Privacy_State priv_state, Tox_Group_Voice_State voice_state,
169169
const uint8_t *password, size_t pass_len, Tox_Group_Topic_Lock topic_lock)
170170
{
171-
Tox_Err_Group_State_Queries query_err;
171+
Tox_Err_Group_State_Query query_err;
172172

173173
Tox_Group_Privacy_State my_priv_state = tox_group_get_privacy_state(tox, groupnumber, &query_err);
174-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get privacy state: %d", query_err);
174+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get privacy state: %d", query_err);
175175

176176
if (my_priv_state != priv_state) {
177177
return -1;
178178
}
179179

180180
uint32_t my_peer_limit = tox_group_get_peer_limit(tox, groupnumber, &query_err);
181-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get peer limit: %d", query_err);
181+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get peer limit: %d", query_err);
182182

183183
if (my_peer_limit != peer_limit) {
184184
return -2;
185185
}
186186

187187
size_t my_pass_len = tox_group_get_password_size(tox, groupnumber, &query_err);
188-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get password size: %d", query_err);
188+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get password size: %d", query_err);
189189

190190
if (my_pass_len != pass_len) {
191191
return -5;
@@ -197,7 +197,7 @@ static int check_group_state(const Tox *tox, uint32_t groupnumber, uint32_t peer
197197
uint8_t my_pass[TOX_GROUP_MAX_PASSWORD_SIZE + 1];
198198
tox_group_get_password(tox, groupnumber, my_pass, &query_err);
199199
my_pass[my_pass_len] = 0;
200-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get password: %d", query_err);
200+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get password: %d", query_err);
201201

202202
if (memcmp(my_pass, password, my_pass_len) != 0) {
203203
return -6;
@@ -206,7 +206,7 @@ static int check_group_state(const Tox *tox, uint32_t groupnumber, uint32_t peer
206206

207207
/* Group name should never change */
208208
size_t my_gname_len = tox_group_get_name_size(tox, groupnumber, &query_err);
209-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get group name size: %d", query_err);
209+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get group name size: %d", query_err);
210210

211211
if (my_gname_len != GROUP_NAME_LEN) {
212212
return -7;
@@ -223,14 +223,14 @@ static int check_group_state(const Tox *tox, uint32_t groupnumber, uint32_t peer
223223
}
224224

225225
Tox_Group_Topic_Lock current_topic_lock = tox_group_get_topic_lock(tox, groupnumber, &query_err);
226-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get topic lock: %d", query_err);
226+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get topic lock: %d", query_err);
227227

228228
if (current_topic_lock != topic_lock) {
229229
return -9;
230230
}
231231

232232
Tox_Group_Voice_State current_voice_state = tox_group_get_voice_state(tox, groupnumber, &query_err);
233-
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "Failed to get voice state: %d", query_err);
233+
ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERY_OK, "Failed to get voice state: %d", query_err);
234234

235235
if (current_voice_state != voice_state) {
236236
return -10;
@@ -294,11 +294,11 @@ static void group_state_test(AutoTox *autotoxes)
294294
(const uint8_t *)PASSWORD, PASS_LEN, TOX_GROUP_TOPIC_LOCK_ENABLED);
295295

296296
/* Founder gets the Chat ID and implicitly shares it publicly */
297-
Tox_Err_Group_State_Queries id_err;
297+
Tox_Err_Group_State_Query id_err;
298298
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
299299
tox_group_get_chat_id(tox0, groupnum, chat_id, &id_err);
300300

301-
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "tox_group_get_chat_id failed %d", id_err);
301+
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERY_OK, "tox_group_get_chat_id failed %d", id_err);
302302

303303
/* All other peers join the group using the Chat ID and password */
304304
for (size_t i = 1; i < NUM_GROUP_TOXES; ++i) {

‎auto_tests/group_sync_test.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -264,14 +264,14 @@ static bool all_peers_have_same_topic(const AutoTox *autotoxes, uint32_t num_pee
264264
{
265265
uint8_t expected_topic[TOX_GROUP_MAX_TOPIC_LENGTH];
266266

267-
Tox_Err_Group_State_Queries query_err;
267+
Tox_Err_Group_State_Query query_err;
268268
size_t expected_topic_length = tox_group_get_topic_size(autotoxes[0].tox, groupnumber, &query_err);
269269

270-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
270+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
271271

272272
tox_group_get_topic(autotoxes[0].tox, groupnumber, expected_topic, &query_err);
273273

274-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
274+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
275275

276276
const State *state0 = (const State *)autotoxes[0].state;
277277

@@ -286,7 +286,7 @@ static bool all_peers_have_same_topic(const AutoTox *autotoxes, uint32_t num_pee
286286
for (size_t i = 1; i < num_peers; ++i) {
287287
size_t topic_length = tox_group_get_topic_size(autotoxes[i].tox, groupnumber, &query_err);
288288

289-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
289+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
290290

291291
if (topic_length != expected_topic_length) {
292292
return false;
@@ -295,7 +295,7 @@ static bool all_peers_have_same_topic(const AutoTox *autotoxes, uint32_t num_pee
295295
uint8_t topic[TOX_GROUP_MAX_TOPIC_LENGTH];
296296
tox_group_get_topic(autotoxes[i].tox, groupnumber, topic, &query_err);
297297

298-
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK);
298+
ck_assert(query_err == TOX_ERR_GROUP_STATE_QUERY_OK);
299299

300300
if (memcmp(expected_topic, (const char *)topic, topic_length) != 0) {
301301
return false;
@@ -360,11 +360,11 @@ static void group_sync_test(AutoTox *autotoxes)
360360

361361
fprintf(stderr, "tox0 creats new group and invites all his friends");
362362

363-
Tox_Err_Group_State_Queries id_err;
363+
Tox_Err_Group_State_Query id_err;
364364
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
365365

366366
tox_group_get_chat_id(tox0, groupnumber, chat_id, &id_err);
367-
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "%d", id_err);
367+
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERY_OK, "%d", id_err);
368368

369369
for (size_t i = 1; i < NUM_GROUP_TOXES; ++i) {
370370
Tox_Err_Group_Join join_err;

‎auto_tests/group_tcp_test.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ static void group_tcp_test(AutoTox *autotoxes)
160160

161161
iterate_group(autotoxes, NUM_GROUP_TOXES, GROUP_ITERATION_INTERVAL);
162162

163-
Tox_Err_Group_State_Queries id_err;
163+
Tox_Err_Group_State_Query id_err;
164164
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
165165

166166
tox_group_get_chat_id(autotoxes[0].tox, groupnumber, chat_id, &id_err);
167-
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "%d", id_err);
167+
ck_assert_msg(id_err == TOX_ERR_GROUP_STATE_QUERY_OK, "%d", id_err);
168168

169169
printf("Tox 0 created new group...\n");
170170

0 commit comments

Comments
 (0)