Skip to content

Commit 0964775

Browse files
gekygeky
committed
Adopted HeapBlockDevice in the filesystem tests
1 parent f17c7dc commit 0964775

File tree

2 files changed

+10
-178
lines changed

2 files changed

+10
-178
lines changed

‎features/TESTS/filesystem/basic/basic.cpp

Lines changed: 5 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@
4646
*/
4747

4848
#include "mbed.h"
49-
#include "SDFileSystem.h"
5049
#include "test_env.h"
5150

51+
#include "HeapBlockDevice.h"
52+
#include "FATFileSystem.h"
53+
5254
#include "utest/utest.h"
5355
#include "unity/unity.h"
5456
#include "greentea-client/test_env.h"
@@ -59,71 +61,9 @@
5961

6062
using namespace utest::v1;
6163

62-
/* DEVICE_SPI
63-
* This symbol is defined in targets.json if the target has a SPI interface, which is required for SDCard support.
64-
* FSFAT_SDCARD_INSTALLTED
65-
* For testing purposes, an SDCard must be installed on the target for the test cases in this file to succeed.
66-
* If the target has an SD card installed then uncomment the #define FSFAT_SDCARD_INSTALLED directive for the target.
67-
*/
68-
/* #define FSFAT_SDCARD_INSTALLED */
69-
#if defined(DEVICE_SPI) && defined(FSFAT_SDCARD_INSTALLED)
70-
71-
#if defined(TARGET_KL25Z)
72-
SDFileSystem sd(PTD2, PTD3, PTD1, PTD0, "sd");
73-
74-
#elif defined(TARGET_KL46Z) || defined(TARGET_KL43Z)
75-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
76-
77-
#elif defined(TARGET_K64F) || defined(TARGET_K66F)
78-
SDFileSystem sd(PTE3, PTE1, PTE2, PTE4, "sd");
79-
80-
#elif defined(TARGET_K22F)
81-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
82-
83-
#elif defined(TARGET_K20D50M)
84-
SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
85-
86-
#elif defined(TARGET_nRF51822)
87-
SDFileSystem sd(p12, p13, p15, p14, "sd");
88-
89-
#elif defined(TARGET_NUCLEO_F030R8) || \
90-
defined(TARGET_NUCLEO_F070RB) || \
91-
defined(TARGET_NUCLEO_F072RB) || \
92-
defined(TARGET_NUCLEO_F091RC) || \
93-
defined(TARGET_NUCLEO_F103RB) || \
94-
defined(TARGET_NUCLEO_F302R8) || \
95-
defined(TARGET_NUCLEO_F303RE) || \
96-
defined(TARGET_NUCLEO_F334R8) || \
97-
defined(TARGET_NUCLEO_F401RE) || \
98-
defined(TARGET_NUCLEO_F410RB) || \
99-
defined(TARGET_NUCLEO_F411RE) || \
100-
defined(TARGET_NUCLEO_L053R8) || \
101-
defined(TARGET_NUCLEO_L073RZ) || \
102-
defined(TARGET_NUCLEO_L152RE)
103-
SDFileSystem sd(D11, D12, D13, D10, "sd");
104-
105-
#elif defined(TARGET_DISCO_F051R8) || \
106-
defined(TARGET_NUCLEO_L031K6)
107-
SDFileSystem sd(SPI_MOSI, SPI_MISO, SPI_SCK, SPI_CS, "sd");
108-
109-
#elif defined(TARGET_LPC2368)
110-
SDFileSystem sd(p11, p12, p13, p14, "sd");
111-
112-
#elif defined(TARGET_LPC11U68)
113-
SDFileSystem sd(D11, D12, D13, D10, "sd");
11464

115-
#elif defined(TARGET_LPC1549)
116-
SDFileSystem sd(D11, D12, D13, D10, "sd");
117-
118-
#elif defined(TARGET_RZ_A1H)
119-
SDFileSystem sd(P8_5, P8_6, P8_3, P8_4, "sd");
120-
121-
#elif defined(TARGET_LPC11U37H_401)
122-
SDFileSystem sd(SDMOSI, SDMISO, SDSCLK, SDSSEL, "sd");
123-
124-
#else
125-
#error "[NOT SUPPORTED] Instantiate SDFileSystem sd(p11, p12, p13, p14, "sd") with the correct pin specification for target"
126-
#endif
65+
HeapBlockDevice bd(512, 256);
66+
FATFileSystem sd("sd", &bd);
12767

