fixes on tests

Author: cristidragomir97

extras/tests/TestExisting/TestExisting.ino

@@ -1,8 +1,8 @@
-#include <Arduino_UnifiedStorage.h>
-#include "Utils.h"
 
 #define ARDUINO_UNIFIED_STORAGE_DEBUG
 
+#include <Arduino_UnifiedStorage.h>
+
 
 InternalStorage internalStorage = InternalStorage();
 
@@ -19,10 +19,8 @@ void setup() {
 
 
 
-
-    internalStorage.format(FS_LITTLEFS);
     internalStorage.begin();
-   c
+   
 
     Folder root = internalStorage.getRootFolder();
 
@@ -34,10 +32,13 @@ void setup() {
 
     debugPrint("Trying to create a folder on top of an existing one... without overwrite");
     Folder sourceFolder3 =  root.createSubfolder("source_folder");
+   
 
     debugPrint("Trying to create a folder on top of an existing one... with overwrite");
     Folder sourceFolder4 =  root.createSubfolder("source_folder", true);
 
+
+
     Folder destinationFolder2 = root.createSubfolder("destination_folder");
     debugPrint("Folder 2 created");
 
@@ -51,8 +52,6 @@ void setup() {
     }
 
 
-
-
     // Test moveTo
     Folder sourceFolder =  root.createSubfolder("source");
     Folder destinationFolder = root.createSubfolder("destination");
@@ -76,10 +75,10 @@ void setup() {
 
 
     bool success = someFile.copyTo(someOtherFolder);
-    debugPrint("trying to copy file without overwrite: %d", success);
+    debugPrint("trying to copy file without overwrite: " + String(success));
 
     success = someFile.copyTo(someOtherFolder,true);
-    debugPrint("trying to copy file with overwrite: %d ", success);
+    debugPrint("trying to copy file with overwrite: " + String(success));
 
 }
 

extras/tests/TestFileOperations/TestFileOperations.ino

@@ -1,8 +1,7 @@
+#define ARDUINO_UNIFIED_STORAGE_DEBUG
+
 #include <Arduino_UnifiedStorage.h>
-#include "Boards.h"
-#include "Utils.h"
 
-#define ARDUINO_UNIFIED_STORAGE_DEBUG
 
 #if defined(HAS_USB)
 USBStorage usb = USBStorage();

extras/tests/TestFolderOperations/TestFolderOperations.ino

@@ -1,8 +1,10 @@
+#define ARDUINO_UNIFIED_STORAGE_DEBUG
+
 #include <Arduino_UnifiedStorage.h>
 #include "Boards.h"
 #include "Utils.h"
 
-#define ARDUINO_UNIFIED_STORAGE_DEBUG
+
 
 #if defined(HAS_USB)
 USBStorage usb = USBStorage();
@@ -16,29 +18,6 @@ SDStorage sd = SDStorage();
 InternalStorage internal = InternalStorage();
 #endif
 
-void printFolderContents(Folder dir, int indentation = 0) {
-  std::vector<Folder> directories = dir.getFolders();
-  std::vector<UFile>files = dir.getFiles();
-
-  // Print directories
-  for (Folder subdir : directories) {
-    for (int i = 0; i < indentation; i++) {
-      debugPrint("  ");
-    }
-    debugPrint("[D] ");
-    debugPrint(subdir.getPath());
-    printFolderContents(subdir, indentation + 1);
-  }
-
-  // Print files
-  for (UFile file : files) {
-    for (int i = 0; i < indentation; i++) {
-      debugPrint("  ");
-    }
-    debugPrint("[F] ");
-    debugPrint(file.getPath());
-  }
-}
 
 
 bool testFolderCreation(Folder root) {
@@ -141,8 +120,6 @@ void runTests(Arduino_UnifiedStorage * storage, String storageType) {
         testCopyingFolder(root);
         testMovingFolder(root);
 
-        debugPrint("========= FS Contents after Folder Tests =========");
-        printFolderContents(root);
         storage->unmount();
         debugPrint("");
     }
@@ -156,15 +133,14 @@ void setup(){
         beginRS485(115200);
     #endif 
 
-    
-    #if defined(HAS_USB)
-        runTests(&usb, "USB");
-    #endif 
-
     #if defined(HAS_QSPI)
         runTests(&internal, "QSPI");
     #endif 
 
+    #if defined(HAS_USB)
+        runTests(&usb, "USB");
+    #endif 
+
     #if defined(HAS_SD)
         runTests(&sd, "SD");
     #endif 

extras/tests/TestRepeatedFormatMount/TestRepeatedFormatMount.ino

@@ -1,8 +1,5 @@
-#include <Arduino_UnifiedStorage.h>
-#include "Utils.h"
-#include "Boards.h"
-
 #define ARDUINO_UNIFIED_STORAGE_DEBUG
+#include <Arduino_UnifiedStorage.h>
 
 #if defined(HAS_USB)
 USBStorage usb = USBStorage();
@@ -24,9 +21,9 @@ void runRepeatedMountTest(Arduino_UnifiedStorage * storage, String storageType,
 
     debugPrint("Mounting drive"); 
     if(mountResult != 1) {
-      debugPrint(mountResult);
-      debugPrint(getErrno());
-      
+      debugPrint("Mounting drive failed: " + String(getErrno()));
+    } else {
+      debugPrint("Successfully mounted"); 
     }
 
     Folder root = storage->getRootFolder();
@@ -39,9 +36,7 @@ void runRepeatedMountTest(Arduino_UnifiedStorage * storage, String storageType,
 
     int umountResult = storage->unmount();
     if(!umountResult) {
-      debugPrint("Unmounting drive"); 
-      debugPrint(umountResult);
-      debugPrint(getErrno());
+      debugPrint("Unmounting drive failed: " + String(getErrno())); 
     } else {
       debugPrint("Successfully unmounted"); 
     }
@@ -89,13 +84,13 @@ void setup(){
     #if defined(HAS_SD)
     debugPrint("RUNNING FORMAT AND REPEATED MOUNT - SD Card");
     debugPrint("Formatting SD drive as LittleFS: " + String(sd.format(FS_LITTLEFS)));
-    runRepeatedMountTest(&&sd, "SD");
+    runRepeatedMountTest(&sd, "SD");
     debugPrint("Formatting SD drive as FAT32: " + String(sd.format(FS_FAT)));
-    runRepeatedMountTest(&&sd, "SD");
+    runRepeatedMountTest(&sd, "SD");
     debugPrint("Formatting SD drive as LittleFS again: " + String(sd.format(FS_LITTLEFS)));
-    runRepeatedMountTest(&&sd, "SD");
+    runRepeatedMountTest(&sd, "SD");
     debugPrint("Formatting SD drive as FAT32 again: " + String(sd.format(FS_FAT)));
-    runRepeatedMountTest(&&sd, "SD");
+    runRepeatedMountTest(&sd, "SD");
     #endif