Merge pull request #11861 from trowbridgec/update-ep-agora-target

Replace calls to printf() with mbed-trace in netsocket tests

Author: 0xc0170

TESTS/integration/COMMON/common_defines_test.h

@@ -16,6 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "mbed_trace.h"
+
+#define TRACE_GROUP "GRNT"
 
 #define ETHERNET 1
 #define WIFI 2

TESTS/integration/COMMON/download_test.cpp

@@ -27,6 +27,7 @@
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
 #include <string>
+#include "common_defines_test.h"
 
 #define MAX_THREADS 5
 
@@ -93,7 +94,7 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
             break;
         }
         ThisThread::sleep_for(1000);
-        printf("[NET-%d] Connection failed. Retry %d of %d\r\n", thread_id, tries, MAX_RETRIES);
+        tr_info("[NET-%d] Connection failed. Retry %d of %d", thread_id, tries, MAX_RETRIES);
     }
     TEST_ASSERT_EQUAL_INT_MESSAGE(0, result, "failed to connect");
 
@@ -111,7 +112,7 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
     } else {
         TEST_ASSERT_MESSAGE(0, "wrong thread id");
     }
-    printf("[NET-%d] Registered socket callback function\r\n", thread_id);
+    tr_info("[NET-%d] Registered socket callback function", thread_id);
     event_fired[thread_id] = false;
 
     /* setup request */
@@ -120,7 +121,7 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
     /* construct request */
     size_t req_len = snprintf(request, REQ_BUF_SIZE - 1, req_template, dl_path, dl_host);
     request[req_len] = 0;
-    printf("[NET-%d] Request header (%u): %s\r\n", thread_id, req_len, request);
+    tr_info("[NET-%d] Request header (%u): %s", thread_id, req_len, request);
 
     /* send request to server */
     result = tcpsocket.send(request, req_len);
@@ -130,7 +131,7 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
     char *receive_buffer = &g_receive_buffer[thread_id * RECV_BUF_SIZE];
 
     tcpsocket.set_blocking(false);
-    printf("[NET-%d] Non-blocking socket mode set\r\n", thread_id);
+    tr_info("[NET-%d] Non-blocking socket mode set", thread_id);
 
     size_t received_bytes = 0;
     int body_index = -1;
@@ -166,7 +167,7 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
                     if (body_index < 0) {
                         continue;
                     } else {
-                        printf("[NET-%d] Found body index: %d\r\n", thread_id, body_index);
+                        tr_info("[NET-%d] Found body index: %d", thread_id, body_index);
 
                         /* remove header before comparison */
                         memmove(receive_buffer, &receive_buffer[body_index + 4], result - body_index - 4);
@@ -186,9 +187,9 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
                 speed = float(received_bytes) / timer.read();
                 percent = float(received_bytes) * 100 / float(data_length);
                 time_left = (data_length - received_bytes) / speed;
-                printf("[NET-%d] Received bytes: %u, (%.2f%%, %.2fKB/s, ETA: %02d:%02d:%02d)\r\n",
-                       thread_id, received_bytes, percent, speed / 1024,
-                       time_left / 3600, (time_left / 60) % 60, time_left % 60);
+                tr_info("[NET-%d] Received bytes: %u, (%.2f%%, %.2fKB/s, ETA: %02d:%02d:%02d)",
+                        thread_id, received_bytes, percent, speed / 1024,
+                        time_left / 3600, (time_left / 60) % 60, time_left % 60);
             }
         } while ((result > 0) && (received_bytes < data_length));
     }
@@ -197,10 +198,10 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
 
     timer.stop();
     float f_received_bytes = float(received_bytes);
-    printf("[NET-%d] Downloaded: %.2fKB (%.2fKB/s, %.2f secs)\r\n", thread_id,
-           f_received_bytes / 1024.,
-           f_received_bytes / (timer.read() * 1024.),
-           timer.read());
+    tr_info("[NET-%d] Downloaded: %.2fKB (%.2fKB/s, %.2f secs)", thread_id,
+            f_received_bytes / 1024.,
+            f_received_bytes / (timer.read() * 1024.),
+            timer.read());
 
     return received_bytes;
 }

TESTS/integration/COMMON/file_test.cpp

@@ -24,6 +24,7 @@
 
 #include "mbed.h"
 #include "unity/unity.h"
