This commit contains CFSTORE fixes for the following related issues:

- issue 17: Heap corruption.
- issue 23: Handles invalidated when realloc called.
- issue 24: cfstore_find returns error when "previous" parameter is NULL.
- issue 25: Memory leak when out of memory.

With respect to issues 17 and 23:
- A code defect existed for correctly updating cfstore_file_t data structures
  under the following conditions:
  -- the KV memory area contained some KV's.
  -- cfstore calls realloc() to increase the size of the KV area in
     memory because:
	  * A new KV was being added to the KV area, or
	  * the size of a pre-existing KV was being increased.
  -- The returned address from realloc() has changed from before the
     call (i.e. the location in memory of the KV area has changed)
	 e.g. the presence of heap memory objects directly above the KV memory
	 area in the memory address space causes realloc() to move the KV area
	 so the newly increased area can be accommodated at contiguous addresses.
  -- In this scenario, the cfstore_file_t (structures for open files) head pointers
     do not get correctly updated.
  -- The defect was fixed by correctly updating the cfstore_file_t:: head pointer.
  -- A new add_del test case was added to the scenario where a new KV is being added
     to the KV area.
  -- A new create test case was added to the scenario where the size of a
     pre-existing KV is being increased in size.

- A code defect for suppling a NULL handle as the previous argument to the Find() method
  (issue 24).
	-- Supply a null handle is valid, but it was being used to check for a valid hkey,
	   which was incorrect.
	-- A new test case was added to check the case of supplying a NULL previous argument
	   works correctly.

- A code defect for a memory leak under the following conditions (issue 25):
  -- When realloc() fails to perform a requested change to the size of the KV area, the
     error handling sometimes incorrectly sets cfstore_context_t::area_0_head to NULL.
	 Cfstore returns a suitable error to the client. If memory had previously been held
	 at area_0_head, realloc(area_0_head, size) returning NULL means the memory
	 at area_0_head is still retained.
  -- On receiving the error code, the client cleans up including a call to Uninitialize().
     This should free the retained but as area_0_head == NULL this is not possible. Hence
	 a memory leak occurred.
  -- This was fixed by not setting area_0_head = NULL on the realloc() failure.
  -- A create test case was modified to detect the leaking of memory in this way.

Author: simonqhughes

features/storage/FEATURE_STORAGE/TESTS/cfstore/add_del/add_del.cpp

@@ -45,6 +45,8 @@
 
 using namespace utest::v1;
 
+#define CFSTORE_ADD_DEL_MALLOC_SIZE            1024
+
 static char cfstore_add_del_utest_msg_g[CFSTORE_UTEST_MSG_BUF_SIZE];
 
 #ifdef YOTTA_CFG_CFSTORE_UVISOR
@@ -277,11 +279,104 @@ control_t cfstore_add_del_test_04(const size_t call_count)
     return CaseNext;
 }
 
