Test connect ip/host/port

tests/src/lib/ShimClient.cpp

@@ -18,21 +18,43 @@ ShimClient::ShimClient() {
     this->expectBuffer = new Buffer();
     this->_allowConnect = true;
     this->_connected = false;
-    this->_receivedExpected = true;
+    this->_error = false;
     this->expectAnything = true;
     this->_received = 0;
+    this->_expectedPort = 0;
 }
 
 int ShimClient::connect(IPAddress ip, uint16_t port) {
     if (this->_allowConnect) {
         this->_connected = true;
     }
+    if (this->_expectedPort !=0) {
+        if (memcmp(ip,this->_expectedIP,4) != 0) {
+            TRACE( "ip mismatch\n");
+            this->_error = true;
+        }
+        if (port != this->_expectedPort) {
+            TRACE( "port mismatch\n");
+            this->_error = true;
+        }
+    }
     return this->_connected;
 }
 int ShimClient::connect(const char *host, uint16_t port)  {
     if (this->_allowConnect) {
         this->_connected = true;
     }
+    if (this->_expectedPort !=0) {
+        if (strcmp(host,this->_expectedHost) != 0) {
+            TRACE( "host mismatch\n");
+            this->_error = true;
+        }
+        if (port != this->_expectedPort) {
+            TRACE( "port mismatch\n");
+            this->_error = true;
+        }
+
+    }
     return this->_connected;
 }
 size_t ShimClient::write(uint8_t b)  { std::cout << "!!not implemented!! " << b; return 1; }
@@ -50,15 +72,15 @@ size_t ShimClient::write(const uint8_t *buf, size_t size)  {
             if (this->expectBuffer->available()) {
                 uint8_t expected = this->expectBuffer->next();
                 if (expected != buf[i]) {
+                    this->_error = true;
                     TRACE("!=" << (unsigned int)expected);
-                    this->_receivedExpected = false;
                 }
             } else {
-                this->_receivedExpected = false;
+                this->_error = true;
             }
         }
     }
-    TRACE("\n");
+    TRACE("\n"<<std::dec);
     return size;
 }
 int ShimClient::available()  {
@@ -99,10 +121,21 @@ void ShimClient::setAllowConnect(bool b) {
     this->_allowConnect = b;
 }
 
-bool ShimClient::receivedExpected() {
-    return !this->expectBuffer->available() && this->_receivedExpected;
+bool ShimClient::error() {
+    return this->_error;
 }
 
 uint16_t ShimClient::received() {
     return this->_received;
 }
+
+void ShimClient::expectConnect(IPAddress ip, uint16_t port) {
+    this->_expectedIP = ip;
+    this->_expectedPort = port;
+}
+
+void ShimClient::expectConnect(const char *host, uint16_t port) {
+    this->_expectedHost = host;
+    this->_expectedPort = port;
+}
+

tests/src/lib/ShimClient.h

@@ -14,8 +14,12 @@ private:
     bool _allowConnect;
     bool _connected;
     bool expectAnything;
-    bool _receivedExpected;
+    bool _error;
     uint16_t _received;
+    IPAddress _expectedIP;
+    uint16_t _expectedPort;
+    const char* _expectedHost;
+    
 public:
   ShimClient();
   virtual int connect(IPAddress ip, uint16_t port);
@@ -34,8 +38,11 @@ public:
   virtual ShimClient* respond(uint8_t *buf, size_t size);
   virtual ShimClient* expect(uint8_t *buf, size_t size);
   
+  virtual void expectConnect(IPAddress ip, uint16_t port);
+  virtual void expectConnect(const char *host, uint16_t port);
+  
   virtual uint16_t received();
-  virtual bool receivedExpected();
+  virtual bool error();
   
   virtual void setAllowConnect(bool b);
   virtual void setConnected(bool b);