From 9b9bc8a81ad303ffb1e5eef12f34702b2aceef60 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 03:52:29 +0800
Subject: [PATCH] Support RESPONSE MESSAGE UNIT SEPARATOR, issue #21

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

diff --git a/libscpi/test/test_lib.c b/libscpi/test/test_lib.c
index 61d419b..2834582 100644
--- a/libscpi/test/test_lib.c
+++ b/libscpi/test/test_lib.c
@@ -15,7 +15,7 @@
  * CUnit Test Suite
  */
 
-scpi_result_t text_function(scpi_t* context) {
+static scpi_result_t text_function(scpi_t* context) {
     const char* param;
     size_t param_len;
 
@@ -36,14 +36,14 @@
     return SCPI_RES_OK;
 }
 
-scpi_result_t test_treeA(scpi_t* context) {
+static scpi_result_t test_treeA(scpi_t* context) {
 
     SCPI_ResultInt(context, 10);
 
     return SCPI_RES_OK;
 }
 
-scpi_result_t test_treeB(scpi_t* context) {
+static scpi_result_t test_treeB(scpi_t* context) {
 
     SCPI_ResultInt(context, 20);
 
@@ -187,17 +187,17 @@
 };
 
 
-int init_suite(void) {
+static int init_suite(void) {
     SCPI_Init(&scpi_context);
 
     return 0;
 }
 
-int clean_suite(void) {
+static int clean_suite(void) {
     return 0;
 }
 
-void testCommandsHandling(void) {
+static void testCommandsHandling(void) {
 #define TEST_INPUT(data, output) {                              \
     SCPI_Input(&scpi_context, data, strlen(data));              \
     CU_ASSERT_STRING_EQUAL(output, output_buffer);              \
@@ -213,6 +213,12 @@
     TEST_INPUT("*IDN?\r\n*IDN?\r\n*IDN?\r\n*IDN?\r\n", "MA, IN, 0, VER\r\nMA, IN, 0, VER\r\nMA, IN, 0, VER\r\nMA, IN, 0, VER\r\n");
     output_buffer_clear();
 
+    TEST_INPUT("*IDN?;*IDN?;*IDN?;*IDN?\r\n", "MA, IN, 0, VER;MA, IN, 0, VER;MA, IN, 0, VER;MA, IN, 0, VER\r\n");
+    output_buffer_clear();
+
+    TEST_INPUT("*IDN?;*OPC;*IDN?\r\n", "MA, IN, 0, VER;MA, IN, 0, VER\r\n");
+    output_buffer_clear();
+
     /* Test one command in multiple buffers */
     TEST_INPUT("*IDN?", "");
     TEST_INPUT("\r\n", "MA, IN, 0, VER\r\n");
@@ -224,14 +230,17 @@
     output_buffer_clear();
     
     /* Test ctree traversal */
-    TEST_INPUT("TEST:TREEA?;TREEB?\r\n", "10\r\n20\r\n");
+    TEST_INPUT("TEST:TREEA?;TREEB?\r\n", "10;20\r\n");
+    output_buffer_clear();
+
+    TEST_INPUT("TEST:TREEA?;:TEXT? \"PARAM1\", \"PARAM2\"\r\n", "10;\"PARAM2\"\r\n");
     output_buffer_clear();
 
     CU_ASSERT_EQUAL(err_buffer_pos, 0);
     error_buffer_clear();
 }
 
-void testErrorHandling(void) {
+static void testErrorHandling(void) {
     output_buffer_clear();
     error_buffer_clear();
 
@@ -259,7 +268,7 @@
     error_buffer_clear();
 }
 
-void testIEEE4882(void) {
+static void testIEEE4882(void) {
 #define TEST_IEEE4882(data, output) {                           \
     SCPI_Input(&scpi_context, data, strlen(data));              \
     CU_ASSERT_STRING_EQUAL(output, output_buffer);              \
@@ -279,7 +288,7 @@
 
     TEST_IEEE4882("*SRE 0xFF\r\n", "");
     TEST_IEEE4882("*SRE?\r\n", "255\r\n");
-    TEST_IEEE4882("*STB?\r\n", "0\r\n"); 
+    TEST_IEEE4882("*STB?\r\n", "0\r\n");
     TEST_IEEE4882("*ESR?\r\n", "1\r\n");
     
     srq_val = 0;
@@ -307,7 +316,7 @@
     TEST_IEEE4882("SYSTem:VERSion?\r\n", "1999.0\r\n");
 }
 
-void testParameters(void) {
+static void testParameters(void) {
     // TODO: test parsin parameters
     
     // TODO: Int
@@ -318,7 +327,7 @@
     // TODO: Choice
 }
 
-void testResults(void) {
+static void testResults(void) {
     // TODO: test producing results
     
     // TODO: String

--
Gitblit v1.9.1