From a79e3f82d6c19f9991327444ea156380801bffda Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 14 2月 2016 00:25:03 +0800
Subject: [PATCH] Emit also queue overflow error (issue #66)
---
libscpi/test/test_scpi_utils.c | 307 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 203 insertions(+), 104 deletions(-)
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index 0301656..98a7305 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -70,34 +70,44 @@
}
static void test_Int32ToStr() {
- const size_t max=32+1;
+ const size_t max = 32 + 1;
int32_t val[] = {0, 1, -1, INT32_MIN, INT32_MAX, 0x01234567, 0x89abcdef};
- int N = sizeof(val) / sizeof(int32_t);
+ int N = sizeof (val) / sizeof (int32_t);
int i;
char str[max];
char ref[max];
size_t len;
// test signed conversion to decimal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_Int32ToStr(val[i], str, max);
snprintf(ref, max, "%"PRIi32, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+
+ int16_t val16[] = {0, 1, -1, INT16_MIN, INT16_MAX, 0x0123, 0x4567, 0x89ab, 0xcdef};
+ int N16 = sizeof (val16) / sizeof (int16_t);
+ // test signed conversion to decimal numbers
+ for (i = 0; i < N16; i++) {
+ len = SCPI_Int32ToStr((int32_t) val16[i], str, max);
+ snprintf(ref, max, "%"PRIi16, val16[i]);
CU_ASSERT(len == strlen(ref));
CU_ASSERT_STRING_EQUAL(str, ref);
}
}
static void test_UInt32ToStrBase() {
- const size_t max=32+1;
+ const size_t max = 32 + 1;
uint32_t val[] = {0, 1, -1, INT32_MIN, INT32_MAX, 0x01234567, 0x89abcdef};
- int N = sizeof(val) / sizeof(uint32_t);
+ int N = sizeof (val) / sizeof (uint32_t);
int i;
char str[max];
char ref[max];
size_t len;
// test conversion to decimal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_UInt32ToStrBase(val[i], str, max, 10);
snprintf(ref, max, "%"PRIu32, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -105,7 +115,7 @@
}
// test conversion to hexadecimal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_UInt32ToStrBase(val[i], str, max, 16);
snprintf(ref, max, "%"PRIX32, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -113,7 +123,7 @@
}
// test conversion to octal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_UInt32ToStrBase(val[i], str, max, 8);
snprintf(ref, max, "%"PRIo32, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -143,16 +153,16 @@
}
static void test_Int64ToStr() {
- const size_t max=64+1;
+ const size_t max = 64 + 1;
int64_t val[] = {0, 1, -1, INT64_MIN, INT64_MAX, 0x0123456789abcdef, 0xfedcba9876543210};
- int N = sizeof(val) / sizeof(int64_t);
+ int N = sizeof (val) / sizeof (int64_t);
int i;
char str[max];
char ref[max];
size_t len;
// test conversion to decimal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_Int64ToStr(val[i], str, max);
snprintf(ref, max, "%"PRIi64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -161,16 +171,16 @@
}
static void test_UInt64ToStrBase() {
- const size_t max=64+1;
+ const size_t max = 64 + 1;
uint64_t val[] = {0, 1, -1, INT64_MIN, INT64_MAX, 0x0123456789abcdef, 0xfedcba9876543210};
- int N = sizeof(val) / sizeof(uint64_t);
+ int N = sizeof (val) / sizeof (uint64_t);
int i;
char str[max];
char ref[max];
size_t len;
// test conversion to decimal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_UInt64ToStrBase(val[i], str, max, 10);
snprintf(ref, max, "%"PRIu64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -178,7 +188,7 @@
}
// test conversion to hexadecimal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_UInt64ToStrBase(val[i], str, max, 16);
snprintf(ref, max, "%"PRIX64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -186,7 +196,7 @@
}
// test conversion to octal numbers
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_UInt64ToStrBase(val[i], str, max, 8);
snprintf(ref, max, "%"PRIo64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -215,16 +225,57 @@
CU_ASSERT_STRING_EQUAL(str, "1111111011011100101110101001100001110110010101000011001000010000");
}
+static void test_scpi_dtostre() {
+ const size_t strsize = 49 + 1;
+ double val[] = {NAN, INFINITY, -INFINITY, 0,
+ 1, 1.1, 1.01, 1.001, 1.0001, 1.00001, 1.000001, 1.0000001, 1.00000001,
+ 1.000000001, 1.0000000001, 1.00000000001, 1.000000000001,
+ 1.0000000000001, 1e-5, 1.1e-5, 1.01e-5, 1.001e-5, 1.0001e-5, 1.00001e-5,
+ 1.000001e-5, 1.0000001e-5, 1.00000001e-5, 1.000000001e-5,
+ 1.0000000001e-5, 1.00000000001e-5, 1.000000000001e-5,
+ 1.0000000000001e-5, 1, 12, 123, 1234, 12345, 123456, 1234567, 12345678,
+ 123456789, 1234567890, 12345678901, 123456789012, 1234567890123,
+ 12345678901234, 123456789012345, 1234567890123456, 12345678901234567,
+ 123456789012345678, 1234567890123456789, 1234567890123456789e1, 1.1,
+ 10.1, 100.1, 1000.1, 10000.1, 100000.1, 1000000.1, 10000000.1,
+ 100000000.1, 1000000000.1, 0.1234567890123456789,
+ 0.01234567890123456789, 0.001234567890123456789,
+ 0.0001234567890123456789, 0.00001234567890123456789,
+ 0.000001234567890123456789, 0.0000001234567890123456789,
+ 0.00000001234567890123456789, 0.00000000123456789, 0.000000000123456789,
+ 0.0000000000123456789, 0.00000000000123456789, 0.000000000000123456789,
+ 0.0000000000000123456789, 0.00000000000000123456789,
+ 0.000000000000000123456789, 0.0000000000000000123456789,
+ -1e-5, -1.1e-5, -1.01e-5, -1.001e-5, -1.0001e-5, -1.00001e-5,
+ -1.00001e-6, -1.00001e-10, -1.00001e-20, -1.00001e-50, -1.00001e-100,
+ -1.00001e-200, -1.00001e-300, -1.00001e6, -1.00001e10, -1.00001e20,
+ -1.00001e50, -1.00001e100, -1.00001e150, -1.00001e200, -1.00001e300,
+ 1.7976931348623157e308, 2.2250738585072014e-308,
+ -1.7976931348623157e308, -2.2250738585072014e-308};
+ int N = sizeof (val) / sizeof (*val);
+ int i;
+ char str[strsize];
+ char ref[strsize];
+ size_t len;
+
+ for (i = 0; i < N; i++) {
+ len = strlen(SCPI_dtostre(val[i], str, strsize, 15, 0));
+ snprintf(ref, strsize, "%.15lg", val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+}
+
static void test_floatToStr() {
- const size_t max=49+1;
+ const size_t max = 49 + 1;
float val[] = {1, -1, 1.1, -1.1, 1e3, 1e30, -1.3e30, -1.3e-30};
- int N = sizeof(val) / sizeof(float);
+ int N = sizeof (val) / sizeof (float);
int i;
char str[max];
char ref[max];
size_t len;
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_FloatToStr(val[i], str, max);
snprintf(ref, max, "%g", val[i]);
CU_ASSERT(len == strlen(ref));
@@ -233,17 +284,17 @@
}
static void test_doubleToStr() {
- const size_t max=49+1;
+ const size_t max = 49 + 1;
double val[] = {1, -1, 1.1, -1.1, 1e3, 1e30, -1.3e30, -1.3e-30};
- int N = sizeof(val) / sizeof(double);
+ int N = sizeof (val) / sizeof (*val);
int i;
char str[max];
char ref[max];
size_t len;
- for (i=0; i<N; i++) {
+ for (i = 0; i < N; i++) {
len = SCPI_DoubleToStr(val[i], str, max);
- snprintf(ref, max, "%lg", val[i]);
+ snprintf(ref, max, "%.15lg", val[i]);
CU_ASSERT(len == strlen(ref));
CU_ASSERT_STRING_EQUAL(str, ref);
}
@@ -452,15 +503,15 @@
scpi_bool_t result;
int32_t values[20];
- #define TEST_MATCH_COMMAND(p, s, r) \
+#define TEST_MATCH_COMMAND(p, s, r) \
do { \
result = matchCommand(p, s, strlen(s), NULL, 0, 0); \
CU_ASSERT_EQUAL(result, r); \
} while(0) \
- #define NOPAREN(...) __VA_ARGS__
+#define NOPAREN(...) __VA_ARGS__
- #define TEST_MATCH_COMMAND2(p, s, r, v) \
+#define TEST_MATCH_COMMAND2(p, s, r, v) \
do { \
int32_t evalues[] = {NOPAREN v}; \
unsigned int cnt = (sizeof(evalues)/4); \
@@ -476,92 +527,94 @@
TEST_MATCH_COMMAND("Ab", "ab", TRUE);
TEST_MATCH_COMMAND("Ab", "aB", TRUE);
TEST_MATCH_COMMAND("AB", "a", FALSE);
- TEST_MATCH_COMMAND("ABc:AACddd", "ab:aac", TRUE);
- TEST_MATCH_COMMAND("ABc:AACddd", "abc:aac", TRUE);
- TEST_MATCH_COMMAND("ABc:AACddd", "abc:aacddd", TRUE);
- TEST_MATCH_COMMAND("ABc:AACddd", "abc:aacdd", FALSE);
- TEST_MATCH_COMMAND("ABc:AACddd", "a:aac", FALSE);
- TEST_MATCH_COMMAND("ABc:AACddd", ":ab:aac", TRUE);
- TEST_MATCH_COMMAND("ABc:AACddd", ":abc:aac", TRUE);
- TEST_MATCH_COMMAND("ABc:AACddd", ":abc:aacddd", TRUE);
- TEST_MATCH_COMMAND("ABc:AACddd", ":abc:aacdd", FALSE);
- TEST_MATCH_COMMAND("ABc:AACddd", ":a:aac", FALSE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", "ab:aac", TRUE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", "abcc:aac", TRUE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", "abcc:aacddd", TRUE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", "abcc:aacdd", FALSE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", "a:aac", FALSE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", ":ab:aac", TRUE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", ":abcc:aac", TRUE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", ":abcc:aacddd", TRUE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", ":abcc:aacdd", FALSE);
+ TEST_MATCH_COMMAND("ABcc:AACddd", ":a:aac", FALSE);
TEST_MATCH_COMMAND("?", "?", TRUE);
TEST_MATCH_COMMAND("A?", "A?", TRUE);
TEST_MATCH_COMMAND("A", "A?", FALSE);
TEST_MATCH_COMMAND("A?", "A", FALSE);
- TEST_MATCH_COMMAND("[:ABc]:AACddd", ":ab:aac", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:AACddd", "aac", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:AACddd", "aac?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:AACddd?", ":ab:aac?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:AACddd?", "aac?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:AACddd?", "aac", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd]:CDe", "ab:bc:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd]:CDe", "ab:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd]:CDe", "ab:cd?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd]:CDe?", "ab:bc:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd]:CDe?", "ab:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd]:CDe?", "ab:cd", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc:BCd[:CDe]", "ab:bc:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc:BCd[:CDe]", "ab:bc", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc:BCd[:CDe]", "ab:bc?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc:BCd[:CDe]?", "ab:bc:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc:BCd[:CDe]?", "ab:bc?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc:BCd[:CDe]?", "ab:bc", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:AACddd", ":ab:aac", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:AACddd", "aac", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:AACddd", "aac?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:AACddd?", ":ab:aac?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:AACddd?", "aac?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:AACddd?", "aac", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd]:CDEFGeeeee", "ab:bcc:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd]:CDEFGeeeee", "ab:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd]:CDEFGeeeee", "ab:cdefg?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd]:CDEFGeeeee?", "ab:bcc:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd]:CDEFGeeeee?", "ab:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd]:CDEFGeeeee?", "ab:cdefg", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc:BCCdddd[:CDEFGeeeee]", "ab:bcc:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc:BCCdddd[:CDEFGeeeee]", "ab:bcc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc:BCCdddd[:CDEFGeeeee]", "ab:bcc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc:BCCdddd[:CDEFGeeeee]?", "ab:bcc:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc:BCCdddd[:CDEFGeeeee]?", "ab:bcc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc:BCCdddd[:CDEFGeeeee]?", "ab:bcc", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "ab:bc:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "ab:bc", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "bc:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "ab:bc?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "bc:cd?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "ab:bc:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "ab:bc?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "bc:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "ab:bc", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "bc:cd", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]", "ab:bcc:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]", "ab:bcc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]", "bcc:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]", "ab:bcc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]", "bcc:cdefg?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]?", "ab:bcc:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]?", "ab:bcc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]?", "bcc:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]?", "ab:bcc", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABcc]:BCCdddd[:CDEFGeeeee]?", "bcc:cdefg", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:bc:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:bc", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:bc?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:cd?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:bc:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:bc?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:bc", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:cd", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]", "ab:bcc:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]", "ab:bcc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]", "ab:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]", "ab:bcc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]", "ab:cdefg?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]?", "ab:bcc:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]?", "ab:bcc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]?", "ab:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]?", "ab:bcc", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee]?", "ab:cdefg", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:cd:de", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:de", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd:de", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:de", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:cd?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:de?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd:de?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:de?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc:cdefg:defffffffff", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc:cdefg:deffffffffffffffffffff", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc:cdefg:de", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc:defffffffff", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:cdefg:defffffffff", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:cdefg", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:defffffffff", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc:cdefg?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc:defffffffff?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:cdefg:defffffffff?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:bcc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:cdefg?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab:defffffffff?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]", "ab?", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:cd:de?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:de?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd:de?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:de?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab?", TRUE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:cd", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:de", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd:de", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:de", FALSE); // test optional keyword
- TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:bcc:cdefg:defffffffff?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:bcc:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:bcc:defffffffff?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:cdefg:defffffffff?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:bcc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:cdefg?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:defffffffff?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:bcc:cdefg", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:bcc:defffffffff", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:cdefg:defffffffff", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:bcc", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:cdefg", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab:defffffffff", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABcc[:BCCdddd][:CDEFGeeeee][:DEFFFFFFFFFfffffffffff]?", "ab", FALSE); // test optional keyword
TEST_MATCH_COMMAND("*IDN?", "idn", FALSE); // common command
TEST_MATCH_COMMAND("*IDN?", "idn?", FALSE); // common command
TEST_MATCH_COMMAND("*IDN?", "*idn", FALSE); // common command
@@ -570,6 +623,32 @@
TEST_MATCH_COMMAND("*IDN?", ":idn?", FALSE); // common command
TEST_MATCH_COMMAND("*IDN?", ":*idn", FALSE); // common command
TEST_MATCH_COMMAND("*IDN?", ":*idn?", FALSE); // common command
+
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", ":MEAS?", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", "MEAS?", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", ":MEAS:DC?", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", "MEAS:DC?", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", ":MEAS:CURR?", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", "MEAS:CURR?", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", ":MEAS:SCAL:CURR?", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", "MEAS:SCAL:CURR?", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", ":MEAS:SCAL:CURR:DC?", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", "MEAS:SCAL:CURR:DC?", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", ":MEAS:CURR:DC?", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]?", "MEAS:CURR:DC?", TRUE);
+
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", ":MEAS", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", "MEAS", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", ":MEAS:DC", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", "MEAS:DC", FALSE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", ":MEAS:CURR", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", "MEAS:CURR", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", ":MEAS:SCAL:CURR", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", "MEAS:SCAL:CURR", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", ":MEAS:SCAL:CURR:DC", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", "MEAS:SCAL:CURR:DC", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", ":MEAS:CURR:DC", TRUE);
+ TEST_MATCH_COMMAND("MEASure[:SCALar]:CURRent[:DC]", "MEAS:CURR:DC", TRUE);
TEST_MATCH_COMMAND("ABCdef#", "abc", TRUE); // test numeric parameter
TEST_MATCH_COMMAND("ABCdef#", "abc1324", TRUE); // test numeric parameter
@@ -647,6 +726,24 @@
TEST_COMPOSE_COMMAND(":A;C", 2, 3, 1, ":C", TRUE);
}
+static void test_swap(void) {
+#define TEST_SWAP(l, a, b) CU_ASSERT_EQUAL(SCPI_Swap##l(a), b)
+
+ TEST_SWAP(16, 0x0011, 0x1100);
+ TEST_SWAP(16, 0x1234, 0x3412);
+
+ TEST_SWAP(32, 0x00000011, 0x11000000);
+ TEST_SWAP(32, 0x00001234, 0x34120000);
+ TEST_SWAP(32, 0x00AB1234, 0x3412AB00);
+ TEST_SWAP(32, 0xCDAB1234, 0x3412ABCD);
+
+ TEST_SWAP(64, 0x0000000000000011ull, 0x1100000000000000ull);
+ TEST_SWAP(64, 0x0000000000001234ull, 0x3412000000000000ull);
+ TEST_SWAP(64, 0x0000000000AB1234ull, 0x3412AB0000000000ull);
+ TEST_SWAP(64, 0x00000000CDAB1234ull, 0x3412ABCD00000000ull);
+ TEST_SWAP(64, 0x123456789ABCDEF0ull, 0xF0DEBC9A78563412ull);
+}
+
int main() {
unsigned int result;
CU_pSuite pSuite = NULL;
@@ -669,6 +766,7 @@
|| (NULL == CU_add_test(pSuite, "UInt32ToStrBase", test_UInt32ToStrBase))
|| (NULL == CU_add_test(pSuite, "Int64ToStr", test_Int64ToStr))
|| (NULL == CU_add_test(pSuite, "UInt64ToStrBase", test_UInt64ToStrBase))
+ || (NULL == CU_add_test(pSuite, "SCPI_dtostre", test_scpi_dtostre))
|| (NULL == CU_add_test(pSuite, "floatToStr", test_floatToStr))
|| (NULL == CU_add_test(pSuite, "doubleToStr", test_doubleToStr))
|| (NULL == CU_add_test(pSuite, "strBaseToInt32", test_strBaseToInt32))
@@ -681,6 +779,7 @@
|| (NULL == CU_add_test(pSuite, "matchPattern", test_matchPattern))
|| (NULL == CU_add_test(pSuite, "matchCommand", test_matchCommand))
|| (NULL == CU_add_test(pSuite, "composeCompoundCommand", test_composeCompoundCommand))
+ || (NULL == CU_add_test(pSuite, "swap", test_swap))
) {
CU_cleanup_registry();
return CU_get_error();
--
Gitblit v1.9.1