Commit a9a5a8e4 authored by Yang Tse's avatar Yang Tse
Browse files 

Modified test case 557 to additionally verify libcurl's internal curl_m*printf()
functions formatting functionality when handling signed and unsigned shorts.
parent 80443661

tests/data/test557

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ nothing 
# Verify data after the test has been "shot"

<verify>

<stdout mode="text">

All curl_mprintf() unsigned short tests OK!

All curl_mprintf() signed short tests OK!

All curl_mprintf() unsigned int tests OK!

All curl_mprintf() signed int tests OK!

All curl_mprintf() unsigned long tests OK!

tests/libtest/lib557.c

+304 −5
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 




#define BUFSZ    256

#define USHORT_TESTS_ARRSZ 1 + 100

#define SSHORT_TESTS_ARRSZ 1 + 100

#define UINT_TESTS_ARRSZ   1 + 100

#define SINT_TESTS_ARRSZ   1 + 100

#define ULONG_TESTS_ARRSZ  1 + 100
@@ -44,6 +46,20 @@ 
#define COFFT_TESTS_ARRSZ  1 + 100





struct unsshort_st {

  unsigned short num;   /* unsigned short  */

  const char *expected; /* expected string */

  char result[BUFSZ];   /* result string   */

};





struct sigshort_st {

  short num;            /* signed short    */

  const char *expected; /* expected string */

  char result[BUFSZ];   /* result string   */

};





struct unsint_st {

  unsigned int num;     /* unsigned int    */

