Loading src/tool_getparam.c +6 −3 Original line number Diff line number Diff line Loading @@ -290,7 +290,10 @@ static const struct feat feats[] = { * We allow ':' and '\' to be escaped by '\' so that we can use certificate * nicknames containing ':'. See <https://sourceforge.net/p/curl/bugs/1196/> * for details. */ static void parse_cert_parameter(const char *cert_parameter, #ifndef UNITTESTS static #endif void parse_cert_parameter(const char *cert_parameter, char **certname, char **passphrase) { Loading src/tool_getparam.h +6 −0 Original line number Diff line number Diff line Loading @@ -45,5 +45,11 @@ ParameterError getparameter(char *flag, bool *usedarg, struct Configurable *config); #ifdef UNITTESTS void parse_cert_parameter(const char *cert_parameter, char **certname, char **passphrase); #endif #endif /* HEADER_CURL_TOOL_GETPARAM_H */ tests/data/test1394 0 → 100644 +30 −0 Original line number Diff line number Diff line <testcase> <info> <keywords> unittest </keywords> </info> # # Client-side <client> <server> none </server> <features> unittest </features> <name> unit test for parse_cert_parameter() </name> <tool> unit1394 </tool> </client> <verify> <stdout mode="text"> </stdout> </verify> </testcase> tests/unit/Makefile.inc +4 −1 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ UNITFILES = curlcheck.h \ # These are all unit test programs UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ unit1308 unit1309 unit1330 unit1308 unit1309 unit1330 unit1394 unit1300_SOURCES = unit1300.c $(UNITFILES) unit1300_CPPFLAGS = $(AM_CPPFLAGS) Loading Loading @@ -38,3 +38,6 @@ unit1309_CPPFLAGS = $(AM_CPPFLAGS) unit1330_SOURCES = unit1330.c $(UNITFILES) unit1330_CPPFLAGS = $(AM_CPPFLAGS) unit1394_SOURCES = unit1394.c $(UNITFILES) unit1394_CPPFLAGS = $(AM_CPPFLAGS) tests/unit/unit1394.c +52 −4 Original line number Diff line number Diff line /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | * / __| | | | |_) | | * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. * * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * ***************************************************************************/ #include "curlcheck.h" #include "tool_getparam.h" #include <stdio.h> #include <stdlib.h> #include <string.h> int main(int argc, char **argv) { char *values[] = { #include "curl_memory.h" #include "memdebug.h" /* LAST include file */ static CURLcode unit_setup(void) { return CURLE_OK; } static void unit_stop(void) { } UNITTEST_START const char *values[] = { /* -E parameter */ /* exp. cert name */ /* exp. passphrase */ "foo:bar:baz", "foo", "bar:baz", "foo\\:bar:baz", "foo:bar", "baz", Loading @@ -18,6 +57,7 @@ int main(int argc, char **argv) { "foo:bar\\\\", "foo", "bar\\\\", "foo:bar:", "foo", "bar:", "foo\\::bar\\:", "foo:", "bar\\:", #ifdef WIN32 "c:\\foo:bar:baz", "c:\\foo", "bar:baz", "c:\\foo\\:bar:baz", "c:\\foo:bar", "baz", "c:\\foo\\\\:bar:baz", "c:\\foo\\", "bar:baz", Loading @@ -31,9 +71,10 @@ int main(int argc, char **argv) { "c:\\foo:bar\\\\", "c:\\foo", "bar\\\\", "c:\\foo:bar:", "c:\\foo", "bar:", "c:\\foo\\::bar\\:", "c:\\foo:", "bar\\:", #endif NULL, NULL, NULL, }; char **p; const char **p; char *certname, *passphrase; for(p = values; *p; p += 3) { parse_cert_parameter(p[0], &certname, &passphrase); Loading @@ -42,15 +83,18 @@ int main(int argc, char **argv) { if(strcmp(p[1], certname)) { printf("expected certname '%s' but got '%s' " "for -E param '%s'\n", p[1], certname, p[0]); fail("assertion failure"); } } else { printf("expected certname '%s' but got NULL " "for -E param '%s'\n", p[1], p[0]); fail("assertion failure"); } } else { if(certname) { printf("expected certname NULL but got '%s' " "for -E param '%s'\n", certname, p[0]); fail("assertion failure"); } } if(p[2]) { Loading @@ -58,18 +102,22 @@ int main(int argc, char **argv) { if(strcmp(p[2], passphrase)) { printf("expected passphrase '%s' but got '%s'" "for -E param '%s'\n", p[2], passphrase, p[0]); fail("assertion failure"); } } else { printf("expected passphrase '%s' but got NULL " "for -E param '%s'\n", p[2], p[0]); fail("assertion failure"); } } else { if(passphrase) { printf("expected passphrase NULL but got '%s' " "for -E param '%s'\n", passphrase, p[0]); fail("assertion failure"); } } if(certname) free(certname); if(passphrase) free(passphrase); } } UNITTEST_STOP Loading
src/tool_getparam.c +6 −3 Original line number Diff line number Diff line Loading @@ -290,7 +290,10 @@ static const struct feat feats[] = { * We allow ':' and '\' to be escaped by '\' so that we can use certificate * nicknames containing ':'. See <https://sourceforge.net/p/curl/bugs/1196/> * for details. */ static void parse_cert_parameter(const char *cert_parameter, #ifndef UNITTESTS static #endif void parse_cert_parameter(const char *cert_parameter, char **certname, char **passphrase) { Loading
src/tool_getparam.h +6 −0 Original line number Diff line number Diff line Loading @@ -45,5 +45,11 @@ ParameterError getparameter(char *flag, bool *usedarg, struct Configurable *config); #ifdef UNITTESTS void parse_cert_parameter(const char *cert_parameter, char **certname, char **passphrase); #endif #endif /* HEADER_CURL_TOOL_GETPARAM_H */
tests/data/test1394 0 → 100644 +30 −0 Original line number Diff line number Diff line <testcase> <info> <keywords> unittest </keywords> </info> # # Client-side <client> <server> none </server> <features> unittest </features> <name> unit test for parse_cert_parameter() </name> <tool> unit1394 </tool> </client> <verify> <stdout mode="text"> </stdout> </verify> </testcase>
tests/unit/Makefile.inc +4 −1 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ UNITFILES = curlcheck.h \ # These are all unit test programs UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ unit1308 unit1309 unit1330 unit1308 unit1309 unit1330 unit1394 unit1300_SOURCES = unit1300.c $(UNITFILES) unit1300_CPPFLAGS = $(AM_CPPFLAGS) Loading Loading @@ -38,3 +38,6 @@ unit1309_CPPFLAGS = $(AM_CPPFLAGS) unit1330_SOURCES = unit1330.c $(UNITFILES) unit1330_CPPFLAGS = $(AM_CPPFLAGS) unit1394_SOURCES = unit1394.c $(UNITFILES) unit1394_CPPFLAGS = $(AM_CPPFLAGS)
tests/unit/unit1394.c +52 −4 Original line number Diff line number Diff line /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | * / __| | | | |_) | | * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. * * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * ***************************************************************************/ #include "curlcheck.h" #include "tool_getparam.h" #include <stdio.h> #include <stdlib.h> #include <string.h> int main(int argc, char **argv) { char *values[] = { #include "curl_memory.h" #include "memdebug.h" /* LAST include file */ static CURLcode unit_setup(void) { return CURLE_OK; } static void unit_stop(void) { } UNITTEST_START const char *values[] = { /* -E parameter */ /* exp. cert name */ /* exp. passphrase */ "foo:bar:baz", "foo", "bar:baz", "foo\\:bar:baz", "foo:bar", "baz", Loading @@ -18,6 +57,7 @@ int main(int argc, char **argv) { "foo:bar\\\\", "foo", "bar\\\\", "foo:bar:", "foo", "bar:", "foo\\::bar\\:", "foo:", "bar\\:", #ifdef WIN32 "c:\\foo:bar:baz", "c:\\foo", "bar:baz", "c:\\foo\\:bar:baz", "c:\\foo:bar", "baz", "c:\\foo\\\\:bar:baz", "c:\\foo\\", "bar:baz", Loading @@ -31,9 +71,10 @@ int main(int argc, char **argv) { "c:\\foo:bar\\\\", "c:\\foo", "bar\\\\", "c:\\foo:bar:", "c:\\foo", "bar:", "c:\\foo\\::bar\\:", "c:\\foo:", "bar\\:", #endif NULL, NULL, NULL, }; char **p; const char **p; char *certname, *passphrase; for(p = values; *p; p += 3) { parse_cert_parameter(p[0], &certname, &passphrase); Loading @@ -42,15 +83,18 @@ int main(int argc, char **argv) { if(strcmp(p[1], certname)) { printf("expected certname '%s' but got '%s' " "for -E param '%s'\n", p[1], certname, p[0]); fail("assertion failure"); } } else { printf("expected certname '%s' but got NULL " "for -E param '%s'\n", p[1], p[0]); fail("assertion failure"); } } else { if(certname) { printf("expected certname NULL but got '%s' " "for -E param '%s'\n", certname, p[0]); fail("assertion failure"); } } if(p[2]) { Loading @@ -58,18 +102,22 @@ int main(int argc, char **argv) { if(strcmp(p[2], passphrase)) { printf("expected passphrase '%s' but got '%s'" "for -E param '%s'\n", p[2], passphrase, p[0]); fail("assertion failure"); } } else { printf("expected passphrase '%s' but got NULL " "for -E param '%s'\n", p[2], p[0]); fail("assertion failure"); } } else { if(passphrase) { printf("expected passphrase NULL but got '%s' " "for -E param '%s'\n", passphrase, p[0]); fail("assertion failure"); } } if(certname) free(certname); if(passphrase) free(passphrase); } } UNITTEST_STOP