Serial listener tests complete and working

diff --git a/include/serial/serial_listener.h b/include/serial/serial_listener.h
index 35c93fc8a7ef1dcf65e28298c94682b94d05bf83..c62910f557d5c0562780584625d674e24e6b7468 100644 (file)
--- a/include/serial/serial_listener.h
+++ b/include/serial/serial_listener.h
@@ -808,12 +808,15 @@ public:
    * \return std::string token that was matched or "" if none were matched.
    */
   std::string wait(long ms) {
-    if (ms == 0)
-      if (!this->queue.try_pop(this->result))
+    if (ms == 0) {
+      if (!this->queue.try_pop(this->result)) {
         this->result = "";
-    else
-      if (!this->queue.timed_wait_and_pop(this->result, ms))
+      }
+    } else {
+      if (!this->queue.timed_wait_and_pop(this->result, ms)) {
         this->result = "";
+      }
+    }
     return result;
   }
 
@@ -842,8 +845,9 @@ public:
 
   void callback(const std::string &token) {
     std::string throw_away;
-    if (this->queue.size() == this->buffer_size_)
+    if (this->queue.size() == this->buffer_size_) {
       this->queue.wait_and_pop(throw_away);
+    }
     this->queue.push(token);
   }
 

diff --git a/tests/serial_listener_tests.cc b/tests/serial_listener_tests.cc
index 8581dc47bb5064933b74040d4c14cd97d7b6d351..52e12f1925e4aa2fab01b3fc625004e937a46368 100644 (file)
--- a/tests/serial_listener_tests.cc
+++ b/tests/serial_listener_tests.cc
@@ -32,11 +32,11 @@
 using namespace serial;
 
 static size_t global_count, global_listen_count;
+static bool matched;
 
 void filter_handler(std::string token) {
   global_listen_count++;
   std::cout << "filter_handler got: " << token << std::endl;
-  return true;
 }
 
 void default_handler(std::string line) {
@@ -94,6 +94,7 @@ TEST_F(SerialListenerTests, handlesPartialMessage) {
 
 TEST_F(SerialListenerTests, normalFilterWorks) {
   global_count = 0;
+  global_listen_count = 0;
   std::string input_str = "?$1E\r$1E=Robo\rV=1334:1337\rT=123";
 
   // Setup filter
@@ -110,6 +111,120 @@ TEST_F(SerialListenerTests, normalFilterWorks) {
   ASSERT_EQ(1, global_listen_count);
 }
 
+void run_blocking_filter(BlockingFilterPtr filt_1) {
+  // Wait 100 ms for a match
+  std::string temp = filt_1->wait(100);
+  if (temp.empty()) {
+    return;
+  }
+  std::cout << "blocking filter matched: " << temp << std::endl;
+  global_listen_count++;
+  matched = true;
+}
+
+TEST_F(SerialListenerTests, blockingFilterWorks) {
+  global_count = 0;
+  global_listen_count = 0;
+  matched = false;
+  std::string input_str = "?$1E\r$1E=Robo\rV=1334:1337\rT=123";
+
+  // Setup blocking filter
+  BlockingFilterPtr filt_1 =
+    listener.createBlockingFilter(SerialListener::startsWith("$1E="));
+
+  boost::thread t(boost::bind(run_blocking_filter, filt_1));
+
+  std::cout << "writing: ?$1E<cr>$1E=Robo<cr>V=1334:1337<cr>T=123";
+  std::cout << std::endl;
+  port2->write(input_str);
+  // Allow time for processing
+  my_sleep(50);
+
+  using boost::posix_time::milliseconds;
+  ASSERT_TRUE(t.timed_join(milliseconds(10)));
+  ASSERT_EQ(2, global_count);
+  ASSERT_EQ(1, global_listen_count);
+  ASSERT_TRUE(matched);
+}
+
+TEST_F(SerialListenerTests, blockingFilterTimesOut) {
+  global_count = 0;
+  global_listen_count = 0;
+  matched = false;
+  std::string input_str = "?$1E\r$1E=Robo\rV=1334:1337\rT=123";
+
+  // Setup blocking filter
+  BlockingFilterPtr filt_1 =
+    listener.createBlockingFilter(SerialListener::startsWith("T="));
+
+  boost::thread t(boost::bind(run_blocking_filter, filt_1));
+
+  std::cout << "writing: ?$1E<cr>$1E=Robo<cr>V=1334:1337<cr>T=123";
+  std::cout << std::endl;
+  port2->write(input_str);
+  // Allow time for processing
+  my_sleep(50);
+
+  using boost::posix_time::milliseconds;
+  // First one should not be within timeout, should be false
+  ASSERT_FALSE(t.timed_join(milliseconds(10)));
+  // Second one should capture timeout and return true to join
+  ASSERT_TRUE(t.timed_join(milliseconds(60)));
+  ASSERT_EQ(3, global_count);
+  ASSERT_EQ(0, global_listen_count);
+  ASSERT_FALSE(matched);
+}
+
+void write_later(Serial *port, std::string input_str, long wait_for) {
+  my_sleep(wait_for);
+  port->write(input_str);
+}
+
+TEST_F(SerialListenerTests, bufferedFilterWorks) {
+  global_count = 0;
+  std::string input_str = "?$1E\r+\r$1E=Robo\rV=1334:1337\rT=123";
+
+  // Setup buffered filter, buffer size 3
+  BufferedFilterPtr filt_1 =
+    listener.createBufferedFilter(SerialListener::exactly("+"), 3);
+
+  // Write the string to the port 10 ms in the future
+  boost::thread t(boost::bind(write_later, port2, input_str, 10));
+
+  // This should be empty because of a timeout
+  ASSERT_TRUE(filt_1->wait(2).empty());
+  // Make sure wait works properly
+  ASSERT_EQ("+", filt_1->wait(20));
+  // This should be empty cause there was only one
+  ASSERT_TRUE(filt_1->wait(2).empty());
+  // The queue in the filter should be empty
+  ASSERT_EQ(0, filt_1->queue.size());
+  ASSERT_EQ(3, global_count);
+  t.join();
+}
+
+TEST_F(SerialListenerTests, bufferedFilterQueueWorks) {
+  global_count = 0;
+  std::string input_str = "?$1E$\r+\r$1E=Robo$\rV=1334:1337$\rT=123$\r";
+
+  // Setup buffered filter, buffer size 3
+  BufferedFilterPtr filt_1 =
+    listener.createBufferedFilter(SerialListener::endsWith("$"), 3);
+
+  // write the string
+  port2->write(input_str);
+
+  my_sleep(20); // Let things process
+  // There should have been four matches
+  //   therefore the first one should the second match.
+  ASSERT_EQ("$1E=Robo$", filt_1->wait(1));
+  ASSERT_EQ("V=1334:1337$", filt_1->wait(1));
+  ASSERT_EQ("T=123$", filt_1->wait(1));
+  ASSERT_EQ(0, filt_1->queue.size());
+
+  ASSERT_EQ(1, global_count);
+}
+
 }  // namespace
 
 int main(int argc, char **argv) {