From e9203439b70bbb3b2daf1a1c08ea5afb0fa126b0 Mon Sep 17 00:00:00 2001 From: gitlost Date: Mon, 27 Nov 2023 13:47:38 +0000 Subject: [PATCH] backend/tests: some tabs -> spaces --- backend/tests/test_code1.c | 32 +++++----- backend/tests/test_imail.c | 122 ++++++++++++++++++------------------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/backend/tests/test_code1.c b/backend/tests/test_code1.c index 911f928c..28e2b0b2 100644 --- a/backend/tests/test_code1.c +++ b/backend/tests/test_code1.c @@ -3353,7 +3353,7 @@ static void test_fuzz(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { - int option_2; + int option_2; char *data; int length; int ret; @@ -3391,22 +3391,22 @@ static void test_fuzz(const testCtx *const p_ctx) { ret = ZBarcode_Encode(symbol, (unsigned char *) data[i].data, length); assert_equal(ret, data[i].ret, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", i, ret, data[i].ret, symbol->errtxt); - if (ret < ZINT_ERROR) { - if (do_bwipp && testUtilCanBwipp(i, symbol, -1, data[i].option_2, -1, debug)) { - if (!data[i].bwipp_cmp) { - if (debug & ZINT_DEBUG_TEST_PRINT) printf("i:%d %s not BWIPP compatible (%s)\n", i, testUtilBarcodeName(symbol->symbology), data[i].comment); - } else { - char modules_dump[4096]; - assert_notequal(testUtilModulesDump(symbol, modules_dump, sizeof(modules_dump)), -1, "i:%d testUtilModulesDump == -1\n", i); - ret = testUtilBwipp(i, symbol, -1, data[i].option_2, -1, data[i].data, length, NULL, bwipp_buf, sizeof(bwipp_buf), NULL); - assert_zero(ret, "i:%d %s testUtilBwipp ret %d != 0\n", i, testUtilBarcodeName(symbol->symbology), ret); + if (ret < ZINT_ERROR) { + if (do_bwipp && testUtilCanBwipp(i, symbol, -1, data[i].option_2, -1, debug)) { + if (!data[i].bwipp_cmp) { + if (debug & ZINT_DEBUG_TEST_PRINT) printf("i:%d %s not BWIPP compatible (%s)\n", i, testUtilBarcodeName(symbol->symbology), data[i].comment); + } else { + char modules_dump[4096]; + assert_notequal(testUtilModulesDump(symbol, modules_dump, sizeof(modules_dump)), -1, "i:%d testUtilModulesDump == -1\n", i); + ret = testUtilBwipp(i, symbol, -1, data[i].option_2, -1, data[i].data, length, NULL, bwipp_buf, sizeof(bwipp_buf), NULL); + assert_zero(ret, "i:%d %s testUtilBwipp ret %d != 0\n", i, testUtilBarcodeName(symbol->symbology), ret); - ret = testUtilBwippCmp(symbol, bwipp_msg, bwipp_buf, modules_dump); - assert_zero(ret, "i:%d %s testUtilBwippCmp %d != 0 %s\n actual: %s\nexpected: %s\n", - i, testUtilBarcodeName(symbol->symbology), ret, bwipp_msg, bwipp_buf, modules_dump); - } - } - } + ret = testUtilBwippCmp(symbol, bwipp_msg, bwipp_buf, modules_dump); + assert_zero(ret, "i:%d %s testUtilBwippCmp %d != 0 %s\n actual: %s\nexpected: %s\n", + i, testUtilBarcodeName(symbol->symbology), ret, bwipp_msg, bwipp_buf, modules_dump); + } + } + } ZBarcode_Delete(symbol); } diff --git a/backend/tests/test_imail.c b/backend/tests/test_imail.c index bf6bd51b..bde7e127 100644 --- a/backend/tests/test_imail.c +++ b/backend/tests/test_imail.c @@ -1,6 +1,6 @@ /* libzint - the open source barcode library - Copyright (C) 2019-2022 Robin Stuart + Copyright (C) 2019-2023 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -62,10 +62,10 @@ static void test_csv(const testCtx *const p_ctx) { int ret; int lc = 0; - int j; + int j; clock_t start; clock_t total = 0; - int test_performance = debug & ZINT_DEBUG_TEST_PERFORMANCE; /* -d 256 */ + int test_performance = debug & ZINT_DEBUG_TEST_PERFORMANCE; /* -d 256 */ int perf_iterations = test_performance ? TEST_CSV_PERF_ITERATIONS : 1; testStart("test_csv"); @@ -77,88 +77,88 @@ static void test_csv(const testCtx *const p_ctx) { assert_nonzero(testUtilDataPath(csvfile, sizeof(csvfile), "/backend/tests/data/imail/usps/", "uspsIMbEncoderTestCases.csv"), "testUtilDataPath == 0\n"); - for (j = 0; j < perf_iterations; j++) { - fd = testUtilOpen(csvfile, "r"); - assert_nonnull(fd, "testUtilOpen(%s) == NULL", csvfile); + for (j = 0; j < perf_iterations; j++) { + fd = testUtilOpen(csvfile, "r"); + assert_nonnull(fd, "testUtilOpen(%s) == NULL", csvfile); - while (fgets(buffer, sizeof(buffer), fd) != NULL) { - const char *b; - struct zint_symbol *symbol; + while (fgets(buffer, sizeof(buffer), fd) != NULL) { + const char *b; + struct zint_symbol *symbol; - lc++; + lc++; if (testContinue(p_ctx, lc - 1)) continue; - #ifdef TEST_IMAIL_CSV_MAX - if (lc > TEST_IMAIL_CSV_MAX && p_ctx->index == -1) { - break; - } - #endif + #ifdef TEST_IMAIL_CSV_MAX + if (lc > TEST_IMAIL_CSV_MAX && p_ctx->index == -1) { + break; + } + #endif - id[0] = tracking_code[0] = routing_code[0] = expected_daft[0] = return_code[0] = '\0'; + id[0] = tracking_code[0] = routing_code[0] = expected_daft[0] = return_code[0] = '\0'; - b = testUtilReadCSVField(buffer, id, sizeof(id)); - assert_nonnull(b, "lc:%d id b == NULL", lc); - assert_equal(*b, ',', "lc:%d id *b %c != ','", lc, *b); + b = testUtilReadCSVField(buffer, id, sizeof(id)); + assert_nonnull(b, "lc:%d id b == NULL", lc); + assert_equal(*b, ',', "lc:%d id *b %c != ','", lc, *b); - b = testUtilReadCSVField(++b, tracking_code, sizeof(tracking_code)); - assert_nonnull(b, "lc:%d tracking_code b == NULL", lc); - assert_equal(*b, ',', "lc:%d tracking_code *b %c != ','", lc, *b); + b = testUtilReadCSVField(++b, tracking_code, sizeof(tracking_code)); + assert_nonnull(b, "lc:%d tracking_code b == NULL", lc); + assert_equal(*b, ',', "lc:%d tracking_code *b %c != ','", lc, *b); - b = testUtilReadCSVField(++b, routing_code, sizeof(routing_code)); - assert_nonnull(b, "lc:%d routing_code b == NULL", lc); - assert_equal(*b, ',', "lc:%d routing_code *b %c != ','", lc, *b); + b = testUtilReadCSVField(++b, routing_code, sizeof(routing_code)); + assert_nonnull(b, "lc:%d routing_code b == NULL", lc); + assert_equal(*b, ',', "lc:%d routing_code *b %c != ','", lc, *b); - b = testUtilReadCSVField(++b, expected_daft, sizeof(expected_daft)); - assert_nonnull(b, "lc:%d expected_daft b == NULL", lc); - assert_equal(*b, ',', "lc:%d expected_daft *b %c != ','", lc, *b); + b = testUtilReadCSVField(++b, expected_daft, sizeof(expected_daft)); + assert_nonnull(b, "lc:%d expected_daft b == NULL", lc); + assert_equal(*b, ',', "lc:%d expected_daft *b %c != ','", lc, *b); - b = testUtilReadCSVField(++b, return_code, sizeof(return_code)); - assert_nonnull(b, "lc:%d return_code b == NULL", lc); - assert_equal(*b, ',', "lc:%d return_code *b %c != ','", lc, *b); + b = testUtilReadCSVField(++b, return_code, sizeof(return_code)); + assert_nonnull(b, "lc:%d return_code b == NULL", lc); + assert_equal(*b, ',', "lc:%d return_code *b %c != ','", lc, *b); - strcpy(data, tracking_code); - strcat(data, "-"); - strcat(data, routing_code); + strcpy(data, tracking_code); + strcat(data, "-"); + strcat(data, routing_code); - assert_nonzero((int) strlen(data), "lc:%d strlen(data) == 0", lc); + assert_nonzero((int) strlen(data), "lc:%d strlen(data) == 0", lc); - symbol = ZBarcode_Create(); - assert_nonnull(symbol, "Symbol not created\n"); + symbol = ZBarcode_Create(); + assert_nonnull(symbol, "Symbol not created\n"); - symbol->symbology = BARCODE_USPS_IMAIL; - symbol->debug |= debug; + symbol->symbology = BARCODE_USPS_IMAIL; + symbol->debug |= debug; - if (test_performance) { - start = clock(); - } - ret = ZBarcode_Encode(symbol, (unsigned char *) data, (int) strlen(data)); - if (test_performance) { - total += clock() - start; - } + if (test_performance) { + start = clock(); + } + ret = ZBarcode_Encode(symbol, (unsigned char *) data, (int) strlen(data)); + if (test_performance) { + total += clock() - start; + } - if (strcmp(return_code, "00") == 0) { + if (strcmp(return_code, "00") == 0) { - assert_zero(ret, "lc:%d ZBarcode_Encode ret %d != 0\n", lc, ret); + assert_zero(ret, "lc:%d ZBarcode_Encode ret %d != 0\n", lc, ret); - assert_equal(symbol->rows, 3, "rows %d != 3", symbol->rows); + assert_equal(symbol->rows, 3, "rows %d != 3", symbol->rows); - ret = testUtilDAFTConvert(symbol, actual_daft, sizeof(actual_daft)); - assert_nonzero(ret, "lc:%d testUtilDAFTConvert == 0", lc); - assert_zero(strcmp(actual_daft, expected_daft), "lc:%d\n actual %s\nexpected %s\n", lc, actual_daft, expected_daft); - } else { - assert_nonzero(ret, "lc:%d ZBarcode_Encode ret %d == 0\n", lc, ret); - } + ret = testUtilDAFTConvert(symbol, actual_daft, sizeof(actual_daft)); + assert_nonzero(ret, "lc:%d testUtilDAFTConvert == 0", lc); + assert_zero(strcmp(actual_daft, expected_daft), "lc:%d\n actual %s\nexpected %s\n", lc, actual_daft, expected_daft); + } else { + assert_nonzero(ret, "lc:%d ZBarcode_Encode ret %d == 0\n", lc, ret); + } - ZBarcode_Delete(symbol); - } + ZBarcode_Delete(symbol); + } - assert_zero(fclose(fd), "fclose != 0\n"); - } + assert_zero(fclose(fd), "fclose != 0\n"); + } - if (test_performance) { + if (test_performance) { printf("test_csv perf total: %8gms\n", TEST_PERF_TIME(total)); - } + } testFinish(); }