Merge pull request #8838 from 0xc0170/dev_rollup

Rollup v2 for 5.11rc1

Author: 0xc0170

.travis.yml

@@ -141,7 +141,7 @@ matrix:
       after_success:
         # run astyle for all files on the branch
         - git checkout -- .
-        - find -regex '.*\.\(h\|c\|hpp\|cpp\)' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
+        - find -regex '.*\.\(h\|c\|hpp\|cpp\)$' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
         # update status if we succeeded, compare with master if possible
         - |
           CURR=$(cat astyle-branch.out | grep Formatted | wc -l)

TESTS/netsocket/dns/asynchronous_dns_non_async_and_async.cpp

@@ -45,7 +45,7 @@ void ASYNCHRONOUS_DNS_NON_ASYNC_AND_ASYNC()
         TEST_ASSERT(strlen(addr.get_ip_address()) > 1);
     }
 
-    semaphore.wait();
+    semaphore.wait(100);
 
     TEST_ASSERT(data.result == NSAPI_ERROR_OK);
 

TESTS/netsocket/tcp/tcp_tests.h

@@ -30,7 +30,7 @@ nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock);
 int split2half_rmng_tcp_test_time(); // [s]
 
 namespace tcp_global {
-static const int TESTS_TIMEOUT = 960;
+static const int TESTS_TIMEOUT = 480;
 static const int TCP_OS_STACK_SIZE = 2048;
 
 static const int RX_BUFF_SIZE = 1220;

TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp

@@ -66,8 +66,8 @@ void TCPSOCKET_RECV_TIMEOUT()
                     TEST_FAIL();
                     goto CLEANUP;
                 }
-                printf("MBED: recv() took: %dms\n", timer.read_ms());
-                TEST_ASSERT_INT_WITHIN(50, 150, timer.read_ms());
+                printf("MBED: recv() took: %dus\n", timer.read_us());
+                TEST_ASSERT_INT_WITHIN(51, 150, (timer.read_us() + 500) / 1000);
                 continue;
             } else if (recvd < 0) {
                 printf("[pkt#%02d] network error %d\n", i, recvd);

TESTS/network/interface/networkinterface_status.cpp

@@ -89,7 +89,8 @@ void NETWORKINTERFACE_STATUS()
         }
         TEST_ASSERT_EQUAL(NSAPI_STATUS_GLOBAL_UP, status);
 
-        net->disconnect();
+        err = net->disconnect();
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
 
         status = wait_status_callback();
         TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, status);
@@ -123,7 +124,8 @@ void NETWORKINTERFACE_STATUS_NONBLOCK()
         }
         TEST_ASSERT_EQUAL(NSAPI_STATUS_GLOBAL_UP, status);
 
-        net->disconnect();
+        err = net->disconnect();
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
 
         status = wait_status_callback();
         TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, status);
@@ -150,7 +152,8 @@ void NETWORKINTERFACE_STATUS_GET()
             wait(0.5);
         }
 
-        net->disconnect();
+        err = net->disconnect();
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
 
         TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, net->get_connection_status());
     }

TESTS/network/wifi/wifi_connect_params_null.cpp

@@ -30,7 +30,7 @@ void wifi_connect_params_null(void)
     error = wifi->connect(NULL, NULL);
     wifi->disconnect();
     TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
-    error =  wifi->connect("", "");   
+    error =  wifi->connect("", "");
     wifi->disconnect();
     TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
 }

TESTS/network/wifi/wifi_connect_secure.cpp

@@ -32,7 +32,7 @@ void wifi_connect_secure(void)
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security()));
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
-    
+
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->disconnect());
 }
 

UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp

@@ -185,12 +185,12 @@ TEST_F(TestAT_CellularNetwork, test_AT_CellularNetwork_get_registration_params)
     reg_params._periodic_tau = 3;
 
     EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == cn.get_registration_params(CellularNetwork::C_EREG, reg_params));
-    EXPECT_TRUE(reg_params._status == CellularNetwork::StatusNotAvailable);
+    EXPECT_TRUE(reg_params._status == CellularNetwork::NotRegistered);
     EXPECT_TRUE(reg_params._act == CellularNetwork::RAT_UNKNOWN);
     EXPECT_TRUE(reg_params._cell_id == -1 && reg_params._active_time == -1 && reg_params._periodic_tau == -1);
 
     EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == cn.get_registration_params(CellularNetwork::C_GREG, reg_params));
-    EXPECT_TRUE(reg_params._status == CellularNetwork::StatusNotAvailable);
+    EXPECT_TRUE(reg_params._status == CellularNetwork::NotRegistered);
     EXPECT_TRUE(reg_params._act == CellularNetwork::RAT_UNKNOWN);
     EXPECT_TRUE(reg_params._cell_id == -1);
 
@@ -201,12 +201,12 @@ TEST_F(TestAT_CellularNetwork, test_AT_CellularNetwork_get_registration_params)
     reg_params._periodic_tau = 3;
 
     EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == nw.get_registration_params(CellularNetwork::C_EREG, reg_params));
-    EXPECT_TRUE(reg_params._status == CellularNetwork::StatusNotAvailable);
+    EXPECT_TRUE(reg_params._status == CellularNetwork::NotRegistered);
     EXPECT_TRUE(reg_params._act == CellularNetwork::RAT_UNKNOWN);
     EXPECT_TRUE(reg_params._cell_id == -1 && reg_params._active_time == -1 && reg_params._periodic_tau == -1);
     // Check get_registration_params without specifying the registration type
     EXPECT_TRUE(NSAPI_ERROR_OK == cn.get_registration_params(reg_params_check));
