Fixing a couple of issues within StreamMock so that it's now fully functional

aentinger · aentinger · commit abee6d1a059d · 2020-11-04T11:45:03.000+01:00
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -48,6 +48,7 @@ set(TEST_SRCS
   src/Ringbuffer/test_read_char.cpp
   src/Ringbuffer/test_store_char.cpp
   src/Stream/test_getTimeout.cpp
+  src/Stream/test_readString.cpp
   src/Stream/test_setTimeout.cpp
   src/String/test_concat.cpp
   src/String/test_operators.cpp
@@ -91,8 +92,9 @@ set(TEST_TARGET_SRCS
   src/main.cpp
   src/dtostrf.cpp
   src/itoa.cpp
-  src/PrintMock.cpp
   src/MillisFake.cpp
+  src/PrintMock.cpp
+  src/StreamMock.cpp
   ${TEST_SRCS}
   ${TEST_DUT_SRCS}
 )
diff --git a/test/include/StreamMock.h b/test/include/StreamMock.h
@@ -9,7 +9,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <sstream>
+#include <deque>
 
 #include <Stream.h>
 
@@ -20,21 +20,17 @@
 class StreamMock : public arduino::Stream
 {
 public:
-  std::stringstream _ss;
-
-  virtual size_t write(uint8_t ch) override { _ss << static_cast<char>(ch); return 1; }
-  virtual int available() override { return _ss.gcount(); }
-  virtual int read() override
-  {
-    char ch;
-    _ss >> ch;
-    return ch;
-  }
-  virtual int peek() override
-  {
-    char ch = _ss.peek();
-    return ch;
-  }
+
+  void operator << (char const * str);
+
+  virtual size_t write(uint8_t ch) override;
+  virtual int available() override;
+  virtual int read() override;
+  virtual int peek() override;
+
+private:
+  std::deque<char> _stream;
+
 };
 
 #endif /* STREAM_MOCK_H_ */
diff --git a/test/src/StreamMock.cpp b/test/src/StreamMock.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2020 Arduino.  All rights reserved.
+ */
+
+/**************************************************************************************
+ * INCLUDE
+ **************************************************************************************/
+
+#include <StreamMock.h>
+
+/**************************************************************************************
+ * PUBLIC MEMBER FUNCTIONS
+ **************************************************************************************/
+
+void StreamMock::operator << (char const * str)
+{
+  for (size_t c = 0; c < strlen(str); c++)
+    _stream.push_back(str[c]);
+}
+
+size_t StreamMock::write(uint8_t ch)
+{ 
+  _stream.push_back(static_cast<char>(ch));
+  return 1;
+}
+
+int StreamMock::available()
+{
+  return _stream.size();
+}
+
+int StreamMock::read()
+{
+  if (available() == 0)
+    return -1;
+
+  /* Extract first/oldest element. */
+  char const c = _stream.at(0);
+  /* Erase first/oldest element. */
+  _stream.pop_front();
+
+  return c;
+}
+
+int StreamMock::peek()
+{
+  if (available() == 0)
+    return -1;
+
+  return _stream.at(0);
+}
