diff options
| -rw-r--r-- | src/tool_getparam.c | 9 | ||||
| -rw-r--r-- | src/tool_getparam.h | 6 | ||||
| -rw-r--r-- | tests/data/test1394 | 30 | ||||
| -rw-r--r-- | tests/unit/Makefile.inc | 5 | ||||
| -rw-r--r-- | tests/unit/unit1394.c | 56 |
5 files changed, 98 insertions, 8 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 429f12bda..fb8270894 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -290,9 +290,12 @@ 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, - char **certname, - char **passphrase) +#ifndef UNITTESTS +static +#endif +void parse_cert_parameter(const char *cert_parameter, + char **certname, + char **passphrase) { size_t param_length = strlen(cert_parameter); size_t span; diff --git a/src/tool_getparam.h b/src/tool_getparam.h index 38f0674f4..a86bfcec6 100644 --- a/src/tool_getparam.h +++ b/src/tool_getparam.h @@ -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 */ diff --git a/tests/data/test1394 b/tests/data/test1394 new file mode 100644 index 000000000..34d4a0e37 --- /dev/null +++ b/tests/data/test1394 @@ -0,0 +1,30 @@ +<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> diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index da32c8639..a99b9ee6d 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -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) @@ -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) + diff --git a/tests/unit/unit1394.c b/tests/unit/unit1394.c index 11a47b9ad..d25e4f57a 100644 --- a/tests/unit/unit1394.c +++ b/tests/unit/unit1394.c @@ -1,9 +1,48 @@ +/*************************************************************************** + * _ _ ____ _ + * 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", @@ -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", @@ -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); @@ -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]) { @@ -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 |