aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Fuller <jim@webcomposite.com>2018-07-13 15:17:19 +0000
committerDaniel Stenberg <daniel@haxx.se>2018-09-05 14:30:48 +0200
commitb004a174ea5efb3d6bdce83949b6c1eab994930b (patch)
tree9ae3263324557d98fa7412ed4fda0f50b3a6cc89
parentc497472c8b519346fa82dd780f94454cf47886f0 (diff)
tests: add unit tests for url.c
Approved-by: Daniel Gustafsson Closes #2937
-rw-r--r--lib/url.h7
-rw-r--r--lib/urldata.h3
-rw-r--r--tests/data/Makefile.inc2
-rw-r--r--tests/data/test162026
-rw-r--r--tests/unit/CMakeLists.txt1
-rw-r--r--tests/unit/Makefile.inc5
-rw-r--r--tests/unit/unit1620.c90
7 files changed, 125 insertions, 9 deletions
diff --git a/lib/url.h b/lib/url.h
index ef3ebf03e..a914f56e6 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -34,7 +34,7 @@
CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn);
CURLcode Curl_open(struct Curl_easy **curl);
CURLcode Curl_init_userdefined(struct Curl_easy *data);
-CURLcode Curl_dupset(struct Curl_easy * dst, struct Curl_easy * src);
+
void Curl_freeset(struct Curl_easy * data);
CURLcode Curl_close(struct Curl_easy *data); /* opposite of curl_open() */
CURLcode Curl_connect(struct Curl_easy *, struct connectdata **,
@@ -57,9 +57,7 @@ int Curl_doing_getsock(struct connectdata *conn,
CURLcode Curl_parse_login_details(const char *login, const size_t len,
char **userptr, char **passwdptr,
char **optionsptr);
-bool Curl_isPipeliningEnabled(const struct Curl_easy *handle);
-CURLcode Curl_addHandleToPipeline(struct Curl_easy *handle,
- struct curl_llist *pipeline);
+
int Curl_removeHandleFromPipeline(struct Curl_easy *handle,
struct curl_llist *pipeline);
/* remove the specified connection from all (possible) pipelines and related
@@ -67,7 +65,6 @@ int Curl_removeHandleFromPipeline(struct Curl_easy *handle,
void Curl_getoff_all_pipelines(struct Curl_easy *data,
struct connectdata *conn);
-void Curl_close_connections(struct Curl_easy *data);
#define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */
#define CURL_DEFAULT_HTTPS_PROXY_PORT 443 /* default https proxy port unless
diff --git a/lib/urldata.h b/lib/urldata.h
index 67db3b2fc..add77e09f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1446,8 +1446,7 @@ enum dupstring {
STRING_LASTZEROTERMINATED,
- /* -- below this are pointers to binary data that cannot be strdup'ed.
- Each such pointer must be added manually to Curl_dupset() --- */
+ /* -- below this are pointers to binary data that cannot be strdup'ed. --- */
STRING_COPYPOSTFIELDS, /* if POST, set the fields' values here */
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index e0457486b..d3f7e39b2 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -180,7 +180,7 @@ test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \
\
test1590 \
test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \
-test1608 test1609 \
+test1608 test1609 test1620 \
\
test1700 test1701 test1702 \
\
diff --git a/tests/data/test1620 b/tests/data/test1620
new file mode 100644
index 000000000..83b08c7a8
--- /dev/null
+++ b/tests/data/test1620
@@ -0,0 +1,26 @@
+<testcase>
+<info>
+<keywords>
+unittest
+URL
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+</features>
+ <name>
+unit tests for url.c
+ </name>
+<tool>
+unit1620
+</tool>
+</client>
+
+</testcase>
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 3c0a6c62d..4b0cec4a8 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -21,6 +21,7 @@ set(UT_SRC
unit1603.c
# Broken link on Linux
# unit1604.c
+ unit1620.c
)
set(UT_COMMON_FILES ../libtest/first.c ../libtest/test.h curlcheck.h)
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index a2618813f..6d88157a2 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -10,7 +10,7 @@ UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \
unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \
unit1399 \
unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1606 unit1607 \
- unit1608 unit1609
+ unit1608 unit1609 unit1620
unit1300_SOURCES = unit1300.c $(UNITFILES)
unit1300_CPPFLAGS = $(AM_CPPFLAGS)
@@ -95,3 +95,6 @@ unit1608_CPPFLAGS = $(AM_CPPFLAGS)
unit1609_SOURCES = unit1609.c $(UNITFILES)
unit1609_CPPFLAGS = $(AM_CPPFLAGS)
+
+unit1620_SOURCES = unit1620.c $(UNITFILES)
+unit1620_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tests/unit/unit1620.c b/tests/unit/unit1620.c
new file mode 100644
index 000000000..a47ff49a4
--- /dev/null
+++ b/tests/unit/unit1620.c
@@ -0,0 +1,90 @@
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2018, 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 https://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 "urldata.h"
+#include "url.h"
+
+#include "memdebug.h" /* LAST include file */
+
+static CURLcode unit_setup(void)
+{
+ return CURLE_OK;
+}
+
+static void unit_stop(void)
+{
+}
+
+UNITTEST_START
+{
+ int rc;
+ struct Curl_easy *empty;
+ const char *hostname = "hostname";
+ enum dupstring i;
+
+ bool async = FALSE;
+ bool protocol_connect = FALSE;
+
+ rc = Curl_open(&empty);
+ fail_unless(rc == CURLE_OK, "Curl_open() failed");
+
+ rc = Curl_connect(empty, &empty->easy_conn, &async, &protocol_connect);
+ fail_unless(rc == CURLE_URL_MALFORMAT,
+ "Curl_connect() failed to return CURLE_URL_MALFORMAT");
+
+ fail_unless(empty->magic == CURLEASY_MAGIC_NUMBER,
+ "empty->magic should be equal to CURLEASY_MAGIC_NUMBER");
+
+ /* double invoke to ensure no dependency on internal state */
+ rc = Curl_connect(empty, &empty->easy_conn, &async, &protocol_connect);
+ fail_unless(rc == CURLE_URL_MALFORMAT,
+ "Curl_connect() failed to return CURLE_URL_MALFORMAT");
+
+ rc = Curl_init_userdefined(empty);
+ fail_unless(rc == CURLE_OK, "Curl_userdefined() failed");
+
+ rc = Curl_init_do(empty, empty->easy_conn);
+ fail_unless(rc == CURLE_OK, "Curl_init_do() failed");
+
+ rc = Curl_parse_login_details(
+ hostname, strlen(hostname), NULL, NULL, NULL);
+ fail_unless(rc == CURLE_OK,
+ "Curl_parse_login_details() failed");
+
+ rc = Curl_disconnect(empty, empty->easy_conn, FALSE);
+ fail_unless(rc == CURLE_OK,
+ "Curl_disconnect() with dead_connection set FALSE failed");
+
+ Curl_freeset(empty);
+ for(i = (enum dupstring)0; i < STRING_LAST; i++) {
+ fail_unless(empty->set.str[i] == NULL,
+ "Curl_free() did not set to NULL");
+ }
+
+ Curl_free_request_state(empty);
+
+ rc = Curl_close(empty);
+ fail_unless(rc == CURLE_OK, "Curl_close() failed");
+
+}
+UNITTEST_STOP