From 2f71461b2953373557bc0fbb0065859ce46378cc Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 18 Aug 2008 09:58:08 +0000 Subject: Added test case 557 to verify libcurl's internal curl_m*printf() functions formatting functionality when handling signed and unsigned longs, as well as our curl_off_t data type. --- tests/data/Makefile.am | 2 +- tests/data/test557 | 52 +++++++++ tests/libtest/Makefile.am | 4 +- tests/libtest/lib557.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 325 insertions(+), 2 deletions(-) create mode 100644 tests/data/test557 create mode 100644 tests/libtest/lib557.c (limited to 'tests') diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index d8dbbb23c..b51de8e52 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -51,7 +51,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test1021 test1022 test1023 test309 test616 test617 test618 test619 \ test620 test621 test622 test623 test624 test625 test626 test627 test554 \ test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030 \ - test556 test1031 test628 test629 test630 test631 test632 test1032 \ + test556 test557 test1031 test628 test629 test630 test631 test632 test1032 \ test1033 test539 test1034 test1035 test1036 test1037 test1038 test1039 \ test1040 test1041 test1042 test1043 test1044 test1045 test1046 test1047 \ test1048 test1049 test1050 test1051 test1052 test1053 test1054 test1055 \ diff --git a/tests/data/test557 b/tests/data/test557 new file mode 100644 index 000000000..2f1c1435a --- /dev/null +++ b/tests/data/test557 @@ -0,0 +1,52 @@ + + + +curl_mprintf + + +# Server-side + + + + +# Client-side + + +none + + +lib557 + + +curl_mprintf + + +nothing + + + +# +# Verify data after the test has been "shot" + + +unsigned long test #1: OK +unsigned long test #2: OK +unsigned long test #3: OK +unsigned long test #4: OK +signed long test #1: OK +signed long test #2: OK +signed long test #3: OK +signed long test #4: OK +signed long test #5: OK +signed long test #6: OK +signed long test #7: OK +curl_off_t test #1: OK +curl_off_t test #2: OK +curl_off_t test #3: OK +curl_off_t test #4: OK +curl_off_t test #5: OK +curl_off_t test #6: OK +curl_off_t test #7: OK + + + diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index b24b90014..94774c310 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -53,7 +53,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \ lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527 \ lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \ lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \ - lib539 + lib539 lib557 # Dependencies (may need to be overriden) LDADD = $(LIBDIR)/libcurl.la @@ -160,3 +160,5 @@ lib553_SOURCES = lib553.c $(SUPPORTFILES) lib554_SOURCES = lib554.c $(SUPPORTFILES) lib556_SOURCES = lib556.c $(SUPPORTFILES) + +lib557_SOURCES = lib557.c $(SUPPORTFILES) diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c new file mode 100644 index 000000000..8e49dbff3 --- /dev/null +++ b/tests/libtest/lib557.c @@ -0,0 +1,269 @@ +/***************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * $Id$ + */ + +/* + * The purpose of this test is to minimally exercise libcurl's internal + * curl_m*printf formatting capabilities and handling of some data types. + */ + +#include "test.h" + +int curl_msprintf(char *buffer, const char *format, ...); + + +#if (CURL_SIZEOF_CURL_OFF_T > 4) +# if (CURL_SIZEOF_LONG > 4) +# define MPRNT_SUFFIX_CURL_OFF_T L +# else +# define MPRNT_SUFFIX_CURL_OFF_T LL +# endif +#else +# if (CURL_SIZEOF_LONG > 2) +# define MPRNT_SUFFIX_CURL_OFF_T L +# else +# define MPRNT_SUFFIX_CURL_OFF_T LL +# endif +#endif + +#ifdef CURL_ISOCPP +# define MPRNT_OFF_T_C_HELPER2(Val,Suffix) Val ## Suffix +#else +# define MPRNT_OFF_T_C_HELPER2(Val,Suffix) Val/**/Suffix +#endif +#define MPRNT_OFF_T_C_HELPER1(Val,Suffix) MPRNT_OFF_T_C_HELPER2(Val,Suffix) +#define MPRNT_OFF_T_C(Val) MPRNT_OFF_T_C_HELPER1(Val,MPRNT_SUFFIX_CURL_OFF_T) + + +#define BUFSZ 256 +#define NUM_ULONG_TESTS 4 +#define NUM_SLONG_TESTS 7 +#define NUM_COFFT_TESTS 7 + + +struct unslong_st { + unsigned long num; /* unsigned long */ + const char *expected; /* expected string */ + char result[BUFSZ]; /* result string */ +}; + + +struct siglong_st { + long num; /* signed long */ + const char *expected; /* expected string */ + char result[BUFSZ]; /* result string */ +}; + + +struct curloff_st { + curl_off_t num; /* curl_off_t */ + const char *expected; /* expected string */ + char result[BUFSZ]; /* result string */ +}; + + +static struct unslong_st ul_test[NUM_ULONG_TESTS]; +static struct siglong_st sl_test[NUM_SLONG_TESTS]; +static struct curloff_st co_test[NUM_COFFT_TESTS]; + + +static int test_unsigned_long_formatting(void) +{ + int i, j; + int failed = 0; + + ul_test[0].num = 0x0L; + ul_test[0].expected = "0"; + ul_test[1].num = 0x1L; + ul_test[1].expected = "1"; +#if (CURL_SIZEOF_LONG == 2) + ul_test[2].num = 0xFFL; + ul_test[2].expected = "255"; + ul_test[3].num = 0xFFFFL; + ul_test[3].expected = "65535"; +#elif (CURL_SIZEOF_LONG == 4) + ul_test[2].num = 0xFFFFL; + ul_test[2].expected = "65535"; + ul_test[3].num = 0xFFFFFFFFL; + ul_test[3].expected = "4294967295"; +#elif (CURL_SIZEOF_LONG == 8) + ul_test[2].num = 0xFFFFFFFFL; + ul_test[2].expected = "4294967295"; + ul_test[3].num = 0xFFFFFFFFFFFFFFFFL; + ul_test[3].expected = "18446744073709551615"; +#endif + + for(i=0; i