pull request #4478 review fixes

4 files changed, 15 insertions, 157 deletions

diff --git a/platform/platform.pro b/platform/platform.pro
index c6fb2fd10e..d05cc1f1e4 100644
--- a/platform/platform.pro
+++ b/platform/platform.pro
@@ -105,4 +105,3 @@ SOURCES += \
     preferred_languages.cpp \
     servers_list.cpp \
     settings.cpp \
-    socket.cpp \
diff --git a/platform/socket.cpp b/platform/socket.cpp
deleted file mode 100644
index 7e9129d9d6..0000000000
--- a/platform/socket.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "socket.hpp"
-
-#include "base/assert.hpp"
-
-#include "std/algorithm.hpp"
-
-namespace platform {
-
-TestSocket::TestSocket()
-  : m_isConnected(false)
-{
-}
-
-TestSocket::~TestSocket()
-{
-  m_isConnected = false;
-}
-
-bool TestSocket::Open(string const & host, uint16_t port)
-{
-  m_isConnected = true;
-  return true;
-}
-
-void TestSocket::Close()
-{
-  m_isConnected = false;
-}
-
-bool TestSocket::Read(uint8_t * data, uint32_t count)
-{
-  if (!m_isConnected)
-    return false;
-
-  lock_guard<mutex> lg(m_inputMutex);
-
-  if (m_input.size() < count)
-    return false;
-
-  copy( m_input.data(), m_input.data()+count, data );
-  m_input.erase( m_input.begin(), m_input.begin() + count );
-  return true;
-}
-
-bool TestSocket::Write(uint8_t const * data, uint32_t count)
-{
-  if (!m_isConnected)
-    return false;
-
-  lock_guard<mutex> lg(m_outputMutex);
-  m_output.insert(m_output.end(), data, data + count);
-  return true;
-}
-
-void TestSocket::SetTimeout(uint32_t milliseconds)
-{
-}
-
-bool TestSocket::HasInput() const
-{
-  lock_guard<mutex> lg(m_inputMutex);
-  return !m_input.empty();
-}
-
-bool TestSocket::HasOutput() const
-{
-  lock_guard<mutex> lg(m_outputMutex);
-  return !m_output.empty();
-}
-
-void TestSocket::AddInput(uint8_t const * data, uint32_t count)
-{
-  ASSERT(m_isConnected, ());
-
-  lock_guard<mutex> lg(m_inputMutex);
-  m_input.insert(m_input.end(), data, data + count);
-}
-
-size_t TestSocket::FetchOutput(vector<uint8_t> & destination)
-{
-  lock_guard<mutex> lg(m_outputMutex);
-
-  size_t const outputSize = m_output.size();
-  if (outputSize == 0)
-    return 0;
-
-  destination.insert(destination.end(), m_output.begin(), m_output.end());
-  m_output.clear();
-  return outputSize;
-}
-} // namespace platform
diff --git a/platform/socket.hpp b/platform/socket.hpp
index 3d2e0d2b05..6002f98eac 100644
--- a/platform/socket.hpp
+++ b/platform/socket.hpp
@@ -11,7 +11,6 @@ class Socket
 {
 public:
   virtual ~Socket() {}
-
   virtual bool Open(string const & host, uint16_t port) = 0;
   virtual void Close() = 0;
 
@@ -24,55 +23,13 @@ public:
 class PlatformSocket final : public Socket
 {
   PlatformSocket();
-  virtual ~PlatformSocket();
-  virtual bool Open(string const & host, uint16_t port) override;
-  virtual void Close() override;
-  virtual bool Read(uint8_t * data, uint32_t count) override;
-  virtual bool Write(uint8_t const * data, uint32_t count) override;
-  virtual void SetTimeout(uint32_t milliseconds) override;
-};
-
-class MockSocket final : public Socket
-{
-public:
-  virtual bool Open(string const & host, uint16_t port) override { return false; }
-  virtual void Close() override {}
-
-  virtual bool Read(uint8_t * data, uint32_t count) override { return false; }
-  virtual bool Write(uint8_t const * data, uint32_t count) override { return false; }
-
-  virtual void SetTimeout(uint32_t milliseconds) override {}
-};
-
-class TestSocket final : public Socket
-{
-public:
-  TestSocket();
-  virtual ~TestSocket();
-  virtual bool Open(string const & host, uint16_t port) override;
-  virtual void Close() override;
-  virtual bool Read(uint8_t * data, uint32_t count) override;
-  virtual bool Write(uint8_t const * data, uint32_t count) override;
-  virtual void SetTimeout(uint32_t milliseconds) override;
-
-  bool HasInput() const;
-  bool HasOutput() const;
-
-  // Simulate server writing
-  void AddInput(uint8_t const * data, uint32_t count);
-
-  // Simulate server reading
-  // returns size of read data
-  size_t FetchOutput(vector<uint8_t> & destination);
-
-private:
-  bool m_isConnected;
-
-  vector<uint8_t> m_input;
-  mutable mutex m_inputMutex;
-
-  vector<uint8_t> m_output;
-  mutable mutex m_outputMutex;
+  // Socket overrides
+  ~PlatformSocket();
+  bool Open(string const & host, uint16_t port) override;
+  void Close() override;
+  bool Read(uint8_t * data, uint32_t count) override;
+  bool Write(uint8_t const * data, uint32_t count) override;
+  void SetTimeout(uint32_t milliseconds) override;
 };
 
 }  // namespace platform
diff --git a/platform/socket_apple.mm b/platform/socket_apple.mm
index d7abb737f3..50615484f9 100644
--- a/platform/socket_apple.mm
+++ b/platform/socket_apple.mm
@@ -23,23 +23,16 @@
 namespace platform
 {
 PlatformSocket::PlatformSocket() {}
-PlatformSocket::~PlatformSocket()
-{
-  Close();
-}
 
-bool PlatformSocket::Open(string const & host, uint16_t port)
-{
-  return false;
-}
+PlatformSocket::~PlatformSocket() { Close(); }
+
+bool PlatformSocket::Open(string const & host, uint16_t port) { return false; }
 
 void PlatformSocket::Close() {}
+
 bool PlatformSocket::Read(uint8_t * data, uint32_t count) { return false; }
-bool PlatformSocket::Write(uint8_t const * data, uint32_t count)
-{
-  return false;
-}
-void PlatformSocket::SetTimeout(uint32_t milliseconds)
-{
-}
+
+bool PlatformSocket::Write(uint8_t const * data, uint32_t count) { return false; }
+
+void PlatformSocket::SetTimeout(uint32_t milliseconds) {}
 }  // namespace platform