  const char *expected; /* expected string */
@@ -79,6 +95,8 @@ struct curloff_st { 
};





static struct unsshort_st us_test[USHORT_TESTS_ARRSZ];

static struct sigshort_st ss_test[SSHORT_TESTS_ARRSZ];

static struct unsint_st   ui_test[UINT_TESTS_ARRSZ];

static struct sigint_st   si_test[SINT_TESTS_ARRSZ];

static struct unslong_st  ul_test[ULONG_TESTS_ARRSZ];
@@ -86,6 +104,283 @@ static struct siglong_st sl_test[SLONG_TESTS_ARRSZ]; 
static struct curloff_st  co_test[COFFT_TESTS_ARRSZ];





static int test_unsigned_short_formatting(void)

{

  int i, j;

  int num_ushort_tests;

  int failed = 0;



#if (SIZEOF_SHORT == 1)



  i=1; us_test[i].num = 0xFFU; us_test[i].expected = "256";

  i++; us_test[i].num = 0xF0U; us_test[i].expected = "240";

  i++; us_test[i].num = 0x0FU; us_test[i].expected = "15";



  i++; us_test[i].num = 0xE0U; us_test[i].expected = "224";

  i++; us_test[i].num = 0x0EU; us_test[i].expected = "14";



  i++; us_test[i].num = 0xC0U; us_test[i].expected = "192";

  i++; us_test[i].num = 0x0CU; us_test[i].expected = "12";



  i++; us_test[i].num = 0x01U; us_test[i].expected = "1";

  i++; us_test[i].num = 0x00U; us_test[i].expected = "0";



  num_ushort_tests = i;



#elif (SIZEOF_SHORT == 2)



  i=1; us_test[i].num = 0xFFFFU; us_test[i].expected = "65535";

  i++; us_test[i].num = 0xFF00U; us_test[i].expected = "65280";

  i++; us_test[i].num = 0x00FFU; us_test[i].expected = "255";



  i++; us_test[i].num = 0xF000U; us_test[i].expected = "61440";

  i++; us_test[i].num = 0x0F00U; us_test[i].expected = "3840";

  i++; us_test[i].num = 0x00F0U; us_test[i].expected = "240";

  i++; us_test[i].num = 0x000FU; us_test[i].expected = "15";



  i++; us_test[i].num = 0xC000U; us_test[i].expected = "49152";

  i++; us_test[i].num = 0x0C00U; us_test[i].expected = "3072";

  i++; us_test[i].num = 0x00C0U; us_test[i].expected = "192";

  i++; us_test[i].num = 0x000CU; us_test[i].expected = "12";



  i++; us_test[i].num = 0x0001U; us_test[i].expected = "1";

  i++; us_test[i].num = 0x0000U; us_test[i].expected = "0";



  num_ushort_tests = i;



#elif (SIZEOF_SHORT == 4)



  i=1; us_test[i].num = 0xFFFFFFFFU; us_test[i].expected = "4294967295";

  i++; us_test[i].num = 0xFFFF0000U; us_test[i].expected = "4294901760";

  i++; us_test[i].num = 0x0000FFFFU; us_test[i].expected = "65535";



  i++; us_test[i].num = 0xFF000000U; us_test[i].expected = "4278190080";

  i++; us_test[i].num = 0x00FF0000U; us_test[i].expected = "16711680";

  i++; us_test[i].num = 0x0000FF00U; us_test[i].expected = "65280";

  i++; us_test[i].num = 0x000000FFU; us_test[i].expected = "255";



  i++; us_test[i].num = 0xF0000000U; us_test[i].expected = "4026531840";

  i++; us_test[i].num = 0x0F000000U; us_test[i].expected = "251658240";

  i++; us_test[i].num = 0x00F00000U; us_test[i].expected = "15728640";

  i++; us_test[i].num = 0x000F0000U; us_test[i].expected = "983040";

  i++; us_test[i].num = 0x0000F000U; us_test[i].expected = "61440";

  i++; us_test[i].num = 0x00000F00U; us_test[i].expected = "3840";

  i++; us_test[i].num = 0x000000F0U; us_test[i].expected = "240";

  i++; us_test[i].num = 0x0000000FU; us_test[i].expected = "15";



  i++; us_test[i].num = 0xC0000000U; us_test[i].expected = "3221225472";

  i++; us_test[i].num = 0x0C000000U; us_test[i].expected = "201326592";

  i++; us_test[i].num = 0x00C00000U; us_test[i].expected = "12582912";

  i++; us_test[i].num = 0x000C0000U; us_test[i].expected = "786432";

  i++; us_test[i].num = 0x0000C000U; us_test[i].expected = "49152";

  i++; us_test[i].num = 0x00000C00U; us_test[i].expected = "3072";

  i++; us_test[i].num = 0x000000C0U; us_test[i].expected = "192";

  i++; us_test[i].num = 0x0000000CU; us_test[i].expected = "12";



  i++; us_test[i].num = 0x00000001U; us_test[i].expected = "1";

  i++; us_test[i].num = 0x00000000U; us_test[i].expected = "0";



  num_ushort_tests = i;



#endif



  for(i=1; i<=num_ushort_tests; i++) {



    for(j=0; j<BUFSZ; j++)

      us_test[i].result[j] = 'X';

    us_test[i].result[BUFSZ-1] = '\0';



    (void)curl_msprintf(us_test[i].result, "%hu", us_test[i].num);



    if(memcmp(us_test[i].result,

               us_test[i].expected,

               strlen(us_test[i].expected))) {

      printf("unsigned short test #%.2d: Failed (Expected: %s Got: %s)\n",

             i, us_test[i].expected, us_test[i].result);

      failed++;

    }



  }



  if(!failed)

    printf("All curl_mprintf() unsigned short tests OK!\n");

  else

    printf("Some curl_mprintf() unsigned short tests Failed!\n");



  return failed;

}





static int test_signed_short_formatting(void)

{

  int i, j;

  int num_sshort_tests;

  int failed = 0;



#if (SIZEOF_SHORT == 1)



  i++; ss_test[i].num = 0x7F; ss_test[i].expected = "127";



  i++; ss_test[i].num = 0x70; ss_test[i].expected = "112";

  i++; ss_test[i].num = 0x07; ss_test[i].expected = "7";



  i++; ss_test[i].num = 0x50; ss_test[i].expected = "80";

  i++; ss_test[i].num = 0x05; ss_test[i].expected = "5";



  i++; ss_test[i].num = 0x01; ss_test[i].expected = "1";

  i++; ss_test[i].num = 0x00; ss_test[i].expected = "0";



  i++; ss_test[i].num = -0x7F -1; ss_test[i].expected = "-128";



  i++; ss_test[i].num = -0x70 -1; ss_test[i].expected = "-113";

  i++; ss_test[i].num = -0x07 -1; ss_test[i].expected = "-8";



  i++; ss_test[i].num = -0x50 -1; ss_test[i].expected = "-81";

  i++; ss_test[i].num = -0x05 -1; ss_test[i].expected = "-6";



  i++; ss_test[i].num =  0x00 -1; ss_test[i].expected = "-1";



  num_sshort_tests = i;



#elif (SIZEOF_SHORT == 2)



  i=1; ss_test[i].num = 0x7FFF; ss_test[i].expected = "32767";

  i++; ss_test[i].num = 0x7FFE; ss_test[i].expected = "32766";

  i++; ss_test[i].num = 0x7FFD; ss_test[i].expected = "32765";

  i++; ss_test[i].num = 0x7F00; ss_test[i].expected = "32512";

  i++; ss_test[i].num = 0x07F0; ss_test[i].expected = "2032";

  i++; ss_test[i].num = 0x007F; ss_test[i].expected = "127";



  i++; ss_test[i].num = 0x7000; ss_test[i].expected = "28672";

  i++; ss_test[i].num = 0x0700; ss_test[i].expected = "1792";

  i++; ss_test[i].num = 0x0070; ss_test[i].expected = "112";

  i++; ss_test[i].num = 0x0007; ss_test[i].expected = "7";



  i++; ss_test[i].num = 0x5000; ss_test[i].expected = "20480";

  i++; ss_test[i].num = 0x0500; ss_test[i].expected = "1280";

  i++; ss_test[i].num = 0x0050; ss_test[i].expected = "80";

  i++; ss_test[i].num = 0x0005; ss_test[i].expected = "5";



  i++; ss_test[i].num = 0x0001; ss_test[i].expected = "1";

  i++; ss_test[i].num = 0x0000; ss_test[i].expected = "0";



  i++; ss_test[i].num = -0x7FFF -1; ss_test[i].expected = "-32768";

  i++; ss_test[i].num = -0x7FFE -1; ss_test[i].expected = "-32767";

  i++; ss_test[i].num = -0x7FFD -1; ss_test[i].expected = "-32766";

  i++; ss_test[i].num = -0x7F00 -1; ss_test[i].expected = "-32513";

  i++; ss_test[i].num = -0x07F0 -1; ss_test[i].expected = "-2033";

  i++; ss_test[i].num = -0x007F -1; ss_test[i].expected = "-128";



  i++; ss_test[i].num = -0x7000 -1; ss_test[i].expected = "-28673";

  i++; ss_test[i].num = -0x0700 -1; ss_test[i].expected = "-1793";

  i++; ss_test[i].num = -0x0070 -1; ss_test[i].expected = "-113";

  i++; ss_test[i].num = -0x0007 -1; ss_test[i].expected = "-8";



  i++; ss_test[i].num = -0x5000 -1; ss_test[i].expected = "-20481";

  i++; ss_test[i].num = -0x0500 -1; ss_test[i].expected = "-1281";

  i++; ss_test[i].num = -0x0050 -1; ss_test[i].expected = "-81";

  i++; ss_test[i].num = -0x0005 -1; ss_test[i].expected = "-6";



  i++; ss_test[i].num =  0x0000 -1; ss_test[i].expected = "-1";



  num_sshort_tests = i;



#elif (SIZEOF_SHORT == 4)



  i=1; ss_test[i].num = 0x7FFFFFFF; ss_test[i].expected = "2147483647";

  i++; ss_test[i].num = 0x7FFFFFFE; ss_test[i].expected = "2147483646";

  i++; ss_test[i].num = 0x7FFFFFFD; ss_test[i].expected = "2147483645";

  i++; ss_test[i].num = 0x7FFF0000; ss_test[i].expected = "2147418112";

  i++; ss_test[i].num = 0x00007FFF; ss_test[i].expected = "32767";



  i++; ss_test[i].num = 0x7F000000; ss_test[i].expected = "2130706432";

  i++; ss_test[i].num = 0x007F0000; ss_test[i].expected = "8323072";

  i++; ss_test[i].num = 0x00007F00; ss_test[i].expected = "32512";

  i++; ss_test[i].num = 0x0000007F; ss_test[i].expected = "127";



  i++; ss_test[i].num = 0x70000000; ss_test[i].expected = "1879048192";

  i++; ss_test[i].num = 0x07000000; ss_test[i].expected = "117440512";

  i++; ss_test[i].num = 0x00700000; ss_test[i].expected = "7340032";

  i++; ss_test[i].num = 0x00070000; ss_test[i].expected = "458752";

  i++; ss_test[i].num = 0x00007000; ss_test[i].expected = "28672";

  i++; ss_test[i].num = 0x00000700; ss_test[i].expected = "1792";

  i++; ss_test[i].num = 0x00000070; ss_test[i].expected = "112";

  i++; ss_test[i].num = 0x00000007; ss_test[i].expected = "7";



  i++; ss_test[i].num = 0x50000000; ss_test[i].expected = "1342177280";

  i++; ss_test[i].num = 0x05000000; ss_test[i].expected = "83886080";

  i++; ss_test[i].num = 0x00500000; ss_test[i].expected = "5242880";

  i++; ss_test[i].num = 0x00050000; ss_test[i].expected = "327680";

  i++; ss_test[i].num = 0x00005000; ss_test[i].expected = "20480";

  i++; ss_test[i].num = 0x00000500; ss_test[i].expected = "1280";

  i++; ss_test[i].num = 0x00000050; ss_test[i].expected = "80";

  i++; ss_test[i].num = 0x00000005; ss_test[i].expected = "5";



  i++; ss_test[i].num = 0x00000001; ss_test[i].expected = "1";

  i++; ss_test[i].num = 0x00000000; ss_test[i].expected = "0";



  i++; ss_test[i].num = -0x7FFFFFFF -1; ss_test[i].expected = "-2147483648";

  i++; ss_test[i].num = -0x7FFFFFFE -1; ss_test[i].expected = "-2147483647";

  i++; ss_test[i].num = -0x7FFFFFFD -1; ss_test[i].expected = "-2147483646";

  i++; ss_test[i].num = -0x7FFF0000 -1; ss_test[i].expected = "-2147418113";

  i++; ss_test[i].num = -0x00007FFF -1; ss_test[i].expected = "-32768";



  i++; ss_test[i].num = -0x7F000000 -1; ss_test[i].expected = "-2130706433";

  i++; ss_test[i].num = -0x007F0000 -1; ss_test[i].expected = "-8323073";

  i++; ss_test[i].num = -0x00007F00 -1; ss_test[i].expected = "-32513";

  i++; ss_test[i].num = -0x0000007F -1; ss_test[i].expected = "-128";



  i++; ss_test[i].num = -0x70000000 -1; ss_test[i].expected = "-1879048193";

  i++; ss_test[i].num = -0x07000000 -1; ss_test[i].expected = "-117440513";

  i++; ss_test[i].num = -0x00700000 -1; ss_test[i].expected = "-7340033";

  i++; ss_test[i].num = -0x00070000 -1; ss_test[i].expected = "-458753";

  i++; ss_test[i].num = -0x00007000 -1; ss_test[i].expected = "-28673";

  i++; ss_test[i].num = -0x00000700 -1; ss_test[i].expected = "-1793";

  i++; ss_test[i].num = -0x00000070 -1; ss_test[i].expected = "-113";

  i++; ss_test[i].num = -0x00000007 -1; ss_test[i].expected = "-8";



  i++; ss_test[i].num = -0x50000000 -1; ss_test[i].expected = "-1342177281";

  i++; ss_test[i].num = -0x05000000 -1; ss_test[i].expected = "-83886081";

  i++; ss_test[i].num = -0x00500000 -1; ss_test[i].expected = "-5242881";

  i++; ss_test[i].num = -0x00050000 -1; ss_test[i].expected = "-327681";

  i++; ss_test[i].num = -0x00005000 -1; ss_test[i].expected = "-20481";

  i++; ss_test[i].num = -0x00000500 -1; ss_test[i].expected = "-1281";

  i++; ss_test[i].num = -0x00000050 -1; ss_test[i].expected = "-81";

  i++; ss_test[i].num = -0x00000005 -1; ss_test[i].expected = "-6";



  i++; ss_test[i].num =  0x00000000 -1; ss_test[i].expected = "-1";



  num_sshort_tests = i;



#endif



  for(i=1; i<=num_sshort_tests; i++) {



    for(j=0; j<BUFSZ; j++)

      ss_test[i].result[j] = 'X';

    ss_test[i].result[BUFSZ-1] = '\0';



    (void)curl_msprintf(ss_test[i].result, "%hd", ss_test[i].num);



    if(memcmp(ss_test[i].result,

              ss_test[i].expected,

              strlen(ss_test[i].expected))) {

      printf("signed short test #%.2d: Failed (Expected: %s Got: %s)\n",

             i, ss_test[i].expected, ss_test[i].result);

      failed++;

    }



  }



  if(!failed)

    printf("All curl_mprintf() signed short tests OK!\n");

  else

    printf("Some curl_mprintf() signed short tests Failed!\n");



  return failed;

}





static int test_unsigned_int_formatting(void)

{

  int i, j;
@@ -1073,6 +1368,10 @@ int test(char *URL) 
  int errors = 0;

  (void)URL; /* not used */



  errors += test_unsigned_short_formatting();



  errors += test_signed_short_formatting();



  errors += test_unsigned_int_formatting();



  errors += test_signed_int_formatting();