Merge pull request #6718 from bridadan/echo_test_change

Modifying echo test to be driven more from the device.

TESTS/host_tests/device_echo.py

@@ -0,0 +1,32 @@
+"""
+mbed SDK
+Copyright (c) 2011-2016 ARM Limited
+
+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.
+"""
+
+
+import uuid
+from mbed_host_tests import BaseHostTest
+
+class Device_Echo(BaseHostTest):
+
+    def _callback_repeat(self, key, value, _):
+        self.send_kv(key, value)
+
+    def setup(self):
+        self.register_callback("echo", self._callback_repeat)
+        self.register_callback("echo_count", self._callback_repeat)
+
+    def teardown(self):
+        pass

TESTS/mbed_drivers/echo/main.cpp

@@ -21,28 +21,49 @@
 #include "unity/unity.h"
 #include "utest/utest.h"
 
+#define PAYLOAD_LENGTH 36
+
 using namespace utest::v1;
 
+// Fill a buffer with a slice of the ASCII alphabet.
+void fill_buffer(char* buffer, unsigned int length, unsigned int index) {
+    unsigned int start = length * index;
+    for (int i = 0; i < length - 1; i++) {
+        buffer[i] = 'a' + ((start + i) % 26);
+    }
+    buffer[length - 1] = '\0';
+}
+
 // Echo server (echo payload to host)
 template<int N>
 void test_case_echo_server_x() {
     char _key[11] = {};
-    char _value[128] = {};
+    char _tx_value[PAYLOAD_LENGTH + 1] = {};
+    char _rx_value[PAYLOAD_LENGTH + 1] = {};
     const int echo_count = N;
-    const char _key_const[] = "echo_count";
+    const char _echo_count_key_const[] = "echo_count";
+    const char _echo_key_const[] = "echo";
     int expected_key = 1;
 
-    greentea_send_kv(_key_const, echo_count);
+    // Send up the echo count
+    greentea_send_kv(_echo_count_key_const, echo_count);
     // Handshake with host
     do {
-        greentea_parse_kv(_key, _value, sizeof(_key), sizeof(_value));
+        greentea_parse_kv(_key, _rx_value, sizeof(_key), sizeof(_rx_value));
-        expected_key = strcmp(_key_const, _key);
+        // Ensure the key received is "echo_count" and not some old data
+        expected_key = strcmp(_echo_count_key_const, _key);
     } while (expected_key);
-    TEST_ASSERT_EQUAL_INT(echo_count, atoi(_value));
+    TEST_ASSERT_EQUAL_INT(echo_count, atoi(_rx_value));
 
     for (int i=0; i < echo_count; ++i) {
-        greentea_parse_kv(_key, _value, sizeof(_key), sizeof(_value));
+        fill_buffer(_tx_value, PAYLOAD_LENGTH, i);
-        greentea_send_kv(_key, _value);
+        greentea_send_kv(_echo_key_const, _tx_value);
+        do {
+            greentea_parse_kv(_key, _rx_value, sizeof(_key), sizeof(_rx_value));
+            // Ensure the key received is "echo" and not some old data
+            expected_key = strcmp(_echo_key_const, _key);
+        } while (expected_key);
+        TEST_ASSERT(strncmp(_tx_value, _rx_value, PAYLOAD_LENGTH) == 0);
     }
 }
 
@@ -56,7 +77,7 @@ Case cases[] = {
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP(30, "echo");
+    GREENTEA_SETUP(30, "device_echo");
     return greentea_test_setup_handler(number_of_cases);
 }