From d7e7fd43b8c8feeaca637fe8c054baa69c5b9c2f Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 17 4月 2015 01:03:28 +0800
Subject: [PATCH] Correct error tests, resolve #29 unexpected error -108

---
 libscpi/src/parser.c    |    4 +++-
 libscpi/test/test_lib.c |   35 +++++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 122b557..ecf26ec 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -593,8 +593,10 @@
         return FALSE;
     }
 
+    paramSkipWhitespace(context);
     if (locateText(context->paramlist.parameters, context->paramlist.length, value, &length)) {
-        paramSkipBytes(context, length);
+        paramSkipBytes(context, length + 2);
+        paramSkipWhitespace(context);
         if (len) {
             *len = length;
         }
diff --git a/libscpi/test/test_lib.c b/libscpi/test/test_lib.c
index 3fc74b8..3ef7b29 100644
--- a/libscpi/test/test_lib.c
+++ b/libscpi/test/test_lib.c
@@ -15,6 +15,27 @@
  * CUnit Test Suite
  */
 
+scpi_result_t text_function(scpi_t* context) {
+    const char* param;
+    size_t param_len;
+
+    if (!SCPI_ParamText(context, &param, &param_len, TRUE)) {
+        return SCPI_RES_ERR;
+    }
+
+    if (!SCPI_ParamText(context, &param, &param_len, TRUE)) {
+        return SCPI_RES_ERR;
+    }
+
+    char test[100];
+    memcpy(test, param, param_len);
+    test[param_len] = 0;
+
+    SCPI_ResultText(context, test);
+
+    return SCPI_RES_OK;
+}
+
 static const scpi_command_t scpi_commands[] = {
     /* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
     { .pattern = "*CLS", .callback = SCPI_CoreCls,},
@@ -42,6 +63,8 @@
 
     { .pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
     
+    { .pattern = "TEXTfunction", .callback = text_function,},
+
     SCPI_CMD_LIST_END
 };
 
@@ -65,7 +88,7 @@
 
 scpi_t scpi_context;
 static void error_buffer_clear(void) {
-    err_buffer[0] = '\0';
+    err_buffer[0] = 0;
     err_buffer_pos = 0;
 
     SCPI_EventClear(&scpi_context);
@@ -194,23 +217,27 @@
     error_buffer_clear();
 
 #define TEST_ERROR(data, output, err_num) {                     \
+    output_buffer_clear();                                      \
+    error_buffer_clear();                                       \
     SCPI_Input(&scpi_context, data, strlen(data));              \
     CU_ASSERT_STRING_EQUAL(output, output_buffer);              \
-    error_buffer_clear();                                       \
+    CU_ASSERT_EQUAL(err_buffer[0], err_num)                     \
 }
 
     TEST_ERROR("*IDN?\r\n", "MA, IN, 0, VER\r\n", 0);
-    output_buffer_clear();
     TEST_ERROR("IDN?\r\n", "", SCPI_ERROR_UNDEFINED_HEADER);
     TEST_ERROR("*ESE\r\n", "", SCPI_ERROR_MISSING_PARAMETER);
     TEST_ERROR("*IDN? 12\r\n", "MA, IN, 0, VER\r\n", SCPI_ERROR_PARAMETER_NOT_ALLOWED);
-    output_buffer_clear();
+    TEST_ERROR("TEXT \"PARAM1\", \"PARAM2\"\r\n", "\"PARAM2\"\r\n", 0);
 
     // TODO: SCPI_ERROR_INVALID_SEPARATOR
     // TODO: SCPI_ERROR_INVALID_SUFFIX
     // TODO: SCPI_ERROR_SUFFIX_NOT_ALLOWED
     // TODO: SCPI_ERROR_EXECUTION_ERROR
     // TODO: SCPI_ERROR_ILLEGAL_PARAMETER_VALUE
+
+    output_buffer_clear();
+    error_buffer_clear();
 }
 
 void testIEEE4882(void) {

--
Gitblit v1.9.1