+/** @brief  Delete and attribute after an internal realloc of the cfstore memory area
+ *
+ * This test case goes through the following steps:
+ * 1. Creates attribute att_1 of size x, and write some data. This causes an internal
+ *    cfstore realloc to allocate heap memory for the attribute.
+ * 2. Allocates some memory on the heap. Typically, this will be immediately after the
+ *    memory used by cfstore for the KV area. This means that if any cfstore reallocs are
+ *    made to increase size the memory area will have to move.
+ * 3. Creates attribute att_2 of size y. This causes an internal cfstore realloc to move
+ *    the KV memory area to a new location.
+ * 4. Delete att_1. This causes an internal realloc to shrink the area and tests that the
+ *    internal data structures that contain pointers to different parts of the KV area
+ *    are updated correctly.
+ * 5. Allocates some memory on the heap. If the heap has been corrupted, this will likely trigger
+ *    a crash
+ *
+ * @return on success returns CaseNext to continue to next test case, otherwise will assert on errors.
+ */
+control_t cfstore_add_del_test_05_end(const size_t call_count)
+{
+    char data[] = "some test data";
+    char filename[] = "file1";
+    char filename2[] = "file2";
+    int32_t ret = ARM_DRIVER_ERROR;
+    void *test_buf1 = NULL;
+    void *test_buf2 = NULL;
+    ARM_CFSTORE_DRIVER *cfstoreDriver = &cfstore_driver;
+    ARM_CFSTORE_KEYDESC keyDesc1;
+    ARM_CFSTORE_HANDLE_INIT(hkey1);
+    ARM_CFSTORE_KEYDESC keyDesc2;
+    ARM_CFSTORE_HANDLE_INIT(hkey2);
+    ARM_CFSTORE_SIZE count = sizeof(data);
+
+    CFSTORE_FENTRYLOG("%s:entered\n", __func__);
+    (void) call_count;
+
+    /* step 1 */
+    memset(&keyDesc1, 0, sizeof(keyDesc1));
+    keyDesc1.drl = ARM_RETENTION_NVM;
+    keyDesc1.flags.read = true;
+    keyDesc1.flags.write = true;
+    ret = cfstoreDriver->Create(filename, 1024, &keyDesc1, hkey1);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to create attribute 1 (ret=%d)\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_add_del_utest_msg_g);
+
+    /* Write data to file */
+    ret = cfstoreDriver->Write(hkey1, (const char *)data, &count);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to write to attribute 1 (ret=%d)\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_add_del_utest_msg_g);
+
+    /* step 2 */
+    test_buf1 = malloc(CFSTORE_ADD_DEL_MALLOC_SIZE);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to allocate memory (test_buf1=%p)\n", __func__, test_buf1);
+    TEST_ASSERT_MESSAGE(test_buf1 != NULL, cfstore_add_del_utest_msg_g);
+
+    /* step 3 */
+    memset(&keyDesc2, 0, sizeof(keyDesc2));
+    keyDesc2.drl = ARM_RETENTION_NVM;
+    keyDesc2.flags.read = true;
+    keyDesc2.flags.write = true;
+    ret = cfstoreDriver->Create(filename2, 1024, &keyDesc2, hkey2);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to create attribute 2 (ret=%d)\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_add_del_utest_msg_g);
+
+    /* Write data to file */
+    count = sizeof(data);
+    ret = cfstoreDriver->Write(hkey2, (const char *)data, &count);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to write to attribute 2 (ret=%d)\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_add_del_utest_msg_g);
+
+    /* step 4 */
+    ret = cfstoreDriver->Delete(hkey1);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to delete to attribute 1 (ret=%d)\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_add_del_utest_msg_g);
+
+    ret = cfstoreDriver->Close(hkey1);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to close to attribute 1 (ret=%d)\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_add_del_utest_msg_g);
+
+    /* step 5 */
+    test_buf2 = malloc(CFSTORE_ADD_DEL_MALLOC_SIZE);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to allocate memory (test_buf2=%p)\n", __func__, test_buf2);
+    TEST_ASSERT_MESSAGE(test_buf2 != NULL, cfstore_add_del_utest_msg_g);
+
+    /* clean up */
+    ret = cfstoreDriver->Close(hkey2);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_add_del_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to close to attribute 2 (ret=%d)\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_add_del_utest_msg_g);
+    free(test_buf2);
+    free(test_buf1);
+
+    return CaseNext;
+}
 
 /// @cond CFSTORE_DOXYGEN_DISABLE
 utest::v1::status_t greentea_setup(const size_t number_of_cases)
 {
-    GREENTEA_SETUP(100, "default_auto");
+    GREENTEA_SETUP(300, "default_auto");
     return greentea_test_setup_handler(number_of_cases);
 }
 
@@ -296,6 +391,8 @@ Case cases[] = {
         Case("ADD_DEL_test_03_start", cfstore_utest_default_start),
         Case("ADD_DEL_test_03_end", cfstore_add_del_test_03_end),
         Case("ADD_DEL_test_04", cfstore_add_del_test_04),
+        Case("ADD_DEL_test_05_start", cfstore_utest_default_start),
+        Case("ADD_DEL_test_05_end", cfstore_add_del_test_05_end),
 };
 
 

