From 8c408948cc956c50527cf6e6fc0808e185a6b105 Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周四, 16 4月 2015 22:27:12 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/j123b567/scpi-parser

---
 libscpi/test/test_lib.c |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libscpi/test/test_lib.c b/libscpi/test/test_lib.c
index 650e036..3fc74b8 100644
--- a/libscpi/test/test_lib.c
+++ b/libscpi/test/test_lib.c
@@ -32,15 +32,15 @@
     { .pattern = "*WAI", .callback = SCPI_CoreWai,},
 
     /* Required SCPI commands (SCPI std V1999.0 4.2.1) */
-    {.pattern = "SYSTem:ERRor[:NEXT]?", .callback = SCPI_SystemErrorNextQ,},
-    {.pattern = "SYSTem:ERRor:COUNt?", .callback = SCPI_SystemErrorCountQ,},
-    {.pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
+    { .pattern = "SYSTem:ERRor[:NEXT]?", .callback = SCPI_SystemErrorNextQ,},
+    { .pattern = "SYSTem:ERRor:COUNt?", .callback = SCPI_SystemErrorCountQ,},
+    { .pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
 
-    {.pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
-    {.pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
-    {.pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
+    { .pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
+    { .pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
+    { .pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
 
-    {.pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
+    { .pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
     
     SCPI_CMD_LIST_END
 };
@@ -106,8 +106,8 @@
     return SCPI_RES_OK;
 }
 
-bool_t TST_executed = FALSE;
-bool_t RST_executed = FALSE;
+scpi_bool_t TST_executed = FALSE;
+scpi_bool_t RST_executed = FALSE;
 static scpi_result_t SCPI_Test(scpi_t * context) {
     TST_executed = TRUE;
     return SCPI_RES_OK;
@@ -163,6 +163,7 @@
     CU_ASSERT_STRING_EQUAL(output, output_buffer);              \
 }
     output_buffer_clear();
+    error_buffer_clear();
 
     /* Test single command */
     TEST_INPUT("*IDN?\r\n", "MA, IN, 0, VER\r\n");
@@ -252,7 +253,7 @@
     CU_ASSERT_EQUAL(RST_executed, TRUE);
 
     TST_executed = FALSE;
-    TEST_IEEE4882("*TST?\r\n", "1\r\n");
+    TEST_IEEE4882("*TST?\r\n", "0\r\n");
     CU_ASSERT_EQUAL(TST_executed, TRUE);
     
     TEST_IEEE4882("*WAI\r\n", "");
@@ -312,3 +313,4 @@
     CU_cleanup_registry();
     return CU_get_error();
 }
+

--
Gitblit v1.9.1