Fix SDFS tests

SDFS, SPIFFS, and LittleFS now all share the same common set of tests,
greatly increasing the SDFS test coverage.

Author: earlephilhower

libraries/ESP8266SdFat

@@ -17,5 +17,5 @@
 #include "../../../libraries/SDFS/src/SDFS.h"
 
 #define SDSIZE 16LL
-uint64_t _sdCardSizeB = SDSIZE * 1024LL * 1024LL;
-uint8_t _sdCard[SDSIZE * 1024LL * 1024LL];
+uint64_t _sdCardSizeB = 0;
+uint8_t *_sdCard = nullptr;

tests/host/common/sdfs_mock.cpp

@@ -28,7 +28,16 @@ class SDFSMock {
     ~SDFSMock() { }
 };
 
-#define SDFS_MOCK_DECLARE(size_kb, block_kb, page_b, storage) SDFSMock sdfs_mock(size_kb * 1024, block_kb * 1024, page_b, storage); SDFS.format();
+extern uint64_t _sdCardSizeB;
+extern uint8_t *_sdCard;
+
+#define SDFS_MOCK_DECLARE(size_kb, block_kb, page_b, storage) \
+    SDFS.end(); \
+    SDFSMock sdfs_mock(size_kb * 1024, block_kb * 1024, page_b, storage); free(_sdCard); \
+    _sdCardSizeB = size_kb ? 16 * 1024 * 1024 : 0; \
+    if (_sdCardSizeB) _sdCard = (uint8_t*)calloc(_sdCardSizeB, 1); \
+    else _sdCard = nullptr; \
+    SDFS.setConfig(SDFSConfig().setAutoFormat(true));
 #define SDFS_MOCK_RESET() sdfs_mock.reset()
 
 #endif /* spiffs_mock_hpp */

tests/host/common/sdfs_mock.h

@@ -24,6 +24,7 @@
 #include "../../../libraries/SDFS/src/SDFS.h"
 #include "../../../libraries/SD/src/SD.h"
 
+#if 1
 namespace spiffs_test {
 #define FSTYPE SPIFFS
 #define TESTPRE "SPIFFS - "
@@ -89,13 +90,16 @@ TEST_CASE("LittleFS checks the config object passed in", "[fs]")
 }
 
 };
-
+#endif
 namespace sdfs_test {
 #define FSTYPE SDFS
 #define TESTPRE "SDFS - "
 #define TESTPAT "[sdfs]"
-// SDFS routines strip leading slashes before doing anything, so up to 31 char names are allowable
-#define TOOLONGFILENAME "/12345678901234567890123456789012"
+// SDFS supports long paths (MAXPATH)
+#define TOOLONGFILENAME "/" \
+	"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" \
+	"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" \
+	"12345678901234567890123456789012345678901234567890123456"
 #define FS_MOCK_DECLARE SDFS_MOCK_DECLARE
 #define FS_MOCK_RESET SDFS_MOCK_RESET
 #define FS_HAS_DIRS
@@ -118,7 +122,7 @@ TEST_CASE("SDFS checks the config object passed in", "[fs]")
     REQUIRE_FALSE(SDFS.setConfig(f));
     REQUIRE_FALSE(SDFS.setConfig(s));
     REQUIRE(SDFS.setConfig(d));
-    REQUIRE_FALSE(LittleFS.setConfig(l));
+    REQUIRE_FALSE(SDFS.setConfig(l));
 }
 
 };

tests/host/fs/test_fs.cpp

@@ -96,7 +96,9 @@ TEST_CASE(TESTPRE "Filesystem is empty after format", TESTPAT)
     REQUIRE(FSTYPE.begin());
     createFile("/1", "first");
     createFile("/2", "second");
+    FSTYPE.end();
     REQUIRE(FSTYPE.format());
+    REQUIRE(FSTYPE.begin());
     Dir root = FSTYPE.openDir("/");
     size_t count = 0;
     while (root.next()) {
@@ -161,6 +163,7 @@ TEST_CASE(TESTPRE "truncate", TESTPAT)
 
 #ifdef FS_HAS_DIRS
 
+#if FSTYPE != SDFS
 // We silently make subdirectories if they do not exist and silently remove
 // them when they're no longer needed, so make sure we can clean up after
 // ourselves.  At some point we may drop this and go to normal POSIX mkdir
@@ -189,6 +192,7 @@ TEST_CASE(TESTPRE "Removing all files in a subdir removes that subdir", TESTPAT)
     REQUIRE(files.size() == 3);
     REQUIRE(files.find("subdir") == std::end(files));
 }
+#endif
 
 // LittleFS openDir is slightly different than SPIFFS.  In SPIFFS there
 // are no directories and "/" is just another character, so "/a/b/c" is a