[Pkg-running-devel] [antpm] 09/48: tests: cover more of message sending

[Kristof Ralovich]

This is an automated email from the git hooks/post-receive script.

ralovich-guest pushed a commit to branch upstream
in repository antpm.

commit b593211fdab67b50154bf0edae2bad7d64382ea7
Author: RALOVICH, Kristof <tade60 at freemail.hu>
Date:   Mon Mar 24 22:58:29 2014 +0100

    tests: cover more of message sending
---
 src/tests/sm1.cpp | 123 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 111 insertions(+), 12 deletions(-)

diff --git a/src/tests/sm1.cpp b/src/tests/sm1.cpp
index dd997c8..98c878d 100644
--- a/src/tests/sm1.cpp
+++ b/src/tests/sm1.cpp
@@ -131,15 +131,40 @@ ClassInstantiator<Log>::instantiate()
   return new Log(NULL);
 }
 
+class SerialTester0 : public Serial
+{
+public:
+  SerialTester0() {}
+  virtual ~SerialTester0() {}
+
+  virtual bool open() { return true; }
+  virtual void close() { }
+
+  virtual bool read(char* dst, const size_t sizeBytes, size_t& bytesRead) {return false;}
+  virtual bool readBlocking(char* dst, const size_t sizeBytes, size_t& bytesRead) {return false;}
+  virtual bool write(const char* src, const size_t sizeBytes, size_t& bytesWritten) {return false;}
+
+private:
+  void* ioHandler();
+
+public:
+  virtual const size_t getQueueLength() const { return 0; }
+  virtual const char*  getImplName() { return "SerialTester0"; }
+  virtual bool         isOpen() const { return true; }
+  virtual bool         setWriteDelay(const size_t ms) {return true;}
+
+};
+
+
 //
-class SerialTester : public Serial
+class SerialTester1 : public Serial
 {
 public:
-  SerialTester() {}
-  virtual ~SerialTester() {}
+  SerialTester1() {}
+  virtual ~SerialTester1() {}
 
   virtual bool open() { return true; }
-  virtual void close() {}
+  virtual void close() { m_q.clear(); }
 
   virtual bool read(char* dst, const size_t sizeBytes, size_t& bytesRead) {return false;}
   virtual bool readBlocking(char* dst, const size_t sizeBytes, size_t& bytesRead) {return false;}
@@ -151,15 +176,15 @@ public:
       m_q.push(src[i]);
       bytesWritten += 1;
     }
-    return true;
+    return false;
   }
 
 private:
   void* ioHandler();
 
 public:
-  virtual const size_t getQueueLength() const { return 0; }
-  virtual const char*  getImplName() { return "SerialTester"; }
+  virtual const size_t getQueueLength() const { return m_q.size(); }
+  virtual const char*  getImplName() { return "SerialTester1"; }
   virtual bool         isOpen() const { return true; }
   virtual bool         setWriteDelay(const size_t ms) {return true;}
 
@@ -167,19 +192,57 @@ private:
   void queueData();
 
 private:
-  lqueue3<uint8_t> m_q;
-  //boost::scoped_ptr<
-  //std::auto_ptr<SerialTtyPrivate> m_p;
+  lqueue3<uint8_t> m_q; // FIFO for bytes written into this "serial port" with write() method
+  lqueue4<uint8_t> m_q_r; // FIFO for bytes produced by this "serial port", to be emptied by read()
 };
 
 
+class SerialTester2 : public Serial
+{
+public:
+  SerialTester2() {}
+  virtual ~SerialTester2() {}
+
+  virtual bool open() { return true; }
+  virtual void close() { m_q.clear(); }
+
+  virtual bool read(char* dst, const size_t sizeBytes, size_t& bytesRead) {return false;}
+  virtual bool readBlocking(char* dst, const size_t sizeBytes, size_t& bytesRead) {return false;}
+  virtual bool write(const char* src, const size_t sizeBytes, size_t& bytesWritten)
+  {
+    bytesWritten = 0;
+    for(size_t i = 0; i < sizeBytes; i++)
+    {
+      m_q.push(src[i]);
+      bytesWritten += 1;
+    }
+    return true;
+  }
+
+private:
+  void* ioHandler();
+
+public:
+  virtual const size_t getQueueLength() const { return m_q.size(); }
+  virtual const char*  getImplName() { return "SerialTester2"; }
+  virtual bool         isOpen() const { return true; }
+  virtual bool         setWriteDelay(const size_t ms) {return true;}
+
+private:
+  void queueData();
+
+private:
+  lqueue3<uint8_t> m_q; // FIFO for bytes written into this "serial port" with write() method
+  lqueue4<uint8_t> m_q_r; // FIFO for bytes produced by this "serial port", to be emptied by read()
+};
+
 }
 
 
 
 
 
-BOOST_AUTO_TEST_CASE(test_serial)
+BOOST_AUTO_TEST_CASE(test_asio)
 {
   antpm::Log::instance()->addSink(std::cout);
   antpm::Log::instance()->setLogReportingLevel(antpm::LOG_DBG3);
@@ -189,7 +252,7 @@ BOOST_AUTO_TEST_CASE(test_serial)
   try
   {
     //SerialTester st;
-    SerialTester* st = new SerialTester();
+    SerialTester1* st = new SerialTester1();
     AntFr310XT watch2(false, st);
 
     boost::asio::io_service io_service;
@@ -239,6 +302,42 @@ BOOST_AUTO_TEST_CASE(test_serial)
   }
 }
 
+BOOST_AUTO_TEST_CASE(test_serial0)
+{
+  antpm::Log::instance()->addSink(std::cout);
+  antpm::Log::instance()->setLogReportingLevel(antpm::LOG_DBG3);
+
+  Serial* st = new SerialTester0();
+  AntFr310XT watch2(false, st);
+
+  watch2.start();
+
+}
+
+BOOST_AUTO_TEST_CASE(test_serial1)
+{
+  antpm::Log::instance()->addSink(std::cout);
+  antpm::Log::instance()->setLogReportingLevel(antpm::LOG_DBG3);
+
+  Serial* st = new SerialTester1();
+  AntFr310XT watch2(false, st);
+
+  watch2.start();
+
+}
+
+BOOST_AUTO_TEST_CASE(test_serial2)
+{
+  antpm::Log::instance()->addSink(std::cout);
+  antpm::Log::instance()->setLogReportingLevel(antpm::LOG_DBG3);
+
+  Serial* st = new SerialTester2();
+  AntFr310XT watch2(false, st);
+
+  watch2.start();
+
+}
+
 #else // defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
 # error Local sockets not available on this platform.
 #endif // defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/antpm.git