+#include "common_defines_test.h"
 
 void file_test_write(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size)
 {
@@ -58,8 +59,8 @@ void file_test_write(const char *file, size_t offset, const unsigned char *data,
     TEST_ASSERT_EQUAL_INT_MESSAGE(0, result, "could not close file");
 
     timer.stop();
-    printf("[FS] Wrote: \"%s\" %.2fKB (%.2fKB/s, %.2f secs)\r\n", file,
-           float(data_length) / 1024, float(data_length) / timer.read() / 1024, timer.read());
+    tr_info("[FS] Wrote: \"%s\" %.2fKB (%.2fKB/s, %.2f secs)", file,
+            float(data_length) / 1024, float(data_length) / timer.read() / 1024, timer.read());
 }
 
 void file_test_read(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size)
@@ -100,8 +101,8 @@ void file_test_read(const char *file, size_t offset, const unsigned char *data,
 
     free(buffer);
 
-    printf("[FS] Read : \"%s\" %.2fKB (%.2fKB/s, %.2f secs)\r\n", file,
-           float(data_length) / 1024, float(data_length) / timer.read() / 1024, timer.read());
+    tr_info("[FS] Read : \"%s\" %.2fKB (%.2fKB/s, %.2f secs)", file,
+            float(data_length) / 1024, float(data_length) / timer.read() / 1024, timer.read());
 }
 
 #endif //#if INTEGRATION_TESTS

TESTS/integration/net-single/main.cpp

@@ -68,12 +68,12 @@ static control_t setup_network(const size_t call_count)
         if (err == NSAPI_ERROR_OK) {
             break;
         } else {
-            printf("[ERROR] Connecting to network. Retrying %d of %d.\r\n", tries, MAX_RETRIES);
+            tr_error("[ERROR] Connecting to network. Retrying %d of %d.", tries, MAX_RETRIES);
         }
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
-    printf("[NET] IP address is '%s'\n", interface->get_ip_address());
-    printf("[NET] MAC address is '%s'\n", interface->get_mac_address());
+    tr_info("[NET] IP address is '%s'", interface->get_ip_address());
+    tr_info("[NET] MAC address is '%s'", interface->get_mac_address());
     return CaseNext;
 }
 

TESTS/integration/net-threaded/main.cpp

@@ -68,12 +68,12 @@ static control_t setup_network(const size_t call_count)
         if (err == NSAPI_ERROR_OK) {
             break;
         } else {
-            printf("[ERROR] Connecting to network. Retrying %d of %d.\r\n", tries, MAX_RETRIES);
+            tr_error("[ERROR] Connecting to network. Retrying %d of %d.", tries, MAX_RETRIES);
         }
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
-    printf("[NET] IP address is '%s'\n", net->get_ip_address());
-    printf("[NET] MAC address is '%s'\n", net->get_mac_address());
+    tr_info("[NET] IP address is '%s'", net->get_ip_address());
+    tr_info("[NET] MAC address is '%s'", net->get_mac_address());
     return CaseNext;
 }
 

TESTS/integration/stress-net-fs/main.cpp

@@ -73,12 +73,12 @@ static control_t setup_network(const size_t call_count)
         if (err == NSAPI_ERROR_OK) {
             break;
         } else {
-            printf("[ERROR] Connecting to network. Retrying %d of %d...\r\n", tries, MAX_RETRIES);
+            tr_error("[ERROR] Connecting to network. Retrying %d of %d...", tries, MAX_RETRIES);
         }
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
-    printf("[NET] IP address is '%s'\n", interface->get_ip_address());
-    printf("[NET] MAC address is '%s'\n", interface->get_mac_address());
+    tr_info("[NET] IP address is '%s'", interface->get_ip_address());
+    tr_info("[NET] MAC address is '%s'", interface->get_mac_address());
     return CaseNext;
 }
 
@@ -206,7 +206,7 @@ void test_malloc()
 
     void *bufferTest = NULL;
     TEST_ASSERT_MESSAGE(size > 0, "Size must not be zero for test");
-    printf("Allocating %d bytes", (int)size);
+    tr_info("Allocating %d bytes", (int)size);
     bufferTest = malloc(size);
     TEST_ASSERT(bufferTest != NULL);
     free(bufferTest);

TESTS/netsocket/dns/asynchronous_dns_cache.cpp

@@ -59,12 +59,12 @@ void ASYNCHRONOUS_DNS_CACHE()
         int delay_ms = (ticker_us - started_us) / 1000;
 
         static int delay_first = delay_ms / 2;
-        printf("Delays: first: %i, delay_ms: %i\n", delay_first, delay_ms);
+        tr_info("Delays: first: %i, delay_ms: %i", delay_first, delay_ms);
         // Check that cached accesses are at least twice as fast as the first one
         TEST_ASSERT_TRUE(i == 0 || delay_ms <= delay_first);
 
