From 8fd82c6d5dac8f88f210cb5f159492ec69577f57 Mon Sep 17 00:00:00 2001
From: Dominik Loidolt <dominik.loidolt@univie.ac.at>
Date: Fri, 11 Nov 2022 15:35:28 +0100
Subject: [PATCH] fix cmp_rdcu_cfg and cmp_entity test

---
 test/cmp_data_types/test_cmp_data_types.c |  3 +--
 test/cmp_entity/test_cmp_entity.c         |  1 +
 test/cmp_rdcu_cfg/meson.build             |  2 +-
 test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c     | 20 ++++++++++++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/test/cmp_data_types/test_cmp_data_types.c b/test/cmp_data_types/test_cmp_data_types.c
index d2037cc..2b6abf7 100644
--- a/test/cmp_data_types/test_cmp_data_types.c
+++ b/test/cmp_data_types/test_cmp_data_types.c
@@ -174,13 +174,12 @@ void test_cmp_input_size_to_samples(void)
 	data_type = DATA_TYPE_S_FX_NCOB;
 	size = MULTI_ENTRY_HDR_SIZE - 1;
 	samples_get = cmp_input_size_to_samples(size, data_type);
+	TEST_ASSERT_EQUAL(-1, samples_get);
 	data_type = DATA_TYPE_S_FX_NCOB;
 
-	data_type = DATA_TYPE_S_FX_NCOB;
 	size = MULTI_ENTRY_HDR_SIZE + 4*sizeof(struct s_fx_ncob) - 1;
 	samples_get = cmp_input_size_to_samples(size, data_type);
 	TEST_ASSERT_EQUAL(-1, samples_get);
-	TEST_ASSERT_EQUAL(-1, samples_get);
 }
 
 
diff --git a/test/cmp_entity/test_cmp_entity.c b/test/cmp_entity/test_cmp_entity.c
index f4eb523..d58c27c 100644
--- a/test/cmp_entity/test_cmp_entity.c
+++ b/test/cmp_entity/test_cmp_entity.c
@@ -2156,6 +2156,7 @@ void test_cmp_ent_write_rdcu_cmp_pars(void)
 	/* golomb_par to high */
 	info.golomb_par_used = 0x100;
 	error = cmp_ent_write_rdcu_cmp_pars(ent, &info, &cfg);
+	TEST_ASSERT_TRUE(error);
 	info.golomb_par_used = 0xFF;
 	/* this should work */
 	error = cmp_ent_write_rdcu_cmp_pars(ent, &info, &cfg);
diff --git a/test/cmp_rdcu_cfg/meson.build b/test/cmp_rdcu_cfg/meson.build
index 1eab608..3d01fd0 100644
--- a/test/cmp_rdcu_cfg/meson.build
+++ b/test/cmp_rdcu_cfg/meson.build
@@ -9,4 +9,4 @@ test_cmp_rdcu_cfg = executable('test_cmp_rdcu_cfg',
    build_by_default : false
 )
 
-test('Hardware Compressor Configuration Library Tests', test_cmp_rdcu_cfg)
+test('Hardware Compressor Configuration Tests', test_cmp_rdcu_cfg)
diff --git a/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c b/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c
index 62ae05d..9d70564 100644
--- a/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c
+++ b/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c
@@ -47,7 +47,7 @@ void test_rdcu_cfg_create(void)
 	cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
 	TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
 
-	data_type = -1; /* not valid data type */
+	data_type = -1U; /* not valid data type */
 	cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
 	TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
 
@@ -65,7 +65,7 @@ void test_rdcu_cfg_create(void)
 	cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
 	TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
 
-	cmp_mode = -1;
+	cmp_mode = -1U;
 	cfg = rdcu_cfg_create(data_type, cmp_mode, model_value, lossy_par);
 	TEST_ASSERT_EQUAL(DATA_TYPE_UNKNOWN, cfg.data_type);
 
@@ -538,11 +538,13 @@ void test_rdcu_cfg_imagette(void)
 	error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
 				  ap1_golomb_par, ap1_spillover_par,
 				  ap2_golomb_par, ap2_spillover_par);
+	TEST_ASSERT_EQUAL(1, error);
 	golomb_par = MAX_IMA_GOLOMB_PAR;
 	spillover_par = cmp_ima_max_spill(golomb_par)+1;
 	error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
 				  ap1_golomb_par, ap1_spillover_par,
 				  ap2_golomb_par, ap2_spillover_par);
+	TEST_ASSERT_EQUAL(1, error);
 
 	golomb_par = MIN_IMA_GOLOMB_PAR;
 	spillover_par = MIN_IMA_SPILL - 1;
@@ -572,11 +574,13 @@ void test_rdcu_cfg_imagette(void)
 	error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
 				  ap1_golomb_par, ap1_spillover_par,
 				  ap2_golomb_par, ap2_spillover_par);
+	TEST_ASSERT_EQUAL(1, error);
 	ap1_golomb_par = MAX_IMA_GOLOMB_PAR;
 	ap1_spillover_par = cmp_ima_max_spill(golomb_par)+1;
 	error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
 				  ap1_golomb_par, ap1_spillover_par,
 				  ap2_golomb_par, ap2_spillover_par);
+	TEST_ASSERT_EQUAL(1, error);
 
 	ap1_golomb_par = MIN_IMA_GOLOMB_PAR;
 	ap1_spillover_par = MIN_IMA_SPILL - 1;
@@ -606,11 +610,13 @@ void test_rdcu_cfg_imagette(void)
 	error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
 				  ap1_golomb_par, ap1_spillover_par,
 				  ap2_golomb_par, ap2_spillover_par);
