stats: test-stats-common - Rename test_init() to test_stats_init()

diff --git a/src/stats/test-client-reader.c b/src/stats/test-client-reader.c
index 8627e8230465c80c2e841712f31dce4ba2e7f667..f95ad0d9f246d94d10d35aacdcc28961788c60ed 100644 (file)
--- a/src/stats/test-client-reader.c
+++ b/src/stats/test-client-reader.c
@@ -98,7 +98,7 @@ static void test_client_reader(void)
        test_begin("client reader");
 
        /* register some stats */
-       test_init(settings_blob_1);
+       test_stats_init(settings_blob_1);
 
        client_readers_init();
        conn_list = connection_list_init(&client_set, &client_vfuncs);
@@ -116,7 +116,7 @@ static void test_client_reader(void)
        /* check output from reader */
        test_dump_metrics();
 
-       test_deinit();
+       test_stats_deinit();
 
        client_readers_deinit();
        connection_list_deinit(&conn_list);
@@ -193,7 +193,7 @@ static void test_client_reader_group_by(void)
        test_begin("client reader (group by)");
 
        /* register some stats */
-       test_init(settings_blob_2);
+       test_stats_init(settings_blob_2);
 
        client_readers_init();
        conn_list = connection_list_init(&client_set, &client_vfuncs);
@@ -212,7 +212,7 @@ static void test_client_reader_group_by(void)
        /* check output from reader */
        test_dump_metrics_group_by();
 
-       test_deinit();
+       test_stats_deinit();
 
        client_readers_deinit();
        connection_list_deinit(&conn_list);

diff --git a/src/stats/test-client-writer.c b/src/stats/test-client-writer.c
index 0ab3bdfb39f8c55320c10eedef9aecd4d3e3214f..f79f235258b652cb18ecbd1747868b99bb2a2e2a 100644 (file)
--- a/src/stats/test-client-writer.c
+++ b/src/stats/test-client-writer.c
@@ -109,7 +109,7 @@ static void test_client_writer(void)
        test_begin("client writer");
 
        /* register some stats */
-       test_init(settings_blob_1);
+       test_stats_init(settings_blob_1);
 
        client_writers_init();
        conn_list = connection_list_init(&client_set, &client_vfuncs);
@@ -124,7 +124,7 @@ static void test_client_writer(void)
        test_assert(get_stats_dist_field("test", STATS_DIST_COUNT) == 1);
        test_assert(get_stats_dist_field("test", STATS_DIST_SUM) > 0);
 
-       test_deinit();
+       test_stats_deinit();
 
        client_writers_deinit();
        connection_list_deinit(&conn_list);

diff --git a/src/stats/test-stats-common.c b/src/stats/test-stats-common.c
index 12014087fa5dd05527ad484904e9379911b40d77..18254de38de8515ad550e581c260ae9037568987 100644 (file)
--- a/src/stats/test-stats-common.c
+++ b/src/stats/test-stats-common.c
@@ -43,7 +43,7 @@ static struct stats_settings *read_settings(const char *const settings[],
        return set;
 }
 
-void test_init(const char *const settings_blob[])
+void test_stats_init(const char *const settings_blob[])
 {
        const char *error;
 
@@ -70,7 +70,7 @@ void test_init(const char *const settings_blob[])
        event_unref(&event);
 }
 
-void test_deinit(void)
+void test_stats_deinit(void)
 {
        stats_metrics_deinit(&stats_metrics);
        settings_free(stats_set);

diff --git a/src/stats/test-stats-common.h b/src/stats/test-stats-common.h
index de3af69177a2593f6ae00e321a5126e8601133c2..a8253bea509ccb8c07fe2e98fbbb5d16bdcee868 100644 (file)
--- a/src/stats/test-stats-common.h
+++ b/src/stats/test-stats-common.h
@@ -20,8 +20,8 @@ bool test_stats_callback(struct event *event,
                         struct failure_context *ctx, const char *fmt ATTR_UNUSED,
                         va_list args ATTR_UNUSED);
 
-void test_init(const char *const settings_blob[]);
-void test_deinit(void);
+void test_stats_init(const char *const settings_blob[]);
+void test_stats_deinit(void);
 
 void test_event_send(struct event *event);
 

diff --git a/src/stats/test-stats-metrics.c b/src/stats/test-stats-metrics.c
index 8208b5b3fd6b582e88849a0835df61f382977fa0..cfed2ab7697edc43360dc482cc827d87be982181 100644 (file)
--- a/src/stats/test-stats-metrics.c
+++ b/src/stats/test-stats-metrics.c
@@ -29,7 +29,7 @@ static void test_stats_metrics(void)
        test_begin("stats metrics (event counting)");
 
        /* register some stats */
-       test_init(settings_blob_1);
+       test_stats_init(settings_blob_1);
 
        /* push event in */
        struct event *event = event_create(NULL);
@@ -41,7 +41,7 @@ static void test_stats_metrics(void)
        test_assert(get_stats_dist_field("test", STATS_DIST_COUNT) == 1);
        test_assert(get_stats_dist_field("test", STATS_DIST_SUM) > 0);
 
-       test_deinit();
+       test_stats_deinit();
        test_end();
 }
 
@@ -56,7 +56,7 @@ static void test_stats_metrics_filter(void)
 {
        test_begin("stats metrics (filter)");
 
-       test_init(settings_blob_2);
+       test_stats_init(settings_blob_2);
 
        /* check filter */
        struct event_filter *filter =
@@ -88,7 +88,7 @@ static void test_stats_metrics_filter(void)
        test_assert(get_stats_dist_field("test", STATS_DIST_COUNT) == 1);
        test_assert(get_stats_dist_field("test", STATS_DIST_SUM) > 0);
 
-       test_deinit();
+       test_stats_deinit();
        test_end();
 }
 
@@ -197,7 +197,7 @@ test_stats_metrics_group_by_discrete_real(const struct discrete_test *test,
        const char *const *all_settings = t_strsplit(
                t_strconcat(t_strarray_join(base_settings, " "), " ",
                            t_strarray_join(test->settings_blob, " "), NULL), " ");
-       test_init(all_settings);
+       test_stats_init(all_settings);
 
        for (i = 0; i < test->num_values; i++) {
                for (j = 0; j < test->num_values; j++) {
@@ -249,7 +249,7 @@ test_stats_metrics_group_by_discrete_real(const struct discrete_test *test,
                }
        }
 
-       test_deinit();
+       test_stats_deinit();
        test_end();
 }
 
@@ -409,7 +409,7 @@ test_stats_metrics_group_by_quantized_real(const struct quantized_test *test,
        const char *const *all_settings = t_strsplit(
                t_strconcat(t_strarray_join(base_settings, " "), " ",
                            t_strarray_join(test->settings_blob, " "), NULL), " ");
-       test_init(all_settings);
+       test_stats_init(all_settings);
 
        struct event *event;
 
@@ -486,7 +486,7 @@ test_stats_metrics_group_by_quantized_real(const struct quantized_test *test,
                                                      METRIC_VALUE_TYPE_BUCKET_INDEX);
        }
 
-       test_deinit();
+       test_stats_deinit();
        test_end();
 }