-        printf("DNS: query \"%s\" => \"%s\", time %i ms\n",
-               dns_test_hosts[0], data.addr.get_ip_address(), delay_ms);
+        tr_info("DNS: query \"%s\" => \"%s\", time %i ms",
+                dns_test_hosts[0], data.addr.get_ip_address(), delay_ms);
     }
 }
 #endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_cancel.cpp

@@ -44,7 +44,7 @@ void ASYNCHRONOUS_DNS_CANCEL()
             count++;
         } else {
             // No memory to initiate DNS query, callback will not be called
-            printf("Error: No resources to initiate DNS query for %s\n", dns_test_hosts[i]);
+            tr_error("Error: No resources to initiate DNS query for %s", dns_test_hosts[i]);
             data[i].result = data[i].req_result;
             data[i].value_set = true;
         }
@@ -65,21 +65,21 @@ void ASYNCHRONOUS_DNS_CANCEL()
 
     for (unsigned int i = 0; i < MBED_CONF_APP_DNS_TEST_HOSTS_NUM; i++) {
         if (!data[i].value_set) {
-            printf("DNS: query \"%s\" => cancel\n", dns_test_hosts[i]);
+            tr_info("DNS: query \"%s\" => cancel", dns_test_hosts[i]);
             continue;
         }
         TEST_ASSERT(data[i].result == NSAPI_ERROR_OK || data[i].result == NSAPI_ERROR_NO_MEMORY || data[i].result == NSAPI_ERROR_BUSY || data[i].result == NSAPI_ERROR_DNS_FAILURE || data[i].result == NSAPI_ERROR_TIMEOUT);
         if (data[i].result == NSAPI_ERROR_OK) {
-            printf("DNS: query \"%s\" => \"%s\"\n",
-                   dns_test_hosts[i], data[i].addr.get_ip_address());
+            tr_info("DNS: query \"%s\" => \"%s\"",
+                    dns_test_hosts[i], data[i].addr.get_ip_address());
         } else if (data[i].result == NSAPI_ERROR_DNS_FAILURE) {
-            printf("DNS: query \"%s\" => DNS failure\n", dns_test_hosts[i]);
+            tr_error("DNS: query \"%s\" => DNS failure", dns_test_hosts[i]);
         } else if (data[i].result == NSAPI_ERROR_TIMEOUT) {
-            printf("DNS: query \"%s\" => timeout\n", dns_test_hosts[i]);
+            tr_error("DNS: query \"%s\" => timeout", dns_test_hosts[i]);
         } else if (data[i].result == NSAPI_ERROR_NO_MEMORY) {
-            printf("DNS: query \"%s\" => no memory\n", dns_test_hosts[i]);
+            tr_error("DNS: query \"%s\" => no memory", dns_test_hosts[i]);
         } else if (data[i].result == NSAPI_ERROR_BUSY) {
-            printf("DNS: query \"%s\" => busy\n", dns_test_hosts[i]);
+            tr_error("DNS: query \"%s\" => busy", dns_test_hosts[i]);
         }
     }
 

TESTS/netsocket/dns/asynchronous_dns_non_async_and_async.cpp

@@ -41,8 +41,8 @@ void ASYNCHRONOUS_DNS_NON_ASYNC_AND_ASYNC()
     for (unsigned int i = 0; i < MBED_CONF_APP_DNS_TEST_HOSTS_NUM; i++) {
         SocketAddress addr;
         int err = get_interface()->gethostbyname(dns_test_hosts[i], &addr);
-        printf("DNS: query \"%s\" => \"%s\"\n",
-               dns_test_hosts[i], addr.get_ip_address());
+        tr_info("DNS: query \"%s\" => \"%s\"",
+                dns_test_hosts[i], addr.get_ip_address());
 
         TEST_ASSERT_EQUAL(0, err);
         TEST_ASSERT((bool)addr);
@@ -53,8 +53,8 @@ void ASYNCHRONOUS_DNS_NON_ASYNC_AND_ASYNC()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, data.result);
 
-    printf("DNS: query \"%s\" => \"%s\"\n",
-           dns_test_hosts_second[0], data.addr.get_ip_address());
+    tr_info("DNS: query \"%s\" => \"%s\"",
+            dns_test_hosts_second[0], data.addr.get_ip_address());
 
     TEST_ASSERT(strlen(data.addr.get_ip_address()) > 1);
 }

TESTS/netsocket/dns/dns_tests.h

@@ -19,6 +19,9 @@
 #define DNS_TESTS_H
 
 #include "nsapi_dns.h"
+#include "mbed_trace.h"
+
+#define TRACE_GROUP "GRNT"
 
 #ifndef MBED_CONF_APP_DNS_SIMULT_QUERIES
 #ifdef MBED_CONF_CELLULAR_OFFLOAD_DNS_QUERIES