From 0324c6ddca3f7c7ebfc9c3611899dae176697098 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 9 Jun 2020 02:36:54 +0200
Subject: [PATCH] testsuite: Reformat testsuite-common.c.
---
src/testsuite/testsuite-common.c | 99 +++++++++++++++++---------------
1 file changed, 54 insertions(+), 45 deletions(-)
diff --git a/src/testsuite/testsuite-common.c b/src/testsuite/testsuite-common.c
index 44cb4956f..f40e34dbd 100644
--- a/src/testsuite/testsuite-common.c
+++ b/src/testsuite/testsuite-common.c
@@ -68,7 +68,8 @@ bool testsuite_validator_context_initialize(struct sieve_validator *valdtr)
p_new(pool, struct testsuite_validator_context, 1);
/* Setup object registry */
- ctx->object_registrations = sieve_validator_object_registry_create(valdtr);
+ ctx->object_registrations =
+ sieve_validator_object_registry_create(valdtr);
testsuite_register_core_objects(ctx);
sieve_validator_extension_set_context(valdtr, testsuite_ext, ctx);
@@ -76,8 +77,8 @@ bool testsuite_validator_context_initialize(struct sieve_validator *valdtr)
return TRUE;
}
-struct testsuite_validator_context *testsuite_validator_context_get
-(struct sieve_validator *valdtr)
+struct testsuite_validator_context *
+testsuite_validator_context_get(struct sieve_validator *valdtr)
{
return (struct testsuite_validator_context *)
sieve_validator_extension_get_context(valdtr, testsuite_ext);
@@ -87,8 +88,8 @@ struct testsuite_validator_context *testsuite_validator_context_get
* Generator context
*/
-bool testsuite_generator_context_initialize
-(struct sieve_generator *gentr, const struct sieve_extension *this_ext)
+bool testsuite_generator_context_initialize(
+ struct sieve_generator *gentr, const struct sieve_extension *this_ext)
{
pool_t pool = sieve_generator_pool(gentr);
struct sieve_binary_block *sblock = sieve_generator_get_block(gentr);
@@ -107,37 +108,38 @@ bool testsuite_generator_context_initialize
* Interpreter context
*/
-static void testsuite_interpreter_free
-(const struct sieve_extension *ext ATTR_UNUSED,
- struct sieve_interpreter *interp ATTR_UNUSED, void *context)
+static void
+testsuite_interpreter_free(const struct sieve_extension *ext ATTR_UNUSED,
+ struct sieve_interpreter *interp ATTR_UNUSED,
+ void *context)
{
struct testsuite_interpreter_context *ctx =
(struct testsuite_interpreter_context *)context;
- if ( ctx->compiled_script != NULL )
+ if (ctx->compiled_script != NULL)
sieve_binary_unref(&ctx->compiled_script);
}
-const struct sieve_interpreter_extension
-testsuite_interpreter_ext = {
+const struct sieve_interpreter_extension testsuite_interpreter_ext = {
.ext_def = &testsuite_extension,
.free = testsuite_interpreter_free,
};
-bool testsuite_interpreter_context_initialize
-(struct sieve_interpreter *interp, const struct sieve_extension *this_ext)
+bool testsuite_interpreter_context_initialize(
+ struct sieve_interpreter *interp, const struct sieve_extension *this_ext)
{
pool_t pool = sieve_interpreter_pool(interp);
struct testsuite_interpreter_context *ctx =
p_new(pool, struct testsuite_interpreter_context, 1);
- sieve_interpreter_extension_register
- (interp, this_ext, &testsuite_interpreter_ext, ctx);
+ sieve_interpreter_extension_register(interp, this_ext,
+ &testsuite_interpreter_ext, ctx);
return TRUE;
}
-struct testsuite_interpreter_context *testsuite_interpreter_context_get
-(struct sieve_interpreter *interp, const struct sieve_extension *this_ext)
+struct testsuite_interpreter_context *
+testsuite_interpreter_context_get(struct sieve_interpreter *interp,
+ const struct sieve_extension *this_ext)
{
struct testsuite_interpreter_context *ctx =
sieve_interpreter_extension_get_context(interp, this_ext);
@@ -181,17 +183,19 @@ void testsuite_test_failf(const char *fmt, ...)
void testsuite_test_fail_cstr(const char *reason)
{
- if ( str_len(test_name) == 0 ) {
- if ( reason == NULL || *reason == '\0' )
+ if (str_len(test_name) == 0) {
+ if (reason == NULL || *reason == '\0')
printf("%2d: Test FAILED\n", test_index);
else
printf("%2d: Test FAILED: %s\n", test_index, reason);
} else {
- if ( reason == NULL || *reason == '\0' )
- printf("%2d: Test '%s' FAILED\n", test_index, str_c(test_name));
- else
- printf("%2d: Test '%s' FAILED: %s\n", test_index,
- str_c(test_name), reason);
+ if (reason == NULL || *reason == '\0') {
+ printf("%2d: Test '%s' FAILED\n",
+ test_index, str_c(test_name));
+ } else {
+ printf("%2d: Test '%s' FAILED: %s\n",
+ test_index, str_c(test_name), reason);
+ }
}
str_truncate(test_name, 0);
@@ -201,7 +205,7 @@ void testsuite_test_fail_cstr(const char *reason)
void testsuite_testcase_fail(const char *reason)
{
- if ( reason == NULL || *reason == '\0' )
+ if (reason == NULL || *reason == '\0')
printf("XX: Test CASE FAILED\n");
else
printf("XX: Test CASE FAILED: %s\n", reason);
@@ -211,17 +215,21 @@ void testsuite_testcase_fail(const char *reason)
void testsuite_test_succeed(string_t *reason)
{
- if ( str_len(test_name) == 0 ) {
- if ( reason == NULL || str_len(reason) == 0 )
+ if (str_len(test_name) == 0) {
+ if (reason == NULL || str_len(reason) == 0)
printf("%2d: Test SUCCEEDED\n", test_index);
- else
- printf("%2d: Test SUCCEEDED: %s\n", test_index, str_c(reason));
+ else {
+ printf("%2d: Test SUCCEEDED: %s\n",
+ test_index, str_c(reason));
+ }
} else {
- if ( reason == NULL || str_len(reason) == 0 )
- printf("%2d: Test '%s' SUCCEEDED\n", test_index, str_c(test_name));
- else
+ if (reason == NULL || str_len(reason) == 0) {
+ printf("%2d: Test '%s' SUCCEEDED\n",
+ test_index, str_c(test_name));
+ } else {
printf("%2d: Test '%s' SUCCEEDED: %s\n", test_index,
str_c(test_name), str_c(reason));
+ }
}
str_truncate(test_name, 0);
}
@@ -233,8 +241,9 @@ static void testsuite_test_context_deinit(void)
bool testsuite_testcase_result(void)
{
- if ( test_failures > 0 ) {
- printf("\nFAIL: %d of %d tests failed.\n\n", test_failures, test_index);
+ if (test_failures > 0) {
+ printf("\nFAIL: %d of %d tests failed.\n\n",
+ test_failures, test_index);
return FALSE;
}
@@ -250,10 +259,11 @@ static char *testsuite_tmp_dir;
static void testsuite_tmp_dir_init(void)
{
- testsuite_tmp_dir = i_strdup_printf
- ("/tmp/dsieve-testsuite.%s.%s", dec2str(time(NULL)), dec2str(getpid()));
+ testsuite_tmp_dir = i_strdup_printf("/tmp/dsieve-testsuite.%s.%s",
+ dec2str(time(NULL)),
+ dec2str(getpid()));
- if ( mkdir(testsuite_tmp_dir, 0700) < 0 ) {
+ if (mkdir(testsuite_tmp_dir, 0700) < 0) {
i_fatal("failed to create temporary directory '%s': %m.",
testsuite_tmp_dir);
}
@@ -263,9 +273,10 @@ static void testsuite_tmp_dir_deinit(void)
{
const char *error;
- if ( unlink_directory(testsuite_tmp_dir, UNLINK_DIRECTORY_FLAG_RMDIR, &error) < 0 )
+ if (unlink_directory(testsuite_tmp_dir,
+ UNLINK_DIRECTORY_FLAG_RMDIR, &error) < 0)
i_warning("failed to remove temporary directory '%s': %s.",
- testsuite_tmp_dir, error);
+ testsuite_tmp_dir, error);
i_free(testsuite_tmp_dir);
}
@@ -279,8 +290,8 @@ const char *testsuite_tmp_dir_get(void)
* Main testsuite init/deinit
*/
-void testsuite_init
-(struct sieve_instance *svinst, const char *test_path, bool log_stdout)
+void testsuite_init(struct sieve_instance *svinst, const char *test_path,
+ bool log_stdout)
{
testsuite_sieve_instance = svinst;
@@ -292,9 +303,8 @@ void testsuite_init
testsuite_binary_init();
testsuite_smtp_init();
- testsuite_ext = sieve_extension_register
- (svinst, &testsuite_extension, TRUE);
-
+ testsuite_ext =
+ sieve_extension_register(svinst, &testsuite_extension, TRUE);
testsuite_test_path = i_strdup(test_path);
}
@@ -311,4 +321,3 @@ void testsuite_deinit(void)
testsuite_log_deinit();
testsuite_test_context_deinit();
}
-
--
GitLab