76 add init/deinit functions for unit test local ctxs (#149)

jeronstone · web-flow · commit 802f69f70718 · 2026-03-30T13:58:34.000-04:00
* Add init/deinit for local test ctx

* apply format ubuntu
diff --git a/src/backend/SecurityActionSet.c b/src/backend/SecurityActionSet.c
@@ -39,6 +39,7 @@ size_t BSL_SecurityActionSet_Sizeof(void)
 void BSL_SecurityActionSet_Init(BSL_SecurityActionSet_t *self)
 {
     ASSERT_ARG_NONNULL(self);
+    memset(self, 0, sizeof(BSL_SecurityActionSet_t));
     BSL_SecActionList_init(self->actions);
     self->action_count = 0;
     self->err_count    = 0;
diff --git a/test/bsl_test_utils.c b/test/bsl_test_utils.c
@@ -227,6 +227,32 @@ int rfc9173_byte_gen_fn_a4(unsigned char *buf, int len)
     return 1;
 }
 
+int BSL_TestContext_Init(BSL_TestContext_t *ctx, bool setupDefaultSecCtxs)
+{
+    memset(ctx, 0, sizeof(BSL_TestContext_t));
+    if (BSL_SUCCESS != BSL_API_InitLib(&ctx->bsl))
+    {
+        return 1;
+    }
+    mock_bpa_ctr_init(&ctx->mock_bpa_ctr);
+    if (setupDefaultSecCtxs)
+    {
+        BSL_TestUtils_SetupDefaultSecurityContext(&ctx->bsl);
+    }
+    return BSL_SUCCESS;
+}
+
+int BSL_TestContext_Deinit(BSL_TestContext_t *ctx)
+{
+    mock_bpa_ctr_deinit(&ctx->mock_bpa_ctr);
+    if (BSL_SUCCESS != BSL_API_DeinitLib(&ctx->bsl))
+    {
+        return 1;
+    }
+    memset(ctx, 0, sizeof(BSL_TestContext_t));
+    return BSL_SUCCESS;
+}
+
 void BSL_TestUtils_SetupDefaultSecurityContext(BSL_LibCtx_t *bsl_lib)
 {
     assert(bsl_lib != NULL);
diff --git a/test/bsl_test_utils.h b/test/bsl_test_utils.h
@@ -347,6 +347,9 @@ typedef struct BSL_TestContext_s
     uint64_t       key_id;
 } BSL_TestContext_t;
 
+int BSL_TestContext_Init(BSL_TestContext_t *ctx, bool setupDefaultSecCtxs);
+int BSL_TestContext_Deinit(BSL_TestContext_t *ctx);
+
 BSL_SecurityActionSet_t   *BSL_TestUtils_InitMallocBIBActionSet(BIBTestContext *bib_context);
 BSL_SecurityResponseSet_t *BSL_TestUtils_MallocEmptyPolicyResponse(void);
 
diff --git a/test/test_BackendPolicyProvider.c b/test/test_BackendPolicyProvider.c
@@ -57,9 +57,8 @@ int suiteTearDown(int failures)
 
 void setUp(void)
 {
-    memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));
     setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);
-    TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, false));
 
     BSL_PolicyDesc_t policy_desc = { 0 };
     policy_desc.user_data        = BSL_calloc(1, sizeof(BSLP_PolicyProvider_t));
@@ -68,14 +67,11 @@ void setUp(void)
     policy_desc.deinit_fn        = BSLP_Deinit;
 
     TEST_ASSERT_EQUAL(0, BSL_API_RegisterPolicyProvider(&LocalTestCtx.bsl, BSL_SAMPLE_PP_ID, policy_desc));
