#63 Remove mocks to instead mock IDF-functions at a lower layer.

PerMalmberg · Aug 26, 2019 · 2ef619a · 2ef619a
1 parent 2fc6339
commit 2ef619a
Show file tree

Hide file tree

Showing 22 changed files with 11 additions and 595 deletions.
diff --git a/lib/files.cmake b/lib/files.cmake
@@ -124,12 +124,6 @@ set(SMOOTH_SOURCES
         ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/SystemStatistics.h
         ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/filesystem/Path.h
         ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/filesystem/MountPoint.h
-        ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/io/mock/Input.h
-        ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/io/mock/Output.h
-        ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/filesystem/mock/SDCard.h
-        ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/filesystem/mock/MMCSDCard.h
-        ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/filesystem/mock/SPISDCard.h
-        ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/filesystem/mock/SPIFlash.h
         ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/core/sntp/Sntp.h
         ${CMAKE_CURRENT_LIST_DIR}/smooth/application/security/PasswordHash.cpp
         ${CMAKE_CURRENT_LIST_DIR}/smooth/include/smooth/application/security/PasswordHash.h

diff --git a/lib/smooth/include/smooth/core/filesystem/MMCSDCard.h b/lib/smooth/include/smooth/core/filesystem/MMCSDCard.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#ifndef ESP_PLATFORM
-#include "mock/MMCSDCard.h"
-#else
 #include "SDCard.h"
 #include "driver/sdmmc_host.h"
 
@@ -50,4 +47,3 @@ namespace smooth::core::filesystem
             gpio_num_t write_protect;
     };
 }
-#endif
diff --git a/lib/smooth/include/smooth/core/filesystem/SDCard.h b/lib/smooth/include/smooth/core/filesystem/SDCard.h
@@ -17,11 +17,6 @@
 #pragma once
 
 #include "MountPoint.h"
-
-#ifndef ESP_PLATFORM
-#include "mock/SDCard.h"
-#else
-
 #include <sdmmc_cmd.h>
 
 #pragma GCC diagnostic push
@@ -63,5 +58,4 @@ namespace smooth::core::filesystem
             bool initialized{};
         private:
     };
-}
-#endif
+}
diff --git a/lib/smooth/include/smooth/core/filesystem/SPIFlash.h b/lib/smooth/include/smooth/core/filesystem/SPIFlash.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#ifndef ESP_PLATFORM
-#include "mock/SPIFlash.h"
-#else
-
 #include "esp_vfs.h"
 
 #pragma GCC diagnostic push
@@ -67,5 +63,4 @@ namespace smooth::core::filesystem
             bool format_on_mount_failure;
             wl_handle_t wl_instance = WL_INVALID_HANDLE;
     };
-}
-#endif
+}
diff --git a/lib/smooth/include/smooth/core/filesystem/SPISDCard.h b/lib/smooth/include/smooth/core/filesystem/SPISDCard.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#ifndef ESP_PLATFORM
-#include "mock/SPISDCard.h"
-#else
-
 #include "SDCard.h"
 #include <driver/gpio.h>
 #include "MountPoint.h"
@@ -48,6 +44,4 @@ namespace smooth::core::filesystem
             gpio_num_t write_protect;
             sdmmc_card_t* card;
     };
-}
-
-#endif
+}
diff --git a/lib/smooth/include/smooth/core/filesystem/mock/MMCSDCard.h b/lib/smooth/include/smooth/core/filesystem/mock/MMCSDCard.h
diff --git a/lib/smooth/include/smooth/core/filesystem/mock/SDCard.h b/lib/smooth/include/smooth/core/filesystem/mock/SDCard.h
diff --git a/lib/smooth/include/smooth/core/filesystem/mock/SPIFlash.h b/lib/smooth/include/smooth/core/filesystem/mock/SPIFlash.h
diff --git a/lib/smooth/include/smooth/core/filesystem/mock/SPISDCard.h b/lib/smooth/include/smooth/core/filesystem/mock/SPISDCard.h
diff --git a/lib/smooth/include/smooth/core/io/Input.h b/lib/smooth/include/smooth/core/io/Input.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#ifndef ESP_PLATFORM
-#include "mock/Input.h"
-#else
 #include <driver/gpio.h>
 
 namespace smooth::core::io
@@ -42,5 +39,4 @@ namespace smooth::core::io
         protected:
             gpio_num_t io;
     };
-}
-#endif
+}
diff --git a/lib/smooth/include/smooth/core/io/InterruptEvent.h b/lib/smooth/include/smooth/core/io/InterruptEvent.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#ifndef ESP_PLATFORM
-    #include "mock/gpio.h"
-#else
-    #include <driver/gpio.h>
-#endif
+
+#include <driver/gpio.h>
 
 namespace smooth::core::io
 {

diff --git a/lib/smooth/include/smooth/core/io/InterruptInput.h b/lib/smooth/include/smooth/core/io/InterruptInput.h
@@ -18,10 +18,6 @@
 
 #include "InterruptEvent.h"
 
-#ifndef ESP_PLATFORM
-#include "mock/InterruptInput.h"
-#else
-
 #include "Input.h"
 #include <smooth/core/ipc/IISRTaskEventQueue.h>
 #include <memory>
@@ -55,5 +51,4 @@ namespace smooth::core::io
         private:
             std::weak_ptr<ipc::IISRTaskEventQueue<InterruptInputEvent>> queue;
     };
-}
-#endif
+}
diff --git a/lib/smooth/include/smooth/core/io/Output.h b/lib/smooth/include/smooth/core/io/Output.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#ifndef ESP_PLATFORM
-#include "mock/Output.h"
-#else
 #include <driver/gpio.h>
 
 namespace smooth::core::io
@@ -42,6 +39,4 @@ namespace smooth::core::io
             gpio_num_t io;
             bool active_high;
     };
-}
-
-#endif
+}