From 0d4df3cf1b03cf19b24cbacf7bd5908d9968beab Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Wed, 9 Mar 2016 15:45:58 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9058
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 test/nasa_osal/configuration.xml | 148 +++++++++++++++++++++++++++----
 1 file changed, 130 insertions(+), 18 deletions(-)

diff --git a/test/nasa_osal/configuration.xml b/test/nasa_osal/configuration.xml
index e13b79ffa..0d628e57f 100644
--- a/test/nasa_osal/configuration.xml
+++ b/test/nasa_osal/configuration.xml
@@ -610,13 +610,32 @@ test_assert_sequence("ABC", "events order violation");]]></value>
               <value>Internal Tests</value>
             </type>
             <brief>
-              <value>Queues Functionality.</value>
+              <value>Queues Functionality</value>
             </brief>
             <description>
               <value>This sequence tests the NASA OSAL over ChibiOS/RT functionalities related to queues</value>
             </description>
             <shared_code>
-              <value><![CDATA[#include "osapi.h"]]></value>
+              <value><![CDATA[#include <string.h>
+
+#include "osapi.h"
+
+uint32 qid;
+
+#define WRITER_NUM_MESSAGES 16
+#define MESSAGE_SIZE        20
+
+static void test_task_writer(void) {
+  unsigned i;
+  int32 err;
+
+  for (i = 0; i < WRITER_NUM_MESSAGES; i++) {
+    err = OS_QueuePut(qid, "Hello World", 12, 0);
+    if (err != OS_SUCCESS) {
+      test_emit_token('*');
+    }
+  }
+}]]></value>
             </shared_code>
             <cases>
               <case>
@@ -667,14 +686,14 @@ test_assert(err == OS_INVALID_POINTER, "NULL not detected");]]></value>
                       <value />
                     </tags>
                     <code>
-                      <value><![CDATA[int32 err;
-uint32 qid;
-
-err = OS_QueueCreate(&qid,
-                     NULL,                      /* Error.*/
-                     4,
-                     128,
-                     0);
+                      <value><![CDATA[int32 err;
+uint32 qid;
+
+err = OS_QueueCreate(&qid,
+                     NULL,                      /* Error.*/
+                     4,
+                     128,
+                     0);
 test_assert(err == OS_INVALID_POINTER, "NULL not detected");]]></value>
                     </code>
                   </step>
@@ -686,14 +705,14 @@ test_assert(err == OS_INVALID_POINTER, "NULL not detected");]]></value>
                       <value />
                     </tags>
                     <code>
-                      <value><![CDATA[int32 err;
-uint32 qid;
-
-err = OS_QueueCreate(&qid,
-                     "very very long queue name",   /* Error.*/
-                     4,
-                     128,
-                     0);
+                      <value><![CDATA[int32 err;
+uint32 qid;
+
+err = OS_QueueCreate(&qid,
+                     "very very long queue name",   /* Error.*/
+                     4,
+                     128,
+                     0);
 test_assert(err == OS_ERR_NAME_TOO_LONG, "name limit not detected");]]></value>
                     </code>
                   </step>
@@ -734,6 +753,99 @@ test_assert(err == OS_SUCCESS, "queue deletion failed");]]></value>
                   </step>
                 </steps>
               </case>
+              <case>
+                <brief>
+                  <value>OS_QueuePut() and OS_QueueGet() functionality</value>
+                </brief>
+                <description>
+                  <value>A task writes on a queue, the messages are retrieved on the other side in blocking mode.</value>
+                </description>
+                <condition>
+                  <value />
+                </condition>
+                <various_code>
+                  <setup_code>
+                    <value><![CDATA[qid = 0;]]></value>
+                  </setup_code>
+                  <teardown_code>
+                    <value><![CDATA[if (qid != 0) {
+  (void) OS_QueueDelete(qid);
+}]]></value>
+                  </teardown_code>
+                  <local_variables>
+                    <value><![CDATA[uint32 tid;
+unsigned i;]]></value>
+                  </local_variables>
+                </various_code>
+                <steps>
+                  <step>
+                    <description>
+                      <value>Creataing a queue with depth 4 and message size 20</value>
+                    </description>
+                    <tags>
+                      <value />
+                    </tags>
+                    <code>
+                      <value><![CDATA[int32 err;
+
+err = OS_QueueCreate(&qid, "test queue", 4, MESSAGE_SIZE, 0);
+test_assert(err == OS_SUCCESS, "queue creation failed");]]></value>
+                    </code>
+                  </step>
+                  <step>
+                    <description>
+                      <value>Creating the writer task.</value>
+                    </description>
+                    <tags>
+                      <value />
+                    </tags>
+                    <code>
+                      <value><![CDATA[int32 err;
+
+err = OS_TaskCreate(&tid,
+                    "writer task",
+                    test_task_writer,
+                    (uint32 *)wa_test1,
+                    sizeof wa_test1,
+                    TASKS_BASE_PRIORITY,
+                    0);
+test_assert(err == OS_SUCCESS, "writer task creation failed");]]></value>
+                    </code>
+                  </step>
+                  <step>
+                    <description>
+                      <value>Reading messages from the writer task.</value>
+                    </description>
+                    <tags>
+                      <value />
+                    </tags>
+                    <code>
+                      <value><![CDATA[for (i = 0; i < WRITER_NUM_MESSAGES; i++) {
+  int32 err;
+  char data[MESSAGE_SIZE];
+  uint32 copied;
+
+  err = OS_QueueGet(qid, data, MESSAGE_SIZE, &copied, OS_Milli2Ticks(200));
+  test_assert(err == OS_SUCCESS, "timed out");
+  test_assert(strncmp(data, "Hello World", sizeof (data)) == 0,
+              "wrong message");
+}]]></value>
+                    </code>
+                  </step>
+                  <step>
+                    <description>
+                      <value>Waiting for task termination then checking for errors.</value>
+                    </description>
+                    <tags>
+                      <value />
+                    </tags>
+                    <code>
+                      <value><![CDATA[OS_TaskDelay(10);
+test_assert_sequence("", "queue write errors occurred");]]></value>
+                    </code>
+                  </step>
+                </steps>
+              </case>
             </cases>
           </sequence>
         </sequences>