stats, fts-solr: Tweak unit tests to make static analyzers happier

diff --git a/src/plugins/fts-solr/test-solr-response.c b/src/plugins/fts-solr/test-solr-response.c
index 6ddeb48c3cd98c397aff425862e41062a2723878..8add6db14448191a2db5fceec13a0f7123d857e5 100644 (file)
--- a/src/plugins/fts-solr/test-solr-response.c
+++ b/src/plugins/fts-solr/test-solr-response.c
@@ -156,7 +156,7 @@ test_solr_result(const struct solr_response_test_result *test_results,
        if (test_has_failed())
                return;
 
-       for (i = 0; i < rcount; i++) {
+       for (i = 0; i < rcount && parse_results[i] != NULL; i++) {
                unsigned int scount, j;
                const struct fts_score_map *tscores = test_results[i].scores;
                const struct fts_score_map *pscores =

diff --git a/src/stats/test-stats-metrics.c b/src/stats/test-stats-metrics.c
index 380c49b2293fb444b3053e14b4e0417329df3d9a..c255b7733309bec6afcb0f22306bac8d584b90e1 100644 (file)
--- a/src/stats/test-stats-metrics.c
+++ b/src/stats/test-stats-metrics.c
@@ -117,7 +117,7 @@ static void test_stats_metrics_group_by_check_one(const struct metric *metric,
 
        if (group_by_count > 0) {
                test_assert(metric->group_by_count == group_by_count);
-               test_assert(metric->group_by != NULL);
+               i_assert(metric->group_by != NULL);
                test_assert(metric->group_by[0].func == group_by_func);
                test_assert_strcmp(metric->group_by[0].field, group_by_field);
        } else {