features/storage/FEATURE_STORAGE/TESTS/cfstore/close/close.cpp

@@ -75,14 +75,14 @@ static control_t cfstore_close_test_00(const size_t call_count)
  *
  * The is a basic test case which does the following:
  * - 01. create a key with handle hkey1
- * - 02. write data of hkey
+ * - 02. write data of hkey1
  * - 03. opens KV with 2nd handle, hkey2
  * - 04. read data with hkey2 and make sure its the same as that written with hkey1
  * - 05. write new data with hkey2
  * - 06. delete hkey2
  * - 07. close hkey2
  * - 08. read hkey1 and make sure the data is the newly written data i.e. the key hasnt
- *     been deleted yet
+ *       been deleted yet
  * - 09. try to open KV and make sure unable to do so, as KV is deleting
  * - 10. close hkey1
  * - 11. try to open KV and make sure unable to do so because its now been deleted

features/storage/FEATURE_STORAGE/TESTS/cfstore/create/create.cpp

@@ -51,6 +51,7 @@ using namespace utest::v1;
 #else
 #define CFSTORE_CREATE_GREENTEA_TIMEOUT_S     60
 #endif
+#define CFSTORE_CREATE_MALLOC_SIZE            1024
 
 static char cfstore_create_utest_msg_g[CFSTORE_UTEST_MSG_BUF_SIZE];
 
@@ -272,15 +273,14 @@ static control_t cfstore_create_test_00(const size_t call_count)
 }
 
 
-/** @brief
+/** @brief  Test case to change the value blob size of pre-existing key.
  *
- * Test case to change the value blob size of pre-existing key.
  * The test does the following:
  * - creates a cfstore with ~10 entries.
- * - for a mid-cfstore entry, grow the value blob size
+ * - for a mid-cfstore entry, double the value blob size.
  * - check all the cfstore entries can be read correctly and their
  *   data agrees with the data supplied upon creation.
- * - grow the mid-entry value blob size to be ~double the initial size.
+ * - shrink the mid-entry value blob size to be ~half the initial size.
  * - check all the cfstore entries can be read correctly and their
  *   data agrees with the data supplied upon creation.
  *
@@ -501,14 +501,13 @@ control_t cfstore_create_test_04_end(const size_t call_count)
     return CaseNext;
 }
 
-/**@brief
- *
- * Test to create ~500 kvs. The amount of data store in the cfstore is as follows:
- * - total = (220*500)+(256/64)*500*501/2 500*8 = 8236000 = 8.236M
+
+/**
+ * @brief   Support function for test cases 05
  *
- * @return on success returns CaseNext to continue to next test case, otherwise will assert on errors.
+ * Create enough KV's to consume the whole of available memory
  */