12868

12969
#define FSFAT_BASIC_TEST_00 fsfat_basic_test_00
@@ -385,23 +325,6 @@ static control_t fsfat_basic_test_02() {
385325
}
386326

387327

388-
#else
389-
390-
#define FSFAT_BASIC_TEST_00 fsfat_basic_test_dummy
391-
#define FSFAT_BASIC_TEST_01 fsfat_basic_test_dummy
392-
#define FSFAT_BASIC_TEST_02 fsfat_basic_test_dummy
393-
394-
/** @brief fsfat_basic_test_dummy Dummy test case for testing when platform doesnt have an SDCard installed.
395-
*
396-
* @return success always
397-
*/
398-
static control_t fsfat_basic_test_dummy()
399-
{
400-
printf("Null test\n");
401-
return CaseNext;
402-
}
403-
404-
#endif /* defined(DEVICE_SPI) && defined(FSFAT_SDCARD_INSTALLED) */
405328

406329
utest::v1::status_t greentea_setup(const size_t number_of_cases)
407330
{

‎features/TESTS/filesystem/fopen/fopen.cpp

Lines changed: 5 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@
2222
*/
2323

2424
#include "mbed.h"
25-
#include "SDFileSystem.h"
2625
#include "fsfat_debug.h"
2726
#include "fsfat_test.h"
2827
#include "utest/utest.h"
2928
#include "unity/unity.h"
3029
#include "greentea-client/test_env.h"
3130

31+
#include "HeapBlockDevice.h"
32+
#include "FATFileSystem.h"
33+
3234
#include <stdio.h>
3335
#include <string.h>
3436
#include <stdlib.h> /*rand()*/
@@ -46,74 +48,10 @@ using namespace utest::v1;
4648
/// @endcond
4749

4850

49-
/* DEVICE_SPI
50-
* This symbol is defined in targets.json if the target has a SPI interface, which is required for SDCard support.
51-
* FSFAT_SDCARD_INSTALLTED
52-
* For testing purposes, an SDCard must be installed on the target for the test cases in this file to succeed.
53-
* If the target has an SD card installed then uncomment the #define FSFAT_SDCARD_INSTALLED directive for the target.
54-
*/
55-
/* #define FSFAT_SDCARD_INSTALLED */
56-
#if defined(DEVICE_SPI) && defined(FSFAT_SDCARD_INSTALLED)
57-
5851
static char fsfat_fopen_utest_msg_g[FSFAT_UTEST_MSG_BUF_SIZE];
5952

60-
#if defined(TARGET_KL25Z)
61-
SDFileSystem sd(PTD2, PTD3, PTD1, PTD0, "sd");
62-
63-
#elif defined(TARGET_KL46Z) || defined(TARGET_KL43Z)
64-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
65-
66-
#elif defined(TARGET_K64F) || defined(TARGET_K66F)
67-
SDFileSystem sd(PTE3, PTE1, PTE2, PTE4, "sd");
68-
69-
#elif defined(TARGET_K22F)
70-
SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
71-
72-
#elif defined(TARGET_K20D50M)
73-
SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
74-
75-
#elif defined(TARGET_nRF51822)
76-
SDFileSystem sd(p12, p13, p15, p14, "sd");
77-
78-
#elif defined(TARGET_NUCLEO_F030R8) || \
79-
defined(TARGET_NUCLEO_F070RB) || \
80-
defined(TARGET_NUCLEO_F072RB) || \
81-
defined(TARGET_NUCLEO_F091RC) || \
82-
defined(TARGET_NUCLEO_F103RB) || \
83-
defined(TARGET_NUCLEO_F302R8) || \
84-
defined(TARGET_NUCLEO_F303RE) || \
85-
defined(TARGET_NUCLEO_F334R8) || \
86-
defined(TARGET_NUCLEO_F401RE) || \
87-
defined(TARGET_NUCLEO_F410RB) || \
88-
defined(TARGET_NUCLEO_F411RE) || \
89-
defined(TARGET_NUCLEO_L053R8) || \
90-
defined(TARGET_NUCLEO_L073RZ) || \
91-
defined(TARGET_NUCLEO_L152RE)
92-
SDFileSystem sd(D11, D12, D13, D10, "sd");
93-
94-
95-
#elif defined(TARGET_DISCO_F051R8) || \
96-
defined(TARGET_NUCLEO_L031K6)
97-
SDFileSystem sd(SPI_MOSI, SPI_MISO, SPI_SCK, SPI_CS, "sd");
98-
99-
#elif defined(TARGET_LPC2368)
100-
SDFileSystem sd(p11, p12, p13, p14, "sd");
101-
102-
#elif defined(TARGET_LPC11U68)
103-
SDFileSystem sd(D11, D12, D13, D10, "sd");
104-
105-
#elif defined(TARGET_LPC1549)
106-
SDFileSystem sd(D11, D12, D13, D10, "sd");
107-
108-
#elif defined(TARGET_RZ_A1H)
109-
SDFileSystem sd(P8_5, P8_6, P8_3, P8_4, "sd");
110-
111-
#elif defined(TARGET_LPC11U37H_401)
112-
SDFileSystem sd(SDMOSI, SDMISO, SDSCLK, SDSSEL, "sd");
113-
114-
#else
115-
#error "[NOT SUPPORTED] Instantiate SDFileSystem sd(p11, p12, p13, p14, "sd") with the correct pin specification for target"
116-
#endif
53+
HeapBlockDevice bd(512, 256);
54+
FATFileSystem sd("sd", &bd);
11755

11856

11957
#define FSFAT_FOPEN_TEST_01 fsfat_fopen_test_01
@@ -351,8 +289,6 @@ static control_t fsfat_fopen_test_01(const size_t call_count)
351289
return CaseNext;
352290
}
353291