+	TEST_ASSERT_EQUAL(1, error);
 	ap2_golomb_par = MAX_IMA_GOLOMB_PAR;
 	ap2_spillover_par = cmp_ima_max_spill(golomb_par)+1;
 	error = rdcu_cfg_imagette(&cfg, golomb_par, spillover_par,
 				  ap1_golomb_par, ap1_spillover_par,
 				  ap2_golomb_par, ap2_spillover_par);
+	TEST_ASSERT_EQUAL(1, error);
 
 	ap2_golomb_par = MIN_IMA_GOLOMB_PAR;
 	ap2_spillover_par = MIN_IMA_SPILL - 1;
@@ -684,10 +690,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
 	error = rdcu_cfg_buffers(&cfg, NULL, 0, NULL, CMP_DEF_IMA_MODEL_RDCU_DATA_ADR,
 				 CMP_DEF_IMA_MODEL_RDCU_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_UP_MODEL_ADR,
 				 CMP_DEF_IMA_MODEL_RDCU_BUFFER_ADR, 1);
+	TEST_ASSERT_FALSE(error);
 	error = rdcu_cfg_imagette(&cfg,
 				  CMP_DEF_IMA_MODEL_GOLOMB_PAR, CMP_DEF_IMA_MODEL_SPILL_PAR,
 				  CMP_DEF_IMA_MODEL_AP1_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP1_SPILL_PAR,
 				  CMP_DEF_IMA_MODEL_AP2_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP2_SPILL_PAR);
+	TEST_ASSERT_FALSE(error);
 	cfg.icu_new_model_buf = data;
 	cfg.icu_output_buf = (void *)model;
 	error = rdcu_cmp_cfg_is_invalid(&cfg);
@@ -703,10 +711,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
 	error = rdcu_cfg_buffers(&cfg, data, 1, model, CMP_DEF_IMA_MODEL_RDCU_DATA_ADR,
 				 CMP_DEF_IMA_MODEL_RDCU_MODEL_ADR, CMP_DEF_IMA_MODEL_RDCU_UP_MODEL_ADR,
 				 CMP_DEF_IMA_MODEL_RDCU_BUFFER_ADR, 0);
+	TEST_ASSERT_FALSE(error);
 	error = rdcu_cfg_imagette(&cfg,
 				  CMP_DEF_IMA_MODEL_GOLOMB_PAR, CMP_DEF_IMA_MODEL_SPILL_PAR,
 				  CMP_DEF_IMA_MODEL_AP1_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP1_SPILL_PAR,
 				  CMP_DEF_IMA_MODEL_AP2_GOLOMB_PAR, CMP_DEF_IMA_MODEL_AP2_SPILL_PAR);
+	TEST_ASSERT_FALSE(error);
 	error = rdcu_cmp_cfg_is_invalid(&cfg);
 	TEST_ASSERT_TRUE(error);
 
@@ -717,10 +727,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
 	error = rdcu_cfg_buffers(&cfg, data, 1, NULL, CMP_DEF_IMA_DIFF_RDCU_DATA_ADR,
 				 CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR,
 				 CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1);
+	TEST_ASSERT_FALSE(error);
 	error = rdcu_cfg_imagette(&cfg,
 				  CMP_DEF_IMA_DIFF_GOLOMB_PAR, CMP_DEF_IMA_DIFF_SPILL_PAR,
 				  CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR,
 				  CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR);
+	TEST_ASSERT_FALSE(error);
 	error = rdcu_cmp_cfg_is_invalid(&cfg);
 	TEST_ASSERT_TRUE(error);
 
@@ -730,10 +742,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
 	error = rdcu_cfg_buffers(&cfg, data, 1, NULL, RDCU_SRAM_END+4,
 				 CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR,
 				 CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1);
+	TEST_ASSERT_TRUE(error);
 	error = rdcu_cfg_imagette(&cfg,
 				  CMP_DEF_IMA_DIFF_GOLOMB_PAR, CMP_DEF_IMA_DIFF_SPILL_PAR,
 				  CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR,
 				  CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR);
+	TEST_ASSERT_FALSE(error);
 	error = rdcu_cmp_cfg_is_invalid(&cfg);
 	TEST_ASSERT_TRUE(error);
 
@@ -743,10 +757,12 @@ void test_rdcu_cmp_cfg_is_invalid(void)
 	error = rdcu_cfg_buffers(&cfg, data, 1, NULL, CMP_DEF_IMA_DIFF_RDCU_DATA_ADR,
 				 CMP_DEF_IMA_DIFF_RDCU_MODEL_ADR, CMP_DEF_IMA_DIFF_RDCU_UP_MODEL_ADR,
 				 CMP_DEF_IMA_DIFF_RDCU_BUFFER_ADR, 1);
+	TEST_ASSERT_FALSE(error);
 	error = rdcu_cfg_imagette(&cfg,
 				  MAX_IMA_GOLOMB_PAR+1, CMP_DEF_IMA_DIFF_SPILL_PAR,
 				  CMP_DEF_IMA_DIFF_AP1_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP1_SPILL_PAR,
 				  CMP_DEF_IMA_DIFF_AP2_GOLOMB_PAR, CMP_DEF_IMA_DIFF_AP2_SPILL_PAR);
+	TEST_ASSERT_TRUE(error);
 	error = rdcu_cmp_cfg_is_invalid(&cfg);
 	TEST_ASSERT_TRUE(error);
 }
-- 
GitLab