|
10 | 10 |
|
11 | 11 | static void jv_test();
|
12 | 12 | static void run_jq_tests(jv, int, FILE *, int, int);
|
| 13 | +static void run_jq_start_state_tests(); |
13 | 14 | #ifdef HAVE_PTHREAD
|
14 | 15 | static void run_jq_pthread_tests();
|
15 | 16 | #endif
|
@@ -37,6 +38,7 @@ int jq_testsuite(jv libdirs, int verbose, int argc, char* argv[]) {
|
37 | 38 | }
|
38 | 39 | }
|
39 | 40 | run_jq_tests(libdirs, verbose, testdata, skip, take);
|
| 41 | + run_jq_start_state_tests(); |
40 | 42 | #ifdef HAVE_PTHREAD
|
41 | 43 | run_jq_pthread_tests();
|
42 | 44 | #endif
|
@@ -251,6 +253,66 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int
|
251 | 253 | }
|
252 | 254 |
|
253 | 255 |
|
| 256 | +static int test_start_state(jq_state *jq, char *prog) { |
| 257 | + int pass = 1; |
| 258 | + jv message = jq_get_error_message(jq); |
| 259 | + if (jv_is_valid(message)) { |
| 260 | + printf("*** Expected error_message to be invalid after jq_start: %s\n", prog); |
| 261 | + pass = 0; |
| 262 | + } |
| 263 | + jv_free(message); |
| 264 | + |
| 265 | + jv exit_code = jq_get_exit_code(jq); |
| 266 | + if (jv_is_valid(exit_code)) { |
| 267 | + printf("*** Expected exit_code to be invalid after jq_start: %s\n", prog); |
| 268 | + pass = 0; |
| 269 | + } |
| 270 | + jv_free(exit_code); |
| 271 | + |
| 272 | + if (jq_halted(jq)) { |
| 273 | + printf("*** Expected jq to not be halted after jq_start: %s\n", prog); |
| 274 | + pass = 0; |
| 275 | + } |
| 276 | + |
| 277 | + return pass; |
| 278 | +} |
| 279 | + |
| 280 | +// Test jq_state is reset after subsequent calls to jq_start. |
| 281 | +static void test_jq_start_resets_state(char *prog, const char *input) { |
| 282 | + printf("Test jq_state: %s\n", prog); |
| 283 | + jq_state *jq = jq_init(); |
| 284 | + assert(jq); |
| 285 | + |
| 286 | + int compiled = jq_compile(jq, prog); |
| 287 | + assert(compiled); |
| 288 | + |
| 289 | + // First call to jq_start. Run until completion. |
| 290 | + jv parsed_input = jv_parse(input); |
| 291 | + assert(jv_is_valid(parsed_input)); |
| 292 | + jq_start(jq, parsed_input, 0); |
| 293 | + assert(test_start_state(jq, prog)); |
| 294 | + while (1) { |
| 295 | + jv result = jq_next(jq); |
| 296 | + int valid = jv_is_valid(result); |
| 297 | + jv_free(result); |
| 298 | + if (!valid) { break; } |
| 299 | + } |
| 300 | + |
| 301 | + // Second call to jq_start. |
| 302 | + jv parsed_input2 = jv_parse(input); |
| 303 | + assert(jv_is_valid(parsed_input2)); |
| 304 | + jq_start(jq, parsed_input2, 0); |
| 305 | + assert(test_start_state(jq, prog)); |
| 306 | + |
| 307 | + jq_teardown(&jq); |
| 308 | +} |
| 309 | + |
| 310 | +static void run_jq_start_state_tests() { |
| 311 | + test_jq_start_resets_state(".[]", "[1,2,3]"); |
| 312 | + test_jq_start_resets_state(".[] | if .%2 == 0 then halt_error else . end", "[1,2,3]"); |
| 313 | +} |
| 314 | + |
| 315 | + |
254 | 316 | /// pthread regression test
|
255 | 317 | #ifdef HAVE_PTHREAD
|
256 | 318 | #define NUMBER_OF_THREADS 3
|
|
0 commit comments