-control_t cfstore_create_test_05_end(const size_t call_count)
+int32_t cfstore_create_test_05_core(const size_t call_count, uint32_t* bytes_stored_ex)
 {
     int32_t ret = ARM_DRIVER_ERROR;
     uint32_t i = 0;
@@ -523,7 +522,10 @@ control_t cfstore_create_test_05_end(const size_t call_count)
     ARM_CFSTORE_DRIVER* drv = &cfstore_driver;
 
     CFSTORE_FENTRYLOG("%s:entered\n", __func__);
-    (void) call_count;
+
+    /* Initialize() */
+    cfstore_utest_default_start(call_count);
+
     value_buf = (char*) malloc(max_value_buf_size);
     CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: out of memory.\n", __func__);
     TEST_ASSERT_MESSAGE(value_buf != NULL, cfstore_create_utest_msg_g);
@@ -549,6 +551,48 @@ control_t cfstore_create_test_05_end(const size_t call_count)
     free(value_buf);
     CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: Uninitialize() call failed.\n", __func__);
     TEST_ASSERT_MESSAGE(drv->Uninitialize() >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+    if(bytes_stored_ex){
+        *bytes_stored_ex = bytes_stored;
+    }
+    return ret;
+}
+
+
+/**
+ * @brief   Test case to check cfstore recovers from out of memory
+ *          errors without leaking memory
+ *
+ * This test case does the following:
+ * 1. Start loop.
+ * 2. Initializes CFSTORE.
+ * 3. Creates as many KVs as required to run out of memory. The number of bytes B
+ *    allocated before running out of memory is recorded.
+ * 4. For loop i, check that B_i =  B_i-1 for i>0 i.e. that no memory has been leaked
+ * 5. Uninitialize(), which should clean up any cfstore internal state including
+ *    freeing the internal memeory area.
+ * 6. Repeat from step 1 N times.
+ */
+control_t cfstore_create_test_05(const size_t call_count)
+{
+    uint32_t i = 0;
+    int32_t ret = ARM_DRIVER_ERROR;
+    uint32_t bytes_stored = 0;
+    uint32_t bytes_stored_prev = 0;
+    const uint32_t max_loops = 50;
+
+    CFSTORE_FENTRYLOG("%s:entered\n", __func__);
+    for(i = 0; i < max_loops; i++) {
+        ret = cfstore_create_test_05_core(call_count, &bytes_stored);
+        CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: cfstore_create_test_05_core() failed (ret = %d.\n", __func__, (int) ret);
+        TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+
+        if(i > 1) {
+            CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: memory leak: stored %d bytes on loop %d, but %d bytes on loop %d .\n", __func__, (int) bytes_stored, (int) i, (int) bytes_stored_prev, (int) i-1);
+            TEST_ASSERT_MESSAGE(bytes_stored == bytes_stored_prev, cfstore_create_utest_msg_g);
+
+        }
+        bytes_stored_prev = bytes_stored;
+    }
     return CaseNext;
 }
 
@@ -580,9 +624,8 @@ cfstore_create_key_name_validate_t cfstore_create_test_06_data[] = {
 /// @endcond
 
 
-/**@brief
- *
- * Test whether a key name can be created or not.
+/**
+ * @brief   Test whether a key name can be created or not.
  *
  * @param	key_name
  * 			name of the key to create in the store
@@ -663,6 +706,109 @@ control_t cfstore_create_test_06_end(const size_t call_count)
     return CaseNext;
 }
 
+
+/** @brief  Test case to change the value blob size of pre-existing
+ *          key in a way that causes the memory area to realloc-ed,
+ *
+ * The test is a modified version of cfstore_create_test_01_end which
+ *  - creates KVs,
+ *  - mallocs a memory object on the heap
+ *  - increases the size of one of the existing KVs, causing the
+ *    internal memory area to be realloc-ed.
+ *
+ * In detail, the test does the following:
+ * 1. creates a cfstore with ~10 entries. This causes the configuration
+ *    store to realloc() heap memory for KV storage.
+ * 2. mallocs a memory object on heap.
+ * 3. for a mid-cfstore entry, double the value blob size. This will cause the
+ *    cfstore memory area to be realloced.
+ * 4. check all the cfstore entries can be read correctly and their
+ *    data agrees with the data supplied upon creation.
+ * 5. shrink the mid-entry value blob size to be ~half the initial size.
+ *    check all the cfstore entries can be read correctly and their
+ *    data agrees with the data supplied upon creation.
+ *
+ * @return on success returns CaseNext to continue to next test case, otherwise will assert on errors.
+ */
+control_t cfstore_create_test_07_end(const size_t call_count)
+{
+    int32_t ret = ARM_DRIVER_ERROR;
+    void *test_buf1 = NULL;
+    ARM_CFSTORE_FMODE flags;
+    cfstore_kv_data_t* node = NULL;
+    ARM_CFSTORE_DRIVER* drv = &cfstore_driver;
+
+    CFSTORE_FENTRYLOG("%s:entered\n", __func__);
+    (void) call_count;
+    memset(&flags, 0, sizeof(flags));
+
+    /* step 1 */
+    ret = cfstore_test_create_table(cfstore_create_test_01_data_step_01);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Failed to add cfstore_create_test_01_data_head (ret=%d).\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+
+    /* step 2 */
+    test_buf1 = malloc(CFSTORE_CREATE_MALLOC_SIZE);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to allocate memory (test_buf1=%p)\n", __func__, test_buf1);
+    TEST_ASSERT_MESSAGE(test_buf1 != NULL, cfstore_create_utest_msg_g);
+
+    /* step 3. find cfstore_create_test_01_data[0] and grow the KV MID_ENTRY_01 to MID_ENTRY_02 */
+    ret = cfstore_create_test_KV_change(&cfstore_create_test_01_data[0], &cfstore_create_test_01_data[1]);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Failed to increase size of KV (ret=%d).\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+
+    /* step 4. Now check that the KVs are all present and correct */
+    node = cfstore_create_test_01_data_step_02;
+    while(node->key_name != NULL)
+    {
+        ret = cfstore_test_check_node_correct(node);
+        CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:node (key_name=\"%s\", value=\"%s\") not correct in cfstore\n", __func__, node->key_name, node->value);
+        TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+        node++;
+    }
+    /* revert CFSTORE_LOG for more trace */
+    CFSTORE_DBGLOG("KV successfully increased in size and other KVs remained unchanged.%s", "\n");
+
+    /* Shrink the KV from KV MID_ENTRY_02 to MID_ENTRY_03 */
+    ret = cfstore_create_test_KV_change(&cfstore_create_test_01_data[1], &cfstore_create_test_01_data[2]);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Failed to decrease size of KV (ret=%d).\n", __func__, (int) ret);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+
+    /* Step 5. Now check that the KVs are all present and correct */
+    node = cfstore_create_test_01_data_step_03;
+    while(node->key_name != NULL)
+    {
+        ret = cfstore_test_check_node_correct(node);
+        CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:node (key_name=\"%s\", value=\"%s\") not correct in cfstore\n", __func__, node->key_name, node->value);
+        TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+        node++;
+    }
+    /* revert CFSTORE_LOG for more trace */
+    CFSTORE_DBGLOG("KV successfully decreased in size and other KVs remained unchanged.%s", "\n");
+
+    /* Delete the KV */
+    ret = cfstore_test_delete(cfstore_create_test_01_data[2].key_name);
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:failed to delete node(key_name=\"%s\")\n", __func__, node->key_name);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+
+    /* Now check that the KVs are all present and correct */
+    node = cfstore_create_test_01_data_step_04;
+    while(node->key_name != NULL)
+    {
+        ret = cfstore_test_check_node_correct(node);
+        CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:node (key_name=\"%s\", value=\"%s\") not correct in cfstore\n", __func__, node->key_name, node->value);
+        TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+        node++;
+    }
+
+    free(test_buf1);
+    ret = drv->Uninitialize();
+    CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: Uninitialize() call failed.\n", __func__);
+    TEST_ASSERT_MESSAGE(ret >= ARM_DRIVER_OK, cfstore_create_utest_msg_g);
+    return CaseNext;
+}
+
+
 /// @cond CFSTORE_DOXYGEN_DISABLE
 utest::v1::status_t greentea_setup(const size_t number_of_cases)
 {
@@ -682,10 +828,11 @@ Case cases[] = {
         Case("CREATE_test_03_end", cfstore_create_test_03_end),
         Case("CREATE_test_04_start", cfstore_utest_default_start),
         Case("CREATE_test_04_end", cfstore_create_test_04_end),
-        Case("CREATE_test_05_start", cfstore_utest_default_start),
-        Case("CREATE_test_05_end", cfstore_create_test_05_end),
+        Case("CREATE_test_05", cfstore_create_test_05),
         Case("CREATE_test_06_start", cfstore_utest_default_start),
         Case("CREATE_test_06_end", cfstore_create_test_06_end),
+        Case("CREATE_test_07_start", cfstore_utest_default_start),
+        Case("CREATE_test_07_end", cfstore_create_test_07_end),
 };