Netsocket: Remove deprecated TCPServer

TCPSocket should be used instead.

Author: Kimmo Vaisanen

UNITTESTS/features/netsocket/TCPServer/test_TCPServer.cpp

@@ -49,6 +49,33 @@ class TestTCPSocket : public testing::Test {
     }
 };
 
+// Control the rtos EventFlags stub. See EventFlags_stub.cpp
+extern std::list<uint32_t> eventFlagsStubNextRetval;
+
+class TestTCPServer : public testing::Test {
+public:
+    unsigned int dataSize = 10;
+    char dataBuf[10];
+protected:
+    TCPSocket *socket;
+    TCPSocket *server;
+    NetworkStackstub stack;
+
+    virtual void SetUp()
+    {
+        server = new TCPSocket();
+        socket = new TCPSocket();
+    }
+
+    virtual void TearDown()
+    {
+        stack.return_values.clear();
+        eventFlagsStubNextRetval.clear();
+        delete socket;
+        delete server;
+    }
+};
+
 TEST_F(TestTCPSocket, get_proto)
 {
     TCPSocketFriend tcpFriend;
@@ -231,6 +258,12 @@ TEST_F(TestTCPSocket, recv_from_null)
     EXPECT_EQ(socket->recvfrom(NULL, dataBuf, dataSize), NSAPI_ERROR_OK);
 }
 
+TEST_F(TestTCPSocket, unsupported_api)
+{
+    SocketAddress addr;
+    EXPECT_EQ(socket->join_multicast_group(addr), NSAPI_ERROR_UNSUPPORTED);
+}
+
 /* listen */
 
 TEST_F(TestTCPSocket, listen_no_open)
@@ -246,42 +279,54 @@ TEST_F(TestTCPSocket, listen)
     EXPECT_EQ(socket->listen(1), NSAPI_ERROR_OK);
 }
 
-/* these tests will have to be readjusted after TCPServer is deprecated. */
+/* TCP server */
 
-TEST_F(TestTCPSocket, accept_no_open)
+TEST_F(TestTCPServer, accept_no_open)
 {
     nsapi_error_t error;
     stack.return_value = NSAPI_ERROR_OK;
     EXPECT_EQ(socket->accept(&error), nullptr);
     EXPECT_EQ(error, NSAPI_ERROR_NO_SOCKET);
 }
 
-TEST_F(TestTCPSocket, accept)
+TEST_F(TestTCPServer, accept)
 {
+    const SocketAddress a("127.0.0.1", 1024);
+    EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(socket->connect(a), NSAPI_ERROR_OK);
     nsapi_error_t error;
-    stack.return_value = NSAPI_ERROR_OK;
+    EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(server->bind(a), NSAPI_ERROR_OK);
+    server->listen(1);
     socket->open(&stack);
-    TCPSocket *sock = socket->accept(&error);
+    TCPSocket *sock = server->accept(&error);
     EXPECT_NE(sock, nullptr);
     EXPECT_EQ(error, NSAPI_ERROR_OK);
     if (sock) {
         sock->close();
     }
 }
 
-TEST_F(TestTCPSocket, accept_would_block)
+TEST_F(TestTCPServer, accept_would_block)
 {
     nsapi_error_t error;
     socket->open(&stack);
+    EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
+
     stack.return_value = NSAPI_ERROR_WOULD_BLOCK;
     eventFlagsStubNextRetval.push_back(0);
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
+
     EXPECT_EQ(socket->accept(&error), nullptr);
     EXPECT_EQ(error, NSAPI_ERROR_WOULD_BLOCK);
 }
 
-TEST_F(TestTCPSocket, unsupported_api)
+TEST_F(TestTCPServer, accept_error)
 {
-    SocketAddress addr;
-    EXPECT_EQ(socket->join_multicast_group(addr), NSAPI_ERROR_UNSUPPORTED);
+    nsapi_error_t error;
+    EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
+    stack.return_value = NSAPI_ERROR_AUTH_FAILURE;
+    TCPSocket *sock = server->accept(&error);
+    EXPECT_EQ(server->accept(&error), nullptr);
+    EXPECT_EQ(error, NSAPI_ERROR_AUTH_FAILURE);
 }

UNITTESTS/features/netsocket/TCPServer/unittest.cmake

@@ -153,7 +153,7 @@
 
 #define MEM_SIZE                    MBED_CONF_LWIP_MEM_SIZE
 
-// One tcp_pcb_listen is needed for each TCPServer.
+// One tcp_pcb_listen is needed for each TCP server.
 // Each requires 72 bytes of RAM.
 #define MEMP_NUM_TCP_PCB_LISTEN     MBED_CONF_LWIP_TCP_SERVER_MAX
 
@@ -172,7 +172,7 @@
 // Each netbuf requires 64 bytes of RAM.
 #define MEMP_NUM_NETBUF             MBED_CONF_LWIP_NUM_NETBUF
 
-// One netconn is needed for each UDPSocket, TCPSocket or TCPServer.
+// One netconn is needed for each UDPSocket or TCPSocket.
 // Each requires 236 bytes of RAM (total rounded to multiple of 512).
 #define MEMP_NUM_NETCONN            MBED_CONF_LWIP_SOCKET_MAX
 

UNITTESTS/features/netsocket/TCPSocket/test_TCPSocket.cpp

@@ -59,15 +59,15 @@
             "value": false
         },
         "socket-max": {
-            "help": "Maximum number of open TCPServer, TCPSocket and UDPSocket instances allowed, including one used internally for DNS.  Each requires 236 bytes of pre-allocated RAM",
+            "help": "Maximum number of open TCPSocket and UDPSocket instances allowed, including one used internally for DNS.  Each requires 236 bytes of pre-allocated RAM",
             "value": 4
         },
         "tcp-enabled": {
             "help": "Enable TCP",
             "value": true
         },
         "tcp-server-max": {
-            "help": "Maximum number of open TCPServer instances allowed.  Each requires 72 bytes of pre-allocated RAM",
+            "help": "Maximum number of open TCP server instances allowed.  Each requires 72 bytes of pre-allocated RAM",
             "value": 4
         },
         "tcp-socket-max": {

features/lwipstack/lwipopts.h

@@ -244,7 +244,6 @@ class NetworkStack : public DNS {
     friend class InternetSocket;
     friend class InternetDatagramSocket;
     friend class TCPSocket;
-    friend class TCPServer;
 
     /** Opens a socket
      *