Test: Remove obsoleted test cases
After Library Model is deprecated, some test cases are obsoleted.
Remove them.
Signed-off-by: Summer Qin <summer.qin@arm.com>
Change-Id: Ice5dd2407c74353628b9ce25cd9e99cb0beeed04
diff --git a/test/secure_fw/suites/its/secure/psa_its_s_interface_testsuite.c b/test/secure_fw/suites/its/secure/psa_its_s_interface_testsuite.c
index 4dd7e26..4d08c47 100644
--- a/test/secure_fw/suites/its/secure/psa_its_s_interface_testsuite.c
+++ b/test/secure_fw/suites/its/secure/psa_its_s_interface_testsuite.c
@@ -16,9 +16,6 @@
/* List of tests */
static void tfm_its_test_1020(struct test_result_t *ret);
-static void tfm_its_test_1021(struct test_result_t *ret);
-static void tfm_its_test_1022(struct test_result_t *ret);
-static void tfm_its_test_1023(struct test_result_t *ret);
static struct test_t psa_its_s_tests[] = {
{&tfm_its_test_common_001, "TFM_S_ITS_TEST_1001",
@@ -59,13 +56,7 @@
"Multiple sets to same UID from same thread"},
{&tfm_its_test_common_019, "TFM_S_ITS_TEST_1019",
"Set, get and remove interface with different asset sizes"},
- {&tfm_its_test_1020, "TFM_S_ITS_TEST_1020",
- "Set interface with invalid data length"},
- {&tfm_its_test_1021, "TFM_S_ITS_TEST_1021",
- "Get interface with invalid data lengths and offsets"},
- {&tfm_its_test_1022, "TFM_S_ITS_TEST_1022",
- "Get info interface with NULL info pointer"},
- {&tfm_its_test_1023, "TFM_S_ITS_TEST_1023",
+ {&tfm_its_test_1020, "TFM_S_ITS_TEST_1023",
"Attempt to get a UID set by a different partition"},
};
@@ -81,70 +72,11 @@
}
/**
- * \brief Tests set function with:
- * - Data length longer than maximum permitted
- *
- * \param[out] ret Test result
- */
-static void tfm_its_test_1020(struct test_result_t *ret)
-{
- ret->val = TEST_PASSED;
-}
-
-/**
- * \brief Tests get function with:
- * - Invalid data len and offset
- * - NULL read data length pointer
- *
- * \param[out] ret Test result
- */
-static void tfm_its_test_1021(struct test_result_t *ret)
-{
- ret->val = TEST_PASSED;
-}
-
-/**
- * \brief Tests get info function with:
- * - NULL info pointer
- *
- * \param[out] ret Test result
- */
-static void tfm_its_test_1022(struct test_result_t *ret)
-{
- psa_status_t status;
- const psa_storage_uid_t uid = TEST_UID_3;
- const psa_storage_create_flags_t flags = PSA_STORAGE_FLAG_NONE;
- const size_t data_len = WRITE_DATA_SIZE;
- const uint8_t write_data[] = WRITE_DATA;
-
- status = psa_its_set(uid, data_len, write_data, flags);
- if (status != PSA_SUCCESS) {
- TEST_FAIL("Set should not fail");
- return;
- }
-
- /* A parameter with a null pointer is treated as a secure violation.
- * TF-M framework rejects the request with a proper error code.
- * The secure PSA ITS implementation returns
- * PSA_ERROR_INVALID_ARGUMENT in that case.
- */
-
- /* Call remove to clean up storage for the next test */
- status = psa_its_remove(uid);
- if (status != PSA_SUCCESS) {
- TEST_FAIL("Remove should not fail with valid UID");
- return;
- }
-
- ret->val = TEST_PASSED;
-}
-
-/**
* \brief Attempt to get a UID set by a different partition.
*
* \param[out] ret Test result
*/
-static void tfm_its_test_1023(struct test_result_t *ret)
+static void tfm_its_test_1020(struct test_result_t *ret)
{
psa_status_t status;
const psa_storage_uid_t uid = TEST_UID_ACCESS_CONTROL;
diff --git a/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c b/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
index 5471531..99c78c9 100644
--- a/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
+++ b/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
@@ -50,7 +50,6 @@
static void tfm_ps_test_1001(struct test_result_t *ret);
static void tfm_ps_test_1002(struct test_result_t *ret);
static void tfm_ps_test_1003(struct test_result_t *ret);
-static void tfm_ps_test_1004(struct test_result_t *ret);
static void tfm_ps_test_1005(struct test_result_t *ret);
static void tfm_ps_test_1006(struct test_result_t *ret);
static void tfm_ps_test_1007(struct test_result_t *ret);
@@ -60,7 +59,6 @@
static void tfm_ps_test_1011(struct test_result_t *ret);
static void tfm_ps_test_1012(struct test_result_t *ret);
static void tfm_ps_test_1013(struct test_result_t *ret);
-static void tfm_ps_test_1014(struct test_result_t *ret);
static void tfm_ps_test_1015(struct test_result_t *ret);
static void tfm_ps_test_1016(struct test_result_t *ret);
static void tfm_ps_test_1017(struct test_result_t *ret);
@@ -77,8 +75,6 @@
"Set interface with create flags"},
{&tfm_ps_test_1003, "TFM_S_PS_TEST_1003",
"Set interface with NULL data pointer"},
- {&tfm_ps_test_1004, "TFM_S_PS_TEST_1004",
- "Set interface with invalid data length"},
{&tfm_ps_test_1005, "TFM_S_PS_TEST_1005",
"Set interface with write once UID"},
{&tfm_ps_test_1006, "TFM_S_PS_TEST_1006",
@@ -97,8 +93,6 @@
"Get info interface with valid UID"},
{&tfm_ps_test_1013, "TFM_S_PS_TEST_1013",
"Get info interface with invalid UIDs"},
- {&tfm_ps_test_1014, "TFM_S_PS_TEST_1014",
- "Get info interface with NULL info pointer"},
{&tfm_ps_test_1015, "TFM_S_PS_TEST_1015",
"Remove interface with valid UID"},
{&tfm_ps_test_1016, "TFM_S_PS_TEST_1016",
@@ -250,15 +244,6 @@
/**
* \brief Tests set function with:
- * - Data length longer than maximum permitted
- */
-static void tfm_ps_test_1004(struct test_result_t *ret)
-{
- ret->val = TEST_PASSED;
-}
-
-/**
- * \brief Tests set function with:
* - Write once UID that has already been created
*/
static void tfm_ps_test_1005(struct test_result_t *ret)
@@ -491,7 +476,6 @@
* - Offset greater than UID length
* - Data length greater than UID length
* - Data length + offset greater than UID length
- * - Invalid data len and offset
*/
static void tfm_ps_test_1009(struct test_result_t *ret)
{
@@ -761,40 +745,6 @@
}
/**
- * \brief Tests get info function with:
- * - NULL info pointer
- */
-static void tfm_ps_test_1014(struct test_result_t *ret)
-{
- psa_status_t status;
- const psa_storage_uid_t uid = TEST_UID_3;
- const psa_storage_create_flags_t flags = PSA_STORAGE_FLAG_NONE;
- const uint32_t data_len = WRITE_DATA_SIZE;
- const uint8_t write_data[] = WRITE_DATA;
-
- status = psa_ps_set(uid, data_len, write_data, flags);
- if (status != PSA_SUCCESS) {
- TEST_FAIL("Set should not fail");
- return;
- }
-
- /* A parameter with a null pointer is treated as a secure violation.
- * TF-M framework rejects the request with a proper error code.
- * The PS secure PSA PS implementation returns
- * PSA_ERROR_GENERIC_ERROR in that case.
- */
-
- /* Call remove to clean up storage for the next test */
- status = psa_ps_remove(uid);
- if (status != PSA_SUCCESS) {
- TEST_FAIL("Remove should not fail with valid UID");
- return;
- }
-
- ret->val = TEST_PASSED;
-}
-
-/**
* \brief Tests remove function with:
* - Valid UID
*/