354-
#ifdef NOT_DEFINED
355-
356292
static fsfat_kv_data_t fsfat_fopen_test_02_data[] = {
357293
FSFAT_INIT_1_TABLE_MID_NODE,
358294
{ NULL, NULL},
@@ -793,29 +729,6 @@ control_t fsfat_fopen_test_07(const size_t call_count)
793729
return CaseNext;
794730
}
795731

796-
#endif // NOT_DEFINED
797-
798-
#else
799-
800-
#define FSFAT_FOPEN_TEST_01 fsfat_fopen_test_dummy
801-
#define FSFAT_FOPEN_TEST_02 fsfat_fopen_test_dummy
802-
#define FSFAT_FOPEN_TEST_03 fsfat_fopen_test_dummy
803-
#define FSFAT_FOPEN_TEST_04 fsfat_fopen_test_dummy
804-
#define FSFAT_FOPEN_TEST_05 fsfat_fopen_test_dummy
805-
#define FSFAT_FOPEN_TEST_06 fsfat_fopen_test_dummy
806-
#define FSFAT_FOPEN_TEST_07 fsfat_fopen_test_dummy
807-
808-
/** @brief fsfat_fopen_test_dummy Dummy test case for testing when platform doesnt have an SDCard installed.
809-
*
810-
* @return success always
811-
*/
812-
static control_t fsfat_fopen_test_dummy()
813-
{
814-
printf("Null test\n");
815-
return CaseNext;
816-
}
817-
818-
#endif /* defined(DEVICE_SPI) && defined(FSFAT_SDCARD_INSTALLED) */
819732

820733

821734
/// @cond FSFAT_DOXYGEN_DISABLE
@@ -829,16 +742,12 @@ Case cases[] = {
829742
/* 1 2 3 4 5 6 7 */
830743
/* 1234567890123456789012345678901234567890123456789012345678901234567890 */
831744
Case("FOPEN_test_01", FSFAT_FOPEN_TEST_01)
832-
833-
#ifdef NOT_DEFINED
834745
Case("FOPEN_test_02", FSFAT_FOPEN_TEST_02),
835746
Case("FOPEN_test_03", FSFAT_FOPEN_TEST_03),
836747
Case("FOPEN_test_04", FSFAT_FOPEN_TEST_04),
837748
Case("FOPEN_test_05", FSFAT_FOPEN_TEST_05),
838749
Case("FOPEN_test_06", FSFAT_FOPEN_TEST_06),
839750
Case("FOPEN_test_07", FSFAT_FOPEN_TEST_07),
840-
#endif // NOT_DEFINED
841-
842751
};
843752

844753

0 commit comments

Comments
 (0)