-    EXPECT_TRUE(reg_params_check._status == CellularNetwork::StatusNotAvailable);
+    EXPECT_TRUE(reg_params_check._status == CellularNetwork::NotRegistered);
     EXPECT_TRUE(reg_params_check._act == CellularNetwork::RAT_UNKNOWN);
     EXPECT_TRUE(reg_params_check._cell_id == -1 && reg_params_check._active_time == -1 && reg_params_check._periodic_tau == -1);
 }
@@ -497,7 +497,7 @@ TEST_F(TestAT_CellularNetwork, test_AT_CellularNetwork_get_signal_quality)
     ATHandler_stub::int_value = 1;
     ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
     EXPECT_TRUE(NSAPI_ERROR_OK == cn.get_signal_quality(rs, ber));
-    EXPECT_TRUE(rs == 1 && ber == 1);
+    EXPECT_TRUE(rs == -111 && ber == 1);
 }
 
 TEST_F(TestAT_CellularNetwork, test_AT_CellularNetwork_get_3gpp_error)

UNITTESTS/features/netsocket/DTLSSocket/dtls_test_config.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef UNITTESTS_FEATURES_NETSOCKET_DTLSSOCKET_DTLS_TEST_CONFIG_H_
+#define UNITTESTS_FEATURES_NETSOCKET_DTLSSOCKET_DTLS_TEST_CONFIG_H_
+
+#define MBEDTLS_SSL_CLI_C
+
+
+#endif /* UNITTESTS_FEATURES_NETSOCKET_DTLSSOCKET_DTLS_TEST_CONFIG_H_ */

UNITTESTS/features/netsocket/DTLSSocket/test_DTLSSocket.cpp

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "gtest/gtest.h"
+#include "features/netsocket/DTLSSocket.h"
+#include "NetworkStack_stub.h"
+
+#include "mbed_error.h"
+mbed_error_status_t mbed_error(mbed_error_status_t error_status, const char *error_msg, unsigned int error_value, const char *filename, int line_number)
+{
+    return 0;
+}
+
+// Control the rtos EventFlags stub. See EventFlags_stub.cpp
+extern std::list<uint32_t> eventFlagsStubNextRetval;
+
+class TestDTLSSocket : public testing::Test {
+public:
+    unsigned int dataSize = 10;
+    char dataBuf[10];
+protected:
+    DTLSSocket *socket;
+    NetworkStackstub stack;
+
+    virtual void SetUp()
+    {
+        socket = new DTLSSocket();
+    }
+
+    virtual void TearDown()
+    {
+        stack.return_values.clear();
+        eventFlagsStubNextRetval.clear();
+        delete socket;
+    }
+};
+
+TEST_F(TestDTLSSocket, constructor)
+{
+    EXPECT_TRUE(socket);
+}
+
+/* connect */
+
+TEST_F(TestDTLSSocket, connect)
+{
+    socket->open((NetworkStack *)&stack);
+
+    stack.return_value = NSAPI_ERROR_OK;
+    EXPECT_EQ(socket->connect("127.0.0.1", 1024), NSAPI_ERROR_OK);
+}
+
+TEST_F(TestDTLSSocket, connect_error)
+{
+    socket->open((NetworkStack *)&stack);
+
+    stack.return_value = NSAPI_ERROR_DNS_FAILURE;
+    EXPECT_EQ(socket->connect("127.0.0.1", 1024), NSAPI_ERROR_DNS_FAILURE);
+}

UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake

@@ -0,0 +1,40 @@
+
+####################
+# UNIT TESTS
+####################
+
+set(unittest-sources
+  ../features/netsocket/SocketAddress.cpp
+  ../features/netsocket/NetworkStack.cpp
+  ../features/netsocket/InternetSocket.cpp
+  ../features/netsocket/UDPSocket.cpp
+  ../features/netsocket/DTLSSocket.cpp
+  ../features/netsocket/DTLSSocketWrapper.cpp
+  ../features/netsocket/TLSSocketWrapper.cpp
+  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
+)
+
+set(unittest-test-sources
+  features/netsocket/DTLSSocket/test_DTLSSocket.cpp
+  stubs/Mutex_stub.cpp
+  stubs/mbed_assert_stub.c
+  stubs/equeue_stub.c
+  ../features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+  stubs/EventQueue_stub.cpp
+  stubs/mbed_shared_queues_stub.cpp
+  stubs/nsapi_dns_stub.cpp
+  stubs/EventFlags_stub.cpp
+  stubs/stoip4_stub.c
+  stubs/ip4tos_stub.c
+  stubs/Kernel_stub.cpp
+)
+
+set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/DTLSSocket/dtls_test_config.h\"")
+set_source_files_properties(features/netsocket/DTLSSocket/test_DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+set_source_files_properties(../features/netsocket/DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+set_source_files_properties(../features/netsocket/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+

UNITTESTS/features/netsocket/DTLSSocketWrapper/dtls_test_config.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef UNITTESTS_FEATURES_NETSOCKET_DTLSSOCKETWRAPPER_TLS_TEST_CONFIG_H_
+#define UNITTESTS_FEATURES_NETSOCKET_DTLSSOCKETWRAPPER_TLS_TEST_CONFIG_H_
+
+#define MBEDTLS_SSL_CLI_C
+
+
+#endif /* UNITTESTS_FEATURES_NETSOCKET_DTLSSOCKETWRAPPER_TLS_TEST_CONFIG_H_ */