From ed07df16da675c4c123e02a996822daf13d69c63 Mon Sep 17 00:00:00 2001
From: lhoerl <coder@lolux.de>
Date: 周一, 03 8月 2015 22:42:07 +0800
Subject: [PATCH] added full SCPI error messages added list for device dependent error messages some minor changes to get rid of compiler warnings added support for Keil ARM compiler added support for National Instruments CVI compiler removed bug if(c = '\0')...
---
libscpi/test/test_parser.c | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index cee918f..76a4053 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -13,7 +13,7 @@
* CUnit Test Suite
*/
-scpi_result_t text_function(scpi_t* context) {
+static scpi_result_t text_function(scpi_t* context) {
char param[100];
size_t param_len;
@@ -30,14 +30,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);
@@ -174,17 +174,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); \
@@ -200,6 +200,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");
@@ -211,17 +217,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\r\n\"PARAM2\"\r\n");
+ 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();
@@ -249,7 +255,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); \
@@ -316,7 +322,7 @@
CU_ASSERT_EQUAL(errCode, expected_error_code); \
}
-void testSCPI_ParamInt(void) {
+static void testSCPI_ParamInt(void) {
TEST_ParamInt("10", TRUE, 10, TRUE, 0);
TEST_ParamInt("", FALSE, 0, FALSE, 0);
TEST_ParamInt("10.5", TRUE, 10, TRUE, 0); // TODO: should be FALSE, -104
@@ -351,7 +357,7 @@
CU_ASSERT_EQUAL(errCode, expected_error_code); \
}
-void testSCPI_ParamDouble(void) {
+static void testSCPI_ParamDouble(void) {
TEST_ParamDouble("10", TRUE, 10, TRUE, 0);
TEST_ParamDouble("", FALSE, 0, FALSE, 0);
TEST_ParamDouble("10.5", TRUE, 10.5, TRUE, 0);
@@ -387,7 +393,7 @@
CU_ASSERT_EQUAL(errCode, expected_error_code); \
}
-void testSCPI_ParamCharacters(void) {
+static void testSCPI_ParamCharacters(void) {
TEST_ParamCharacters("10", TRUE, "10", TRUE, 0);
TEST_ParamCharacters(" ABCD", TRUE, "ABCD", TRUE, 0); // TokProgramMnemonic
TEST_ParamCharacters("\"ABCD\"", TRUE, "ABCD", TRUE, 0); // TokDoubleQuoteProgramData
--
Gitblit v1.9.1