-
-    mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);
 }
 
 void tearDown(void)
 {
-    mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);
-    TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));
 }
 
 /**
diff --git a/test/test_BackendSecurityContext.c b/test/test_BackendSecurityContext.c
@@ -61,17 +61,13 @@ void setUp(void)
 {
     BSL_CryptoInit();
     setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);
-    memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));
-    TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));
-    mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);
-    BSL_TestUtils_SetupDefaultSecurityContext(&LocalTestCtx.bsl);
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, true));
 }
 
 void tearDown(void)
 {
-    mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);
-    TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));
     BSL_CryptoDeinit();
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));
 }
 
 /**
diff --git a/test/test_DefaultSecurityContext.c b/test/test_DefaultSecurityContext.c
@@ -67,17 +67,13 @@ void setUp(void)
 {
     BSL_CryptoInit();
     setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);
-    memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));
-    TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));
-    mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);
-    BSL_TestUtils_SetupDefaultSecurityContext(&LocalTestCtx.bsl);
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, true));
 }
 
 void tearDown(void)
 {
-    mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);
     BSL_CryptoDeinit();
-    TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));
 }
 
 /**
diff --git a/test/test_DynamicMemCbs.c b/test/test_DynamicMemCbs.c
@@ -94,12 +94,8 @@ int suiteTearDown(int failures)
 void _setUp(void)
 {
     setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);
-    memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));
-    TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));
-    mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);
-    memset(&action_set, 0, sizeof(action_set));
-
     BSL_CryptoInit();
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, true));
 
     BSL_SecParam_Init(&param_aes_variant_128);
     BSL_SecParam_Init(&param_use_wrap_key);
@@ -143,18 +139,14 @@ void _setUp(void)
     BSLP_PolicyRule_CopyParam(rule_bsl_32b, &param_test_bcb_key_correct);
     BSLP_PolicyRule_CopyParam(rule_bsl_32b, &param_aes_variant_128);
     BSLP_PolicyRule_CopyParam(rule_bsl_32b, &param_use_wrap_key);
-
-    /// Register the Security Context
-    BSL_TestUtils_SetupDefaultSecurityContext(&LocalTestCtx.bsl);
 }
 
 // manually call this to control dynamic mem callback tracking for test
 void _tearDown(void)
 {
     BSL_SecurityActionSet_Deinit(&action_set);
-    mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);
     BSL_CryptoDeinit();
-    TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));
 
     BSL_SecParam_Deinit(&param_aes_variant_128);
     BSL_SecParam_Deinit(&param_use_wrap_key);
diff --git a/test/test_PublicInterfaceImpl.c b/test/test_PublicInterfaceImpl.c
@@ -118,13 +118,8 @@ void PublicInterfaceTestCtx_deinit(BSL_TestPublInterfaceCtx_t *ctx)
 void setUp(void)
 {
     setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);
-    memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));
-    TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));
-    mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);
-    memset(&action_set, 0, sizeof(action_set));
-
     BSL_CryptoInit();
-
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, true));
     PublicInterfaceTestCtx_init(&ctx);
 
     /// Register the policy provider with some rules
@@ -561,18 +556,13 @@ void setUp(void)
     BSLP_PolicyRule_CopyParam(rule_bsl_32b, &ctx.param_test_bcb_key_correct);
     BSLP_PolicyRule_CopyParam(rule_bsl_32b, &ctx.param_aes_variant_128);
     BSLP_PolicyRule_CopyParam(rule_bsl_32b, &ctx.param_use_wrap_key);
-
-    /// Register the Security Context
-    BSL_TestUtils_SetupDefaultSecurityContext(&LocalTestCtx.bsl);
 }
 
 void tearDown(void)
 {
     BSL_SecurityActionSet_Deinit(&action_set);
-    mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);
     BSL_CryptoDeinit();
-    TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));
-
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));
     PublicInterfaceTestCtx_deinit(&ctx);
 }
 
diff --git a/test/test_SamplePolicyProvider.c b/test/test_SamplePolicyProvider.c
@@ -54,16 +54,12 @@ int suiteTearDown(int failures)
 void setUp(void)
 {
     setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);
-    memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));
-    TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));
-    mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, false));
 }
 
 void tearDown(void)
 {
-    mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);
-    // BSL_BundleCtx_Deinit(LocalTestCtx.bundle);
-    TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));
+    TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ size_t BSL_SecurityActionSet_Sizeof(void)`
`39`	`39`	`void BSL_SecurityActionSet_Init(BSL_SecurityActionSet_t *self)`
`40`	`40`	`{`
`41`	`41`	`ASSERT_ARG_NONNULL(self);`
	`42`	`+ memset(self, 0, sizeof(BSL_SecurityActionSet_t));`
`42`	`43`	`BSL_SecActionList_init(self->actions);`
`43`	`44`	`self->action_count = 0;`
`44`	`45`	`self->err_count = 0;`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,8 @@ int suiteTearDown(int failures)`
`57`	`57`
`58`	`58`	`void setUp(void)`
`59`	`59`	`{`
`60`		`- memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));`
`61`	`60`	`setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);`
`62`		`- TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));`
	`61`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, false));`
`63`	`62`
`64`	`63`	`BSL_PolicyDesc_t policy_desc = { 0 };`
`65`	`64`	`policy_desc.user_data = BSL_calloc(1, sizeof(BSLP_PolicyProvider_t));`
`@@ -68,14 +67,11 @@ void setUp(void)`
`68`	`67`	`policy_desc.deinit_fn = BSLP_Deinit;`
`69`	`68`
`70`	`69`	`TEST_ASSERT_EQUAL(0, BSL_API_RegisterPolicyProvider(&LocalTestCtx.bsl, BSL_SAMPLE_PP_ID, policy_desc));`
`71`		`-`
`72`		`- mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);`
`73`	`70`	`}`
`74`	`71`
`75`	`72`	`void tearDown(void)`
`76`	`73`	`{`
`77`		`- mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);`
`78`		`- TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));`
	`74`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));`
`79`	`75`	`}`
`80`	`76`
`81`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -61,17 +61,13 @@ void setUp(void)`
`61`	`61`	`{`
`62`	`62`	`BSL_CryptoInit();`
`63`	`63`	`setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);`
`64`		`- memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));`
`65`		`- TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));`
`66`		`- mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);`
`67`		`- BSL_TestUtils_SetupDefaultSecurityContext(&LocalTestCtx.bsl);`
	`64`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, true));`
`68`	`65`	`}`
`69`	`66`
`70`	`67`	`void tearDown(void)`
`71`	`68`	`{`
`72`		`- mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);`
`73`		`- TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));`
`74`	`69`	`BSL_CryptoDeinit();`
	`70`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));`
`75`	`71`	`}`
`76`	`72`
`77`	`73`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -67,17 +67,13 @@ void setUp(void)`
`67`	`67`	`{`
`68`	`68`	`BSL_CryptoInit();`
`69`	`69`	`setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);`
`70`		`- memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));`
`71`		`- TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));`
`72`		`- mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);`
`73`		`- BSL_TestUtils_SetupDefaultSecurityContext(&LocalTestCtx.bsl);`
	`70`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, true));`
`74`	`71`	`}`
`75`	`72`
`76`	`73`	`void tearDown(void)`
`77`	`74`	`{`
`78`		`- mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);`
`79`	`75`	`BSL_CryptoDeinit();`
`80`		`- TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));`
	`76`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));`
`81`	`77`	`}`
`82`	`78`
`83`	`79`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -54,16 +54,12 @@ int suiteTearDown(int failures)`
`54`	`54`	`void setUp(void)`
`55`	`55`	`{`
`56`	`56`	`setenv("BSL_TEST_LOCAL_IPN_EID", "ipn:2.1", 1);`
`57`		`- memset(&LocalTestCtx, 0, sizeof(LocalTestCtx));`
`58`		`- TEST_ASSERT_EQUAL(0, BSL_API_InitLib(&LocalTestCtx.bsl));`
`59`		`- mock_bpa_ctr_init(&LocalTestCtx.mock_bpa_ctr);`
	`57`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Init(&LocalTestCtx, false));`
`60`	`58`	`}`
`61`	`59`
`62`	`60`	`void tearDown(void)`
`63`	`61`	`{`
`64`		`- mock_bpa_ctr_deinit(&LocalTestCtx.mock_bpa_ctr);`
`65`		`- // BSL_BundleCtx_Deinit(LocalTestCtx.bundle);`
`66`		`- TEST_ASSERT_EQUAL(0, BSL_API_DeinitLib(&LocalTestCtx.bsl));`
	`62`	`+ TEST_ASSERT_EQUAL(0, BSL_TestContext_Deinit(&LocalTestCtx));`
`67`	`63`	`}`
`68`	`64`
`69`	`65`	`/**`