>From c4c32f8df5876d5d08ad99c2ae441d39cd85282a Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 29 May 2015 15:46:57 +0200 Subject: [PATCH 17/29] TESTS: Add a common function to set up sdap_id_ctx Reduces code duplication between tests. --- src/tests/cmocka/common_mock_sdap.c | 15 +++++++++++++++ src/tests/cmocka/common_mock_sdap.h | 4 ++++ src/tests/cmocka/test_nested_groups.c | 14 +++++++------- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/tests/cmocka/common_mock_sdap.c b/src/tests/cmocka/common_mock_sdap.c index 4f6988c2619f5a0f4e49a629f2a3bf5b792fd2a5..1adfc7caef1cdb0f0d23621cb536e9dac29b6cd6 100644 --- a/src/tests/cmocka/common_mock_sdap.c +++ b/src/tests/cmocka/common_mock_sdap.c @@ -33,6 +33,21 @@ errno_t krb5_try_kdcip(struct confdb_ctx *cdb, return EOK; } +struct sdap_id_ctx *mock_sdap_id_ctx(TALLOC_CTX *mem_ctx, + struct be_ctx *be_ctx, + struct sdap_options *sdap_opts) +{ + struct sdap_id_ctx *sdap_id_ctx; + + sdap_id_ctx = talloc_zero(mem_ctx, struct sdap_id_ctx); + assert_non_null(sdap_id_ctx); + + sdap_id_ctx->be = be_ctx; + sdap_id_ctx->opts = sdap_opts; + + return sdap_id_ctx; +} + struct sdap_options *mock_sdap_options_ldap(TALLOC_CTX *mem_ctx, struct sss_domain_info *domain, struct confdb_ctx *confdb_ctx, diff --git a/src/tests/cmocka/common_mock_sdap.h b/src/tests/cmocka/common_mock_sdap.h index 937b83137fdde20eb980e062a4f37a8081909855..6fd1fb79c0fe9c36471a03634e38acf9f226c234 100644 --- a/src/tests/cmocka/common_mock_sdap.h +++ b/src/tests/cmocka/common_mock_sdap.h @@ -38,6 +38,10 @@ struct sdap_options *mock_sdap_options_ldap(TALLOC_CTX *mem_ctx, struct confdb_ctx *confdb_ctx, const char *conf_path); +struct sdap_id_ctx *mock_sdap_id_ctx(TALLOC_CTX *mem_ctx, + struct be_ctx *be_ctx, + struct sdap_options *sdap_opts); + struct sdap_handle *mock_sdap_handle(TALLOC_CTX *mem_ctx); #endif /* COMMON_MOCK_SDAP_H_ */ diff --git a/src/tests/cmocka/test_nested_groups.c b/src/tests/cmocka/test_nested_groups.c index 75fb3a19f27596fe89fdc779c73653cbbaf5e536..390b39950823a68644739c1b38834a40c501a647 100644 --- a/src/tests/cmocka/test_nested_groups.c +++ b/src/tests/cmocka/test_nested_groups.c @@ -54,6 +54,7 @@ struct nested_groups_test_ctx { struct sss_test_ctx *tctx; + struct be_ctx *be_ctx; struct sdap_options *sdap_opts; struct sdap_handle *sdap_handle; struct sdap_domain *sdap_domain; @@ -596,15 +597,14 @@ static int nested_groups_test_setup(void **state) test_ctx->sdap_handle = mock_sdap_handle(test_ctx); assert_non_null(test_ctx->sdap_handle); - test_ctx->sdap_id_ctx = talloc_zero(test_ctx, - struct sdap_id_ctx); + test_ctx->be_ctx = mock_be_ctx(test_ctx, test_ctx->tctx); + assert_non_null(test_ctx->be_ctx); + + test_ctx->sdap_id_ctx = mock_sdap_id_ctx(test_ctx, + test_ctx->be_ctx, + test_ctx->sdap_opts); assert_non_null(test_ctx->sdap_id_ctx); - test_ctx->sdap_id_ctx->be = mock_be_ctx(test_ctx, test_ctx->tctx); - assert_non_null(test_ctx->sdap_id_ctx->be); - - test_ctx->sdap_id_ctx->opts = test_ctx->sdap_opts; - ret = sdap_idmap_init(test_ctx, test_ctx->sdap_id_ctx, &test_ctx->idmap_ctx); assert_int_equal(ret, EOK); test_ctx->sdap_opts->idmap_ctx = test_ctx->idmap_ctx; -- 2.1.0