Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/363c32c07aad6cdaf9b430781137bfca726f7761
...commit
http://git.netsurf-browser.org/netsurf.git/commit/363c32c07aad6cdaf9b430781137bfca726f7761
...tree
http://git.netsurf-browser.org/netsurf.git/tree/363c32c07aad6cdaf9b430781137bfca726f7761
The branch, master has been updated
via 363c32c07aad6cdaf9b430781137bfca726f7761 (commit)
via fc1be0144cec6e339a5e715dab142a0dfb98e10e (commit)
via 510efac384e912df4b344d605c75fd54f9a2b17b (commit)
from b307fa431148728256ebb3be925089460d9fab07 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=363c32c07aad6cdaf9b430781137bfca726f7761
commit 363c32c07aad6cdaf9b430781137bfca726f7761
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
extend nsurl component API test case
diff --git a/test/nsurl.c b/test/nsurl.c
index 80534fe..a8c4bc0 100644
--- a/test/nsurl.c
+++ b/test/nsurl.c
@@ -605,6 +605,8 @@ START_TEST(nsurl_compare_test)
END_TEST
+/* component test case */
+
/**
* url component tests
*
@@ -613,18 +615,27 @@ END_TEST
* result is checked against test1 and res as approprite.
*/
static const struct test_compare component_tests[] = {
- { "http://a/b/c/d;p?q";,
- "http",
- NSURL_SCHEME,
- true },
-
- { "file:///",
- NULL,
- NSURL_HOST,
- false },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "http", NSURL_SCHEME, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "u", NSURL_USERNAME, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "p", NSURL_PASSWORD, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "a", NSURL_HOST, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "66", NSURL_PORT, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "/b/c/d;p", NSURL_PATH, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "?q", NSURL_QUERY, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "f", NSURL_FRAGMENT, true },
+
+ { "file:", "file", NSURL_SCHEME, true },
+ { "file:", NULL, NSURL_USERNAME, false },
+ { "file:", NULL, NSURL_PASSWORD, false },
+ { "file:", NULL, NSURL_HOST, false },
+ { "file:", NULL, NSURL_PORT, false },
+ { "file:", NULL, NSURL_PATH, false },
+ { "file:", NULL, NSURL_QUERY, false },
+ { "file:", NULL, NSURL_FRAGMENT, false },
};
+
/**
* get component
*/
@@ -651,6 +662,7 @@ START_TEST(nsurl_get_component_test)
}
END_TEST
+
/**
* has component
*/
@@ -672,6 +684,30 @@ START_TEST(nsurl_has_component_test)
}
END_TEST
+
+/**
+ * test case for componnet get and has API
+ */
+static TCase *nsurl_component_case_create(void)
+{
+ TCase *tc;
+ tc = tcase_create("Component");
+
+ tcase_add_unchecked_fixture(tc,
+ corestring_create,
+ corestring_teardown);
+
+ tcase_add_loop_test(tc,
+ nsurl_get_component_test,
+ 0, NELEMS(component_tests));
+ tcase_add_loop_test(tc,
+ nsurl_has_component_test,
+ 0, NELEMS(component_tests));
+
+ return tc;
+}
+
+
static const struct test_pairs fragment_tests[] = {
{ "http://www.f.org/a/b/c#def";, "http://www.f.org/a/b/c"; },
};
@@ -1261,7 +1297,6 @@ static TCase *nsurl_utf8_case_create(void)
}
-
/* test suite */
/**
@@ -1279,7 +1314,6 @@ static Suite *nsurl_suite(void)
TCase *tc_join;
TCase *tc_compare;
TCase *tc_fragment;
- TCase *tc_component;
s = suite_create("nsurl");
@@ -1457,20 +1491,7 @@ static Suite *nsurl_suite(void)
/* component */
- tc_component = tcase_create("Component");
-
- tcase_add_unchecked_fixture(tc_component,
- corestring_create,
- corestring_teardown);
-
- tcase_add_loop_test(tc_component,
- nsurl_get_component_test,
- 0, NELEMS(component_tests));
- tcase_add_loop_test(tc_component,
- nsurl_has_component_test,
- 0, NELEMS(component_tests));
-
- suite_add_tcase(s, tc_component);
+ suite_add_tcase(s, nsurl_component_case_create());
/* parent */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=fc1be0144cec6e339a5e715dab142a0dfb98e10e
commit fc1be0144cec6e339a5e715dab142a0dfb98e10e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
extend nsurl parent API tests
diff --git a/test/nsurl.c b/test/nsurl.c
index 798a1ff..80534fe 100644
--- a/test/nsurl.c
+++ b/test/nsurl.c
@@ -750,40 +750,6 @@ START_TEST(nsurl_refragment_test)
}
END_TEST
-static const struct test_pairs parent_tests[] = {
- { "http://www.f.org/a/b/c";, "http://www.f.org/a/b/"; },
-};
-
-/**
- * generate parent url
- */
-START_TEST(nsurl_parent_test)
-{
- nserror err;
- nsurl *url;
- nsurl *res_url;
- const struct test_pairs *tst = &parent_tests[_i];
-
- /* not testing create, this should always succeed */
- err = nsurl_create(tst->test, &url);
- ck_assert(err == NSERROR_OK);
-
- err = nsurl_parent(url, &res_url);
- if (tst->res == NULL) {
- /* result must be invalid (bad input) */
- ck_assert(err != NSERROR_OK);
- } else {
- /* result must be valid */
- ck_assert(err == NSERROR_OK);
-
- ck_assert_str_eq(nsurl_access(res_url), tst->res);
-
- nsurl_unref(res_url);
- }
- nsurl_unref(url);
-
-}
-END_TEST
/**
@@ -1158,6 +1124,7 @@ START_TEST(nsurl_api_assert_nice_test)
}
END_TEST
+
/**
* check parent asserts on NULL parameter
*/
@@ -1172,6 +1139,69 @@ START_TEST(nsurl_api_assert_parent_test)
END_TEST
+
+
+/* parent test case */
+
+static const struct test_pairs parent_tests[] = {
+ { "http://www.f.org/a/b/c";, "http://www.f.org/a/b/"; },
+ { "https://www.moo.org/";, "https://www.moo.org/"; },
+ { "https://www.moo.org/asinglepathelementthatsquitelong/";,
"https://www.moo.org/"; },
+ { "https://user:[email protected]/a/b#x?a=b";,
"https://user:[email protected]/a/"; },
+};
+
+/**
+ * generate parent url
+ */
+START_TEST(nsurl_parent_test)
+{
+ nserror err;
+ nsurl *url;
+ nsurl *res_url;
+ const struct test_pairs *tst = &parent_tests[_i];
+
+ /* not testing create, this should always succeed */
+ err = nsurl_create(tst->test, &url);
+ ck_assert(err == NSERROR_OK);
+
+ err = nsurl_parent(url, &res_url);
+ if (tst->res == NULL) {
+ /* result must be invalid (bad input) */
+ ck_assert(err != NSERROR_OK);
+ } else {
+ /* result must be valid */
+ ck_assert(err == NSERROR_OK);
+
+ ck_assert_str_eq(nsurl_access(res_url), tst->res);
+
+ nsurl_unref(res_url);
+ }
+ nsurl_unref(url);
+
+}
+END_TEST
+
+
+/**
+ * test case for parent API
+ */
+static TCase *nsurl_parent_case_create(void)
+{
+ TCase *tc;
+ tc = tcase_create("Parent");
+
+ tcase_add_unchecked_fixture(tc,
+ corestring_create,
+ corestring_teardown);
+
+ tcase_add_loop_test(tc,
+ nsurl_parent_test,
+ 0, NELEMS(parent_tests));
+
+ return tc;
+}
+
+
/* utf8 test case */
/**
@@ -1250,7 +1280,6 @@ static Suite *nsurl_suite(void)
TCase *tc_compare;
TCase *tc_fragment;
TCase *tc_component;
- TCase *tc_parent;
s = suite_create("nsurl");
@@ -1419,10 +1448,10 @@ static Suite *nsurl_suite(void)
tcase_add_loop_test(tc_fragment,
nsurl_defragment_test,
- 0, NELEMS(parent_tests));
+ 0, NELEMS(fragment_tests));
tcase_add_loop_test(tc_fragment,
nsurl_refragment_test,
- 0, NELEMS(parent_tests));
+ 0, NELEMS(fragment_tests));
suite_add_tcase(s, tc_fragment);
@@ -1445,17 +1474,7 @@ static Suite *nsurl_suite(void)
/* parent */
- tc_parent = tcase_create("Parent");
-
- tcase_add_unchecked_fixture(tc_parent,
- corestring_create,
- corestring_teardown);
-
- tcase_add_loop_test(tc_parent,
- nsurl_parent_test,
- 0, NELEMS(parent_tests));
-
- suite_add_tcase(s, tc_parent);
+ suite_add_tcase(s, nsurl_parent_case_create());
/* UTF-8 output */
suite_add_tcase(s, nsurl_utf8_case_create());
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=510efac384e912df4b344d605c75fd54f9a2b17b
commit 510efac384e912df4b344d605c75fd54f9a2b17b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
add nsurl get_utf8 test case
diff --git a/test/nsurl.c b/test/nsurl.c
index 5b56a42..798a1ff 100644
--- a/test/nsurl.c
+++ b/test/nsurl.c
@@ -53,6 +53,16 @@ struct test_compare {
bool res;
};
+/* Fixtures */
+
+static void corestring_create(void)
+{
+ ck_assert(corestrings_init() == NSERROR_OK);
+}
+
+/**
+ * iterator for any remaining strings in teardown fixture
+ */
static void netsurf_lwc_iterator(lwc_string *str, void *pw)
{
fprintf(stderr,
@@ -62,6 +72,15 @@ static void netsurf_lwc_iterator(lwc_string *str, void *pw)
lwc_string_data(str));
}
+static void corestring_teardown(void)
+{
+ corestrings_fini();
+
+ lwc_iterate_strings(netsurf_lwc_iterator, NULL);
+}
+
+/* tests */
+
static const char *base_str = "http://a/b/c/d;p?q";;
static const struct test_pairs create_tests[] = {
@@ -1153,22 +1172,71 @@ START_TEST(nsurl_api_assert_parent_test)
END_TEST
-/* Fixtures */
+/* utf8 test case */
-static void corestring_create(void)
+/**
+ * utf8 tests
+ */
+static const struct test_pairs utf8_tests[] = {
+ { "http://a.xn--11b4c3d/a";, "http://a.कॉम/a"; },
+ { "https://smog.xn--3oq18vl8pn36a/test";, "https://smog.大众汽车/test"},
+
+};
+
+
+/**
+ * get utf8 test
+ */
+START_TEST(nsurl_get_utf8_test)
{
- ck_assert(corestrings_init() == NSERROR_OK);
+ nserror err;
+ nsurl *url;
+ const struct test_pairs *tst = &utf8_tests[_i];
+ char *utf8out;
+ size_t utf8out_len;
+
+ /* not testing create, this should always succeed */
+ err = nsurl_create(tst->test, &url);
+ ck_assert(err == NSERROR_OK);
+
+ err = nsurl_get_utf8(url, &utf8out, &utf8out_len);
+ ck_assert(err == NSERROR_OK);
+
+ ck_assert_str_eq(utf8out, tst->res);
+
+ free(utf8out);
+
+ nsurl_unref(url);
}
+END_TEST
-static void corestring_teardown(void)
+
+/**
+ * test case for utf8 output
+ */
+static TCase *nsurl_utf8_case_create(void)
{
- corestrings_fini();
+ TCase *tc;
+ tc = tcase_create("UTF-8 output");
- lwc_iterate_strings(netsurf_lwc_iterator, NULL);
+ tcase_add_unchecked_fixture(tc,
+ corestring_create,
+ corestring_teardown);
+
+ tcase_add_loop_test(tc,
+ nsurl_get_utf8_test,
+ 0, NELEMS(utf8_tests));
+
+ return tc;
}
-/* suite generation */
+
+/* test suite */
+
+/**
+ * nsurl suite generation
+ */
static Suite *nsurl_suite(void)
{
Suite *s;
@@ -1389,9 +1457,14 @@ static Suite *nsurl_suite(void)
suite_add_tcase(s, tc_parent);
+ /* UTF-8 output */
+ suite_add_tcase(s, nsurl_utf8_case_create());
+
+
return s;
}
+
int main(int argc, char **argv)
{
int number_failed;
-----------------------------------------------------------------------
Summary of changes:
test/nsurl.c | 267 +++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 190 insertions(+), 77 deletions(-)
diff --git a/test/nsurl.c b/test/nsurl.c
index 5b56a42..a8c4bc0 100644
--- a/test/nsurl.c
+++ b/test/nsurl.c
@@ -53,6 +53,16 @@ struct test_compare {
bool res;
};
+/* Fixtures */
+
+static void corestring_create(void)
+{
+ ck_assert(corestrings_init() == NSERROR_OK);
+}
+
+/**
+ * iterator for any remaining strings in teardown fixture
+ */
static void netsurf_lwc_iterator(lwc_string *str, void *pw)
{
fprintf(stderr,
@@ -62,6 +72,15 @@ static void netsurf_lwc_iterator(lwc_string *str, void *pw)
lwc_string_data(str));
}
+static void corestring_teardown(void)
+{
+ corestrings_fini();
+
+ lwc_iterate_strings(netsurf_lwc_iterator, NULL);
+}
+
+/* tests */
+
static const char *base_str = "http://a/b/c/d;p?q";;
static const struct test_pairs create_tests[] = {
@@ -586,6 +605,8 @@ START_TEST(nsurl_compare_test)
END_TEST
+/* component test case */
+
/**
* url component tests
*
@@ -594,18 +615,27 @@ END_TEST
* result is checked against test1 and res as approprite.
*/
static const struct test_compare component_tests[] = {
- { "http://a/b/c/d;p?q";,
- "http",
- NSURL_SCHEME,
- true },
-
- { "file:///",
- NULL,
- NSURL_HOST,
- false },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "http", NSURL_SCHEME, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "u", NSURL_USERNAME, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "p", NSURL_PASSWORD, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "a", NSURL_HOST, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "66", NSURL_PORT, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "/b/c/d;p", NSURL_PATH, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "?q", NSURL_QUERY, true },
+ { "http://u:p@a:66/b/c/d;p?q#f";, "f", NSURL_FRAGMENT, true },
+
+ { "file:", "file", NSURL_SCHEME, true },
+ { "file:", NULL, NSURL_USERNAME, false },
+ { "file:", NULL, NSURL_PASSWORD, false },
+ { "file:", NULL, NSURL_HOST, false },
+ { "file:", NULL, NSURL_PORT, false },
+ { "file:", NULL, NSURL_PATH, false },
+ { "file:", NULL, NSURL_QUERY, false },
+ { "file:", NULL, NSURL_FRAGMENT, false },
};
+
/**
* get component
*/
@@ -632,6 +662,7 @@ START_TEST(nsurl_get_component_test)
}
END_TEST
+
/**
* has component
*/
@@ -653,6 +684,30 @@ START_TEST(nsurl_has_component_test)
}
END_TEST
+
+/**
+ * test case for componnet get and has API
+ */
+static TCase *nsurl_component_case_create(void)
+{
+ TCase *tc;
+ tc = tcase_create("Component");
+
+ tcase_add_unchecked_fixture(tc,
+ corestring_create,
+ corestring_teardown);
+
+ tcase_add_loop_test(tc,
+ nsurl_get_component_test,
+ 0, NELEMS(component_tests));
+ tcase_add_loop_test(tc,
+ nsurl_has_component_test,
+ 0, NELEMS(component_tests));
+
+ return tc;
+}
+
+
static const struct test_pairs fragment_tests[] = {
{ "http://www.f.org/a/b/c#def";, "http://www.f.org/a/b/c"; },
};
@@ -731,40 +786,6 @@ START_TEST(nsurl_refragment_test)
}
END_TEST
-static const struct test_pairs parent_tests[] = {
- { "http://www.f.org/a/b/c";, "http://www.f.org/a/b/"; },
-};
-
-/**
- * generate parent url
- */
-START_TEST(nsurl_parent_test)
-{
- nserror err;
- nsurl *url;
- nsurl *res_url;
- const struct test_pairs *tst = &parent_tests[_i];
-
- /* not testing create, this should always succeed */
- err = nsurl_create(tst->test, &url);
- ck_assert(err == NSERROR_OK);
-
- err = nsurl_parent(url, &res_url);
- if (tst->res == NULL) {
- /* result must be invalid (bad input) */
- ck_assert(err != NSERROR_OK);
- } else {
- /* result must be valid */
- ck_assert(err == NSERROR_OK);
-
- ck_assert_str_eq(nsurl_access(res_url), tst->res);
-
- nsurl_unref(res_url);
- }
- nsurl_unref(url);
-
-}
-END_TEST
/**
@@ -1139,6 +1160,7 @@ START_TEST(nsurl_api_assert_nice_test)
}
END_TEST
+
/**
* check parent asserts on NULL parameter
*/
@@ -1153,22 +1175,133 @@ START_TEST(nsurl_api_assert_parent_test)
END_TEST
-/* Fixtures */
-static void corestring_create(void)
+
+/* parent test case */
+
+static const struct test_pairs parent_tests[] = {
+ { "http://www.f.org/a/b/c";, "http://www.f.org/a/b/"; },
+ { "https://www.moo.org/";, "https://www.moo.org/"; },
+ { "https://www.moo.org/asinglepathelementthatsquitelong/";,
"https://www.moo.org/"; },
+ { "https://user:[email protected]/a/b#x?a=b";,
"https://user:[email protected]/a/"; },
+};
+
+/**
+ * generate parent url
+ */
+START_TEST(nsurl_parent_test)
{
- ck_assert(corestrings_init() == NSERROR_OK);
+ nserror err;
+ nsurl *url;
+ nsurl *res_url;
+ const struct test_pairs *tst = &parent_tests[_i];
+
+ /* not testing create, this should always succeed */
+ err = nsurl_create(tst->test, &url);
+ ck_assert(err == NSERROR_OK);
+
+ err = nsurl_parent(url, &res_url);
+ if (tst->res == NULL) {
+ /* result must be invalid (bad input) */
+ ck_assert(err != NSERROR_OK);
+ } else {
+ /* result must be valid */
+ ck_assert(err == NSERROR_OK);
+
+ ck_assert_str_eq(nsurl_access(res_url), tst->res);
+
+ nsurl_unref(res_url);
+ }
+ nsurl_unref(url);
+
}
+END_TEST
-static void corestring_teardown(void)
+
+/**
+ * test case for parent API
+ */
+static TCase *nsurl_parent_case_create(void)
{
- corestrings_fini();
+ TCase *tc;
+ tc = tcase_create("Parent");
- lwc_iterate_strings(netsurf_lwc_iterator, NULL);
+ tcase_add_unchecked_fixture(tc,
+ corestring_create,
+ corestring_teardown);
+
+ tcase_add_loop_test(tc,
+ nsurl_parent_test,
+ 0, NELEMS(parent_tests));
+
+ return tc;
+}
+
+
+/* utf8 test case */
+
+/**
+ * utf8 tests
+ */
+static const struct test_pairs utf8_tests[] = {
+ { "http://a.xn--11b4c3d/a";, "http://a.कॉम/a"; },
+ { "https://smog.xn--3oq18vl8pn36a/test";, "https://smog.大众汽车/test"},
+
+};
+
+
+/**
+ * get utf8 test
+ */
+START_TEST(nsurl_get_utf8_test)
+{
+ nserror err;
+ nsurl *url;
+ const struct test_pairs *tst = &utf8_tests[_i];
+ char *utf8out;
+ size_t utf8out_len;
+
+ /* not testing create, this should always succeed */
+ err = nsurl_create(tst->test, &url);
+ ck_assert(err == NSERROR_OK);
+
+ err = nsurl_get_utf8(url, &utf8out, &utf8out_len);
+ ck_assert(err == NSERROR_OK);
+
+ ck_assert_str_eq(utf8out, tst->res);
+
+ free(utf8out);
+
+ nsurl_unref(url);
}
+END_TEST
+
-/* suite generation */
+/**
+ * test case for utf8 output
+ */
+static TCase *nsurl_utf8_case_create(void)
+{
+ TCase *tc;
+ tc = tcase_create("UTF-8 output");
+ tcase_add_unchecked_fixture(tc,
+ corestring_create,
+ corestring_teardown);
+
+ tcase_add_loop_test(tc,
+ nsurl_get_utf8_test,
+ 0, NELEMS(utf8_tests));
+
+ return tc;
+}
+
+
+/* test suite */
+
+/**
+ * nsurl suite generation
+ */
static Suite *nsurl_suite(void)
{
Suite *s;
@@ -1181,8 +1314,6 @@ static Suite *nsurl_suite(void)
TCase *tc_join;
TCase *tc_compare;
TCase *tc_fragment;
- TCase *tc_component;
- TCase *tc_parent;
s = suite_create("nsurl");
@@ -1351,47 +1482,29 @@ static Suite *nsurl_suite(void)
tcase_add_loop_test(tc_fragment,
nsurl_defragment_test,
- 0, NELEMS(parent_tests));
+ 0, NELEMS(fragment_tests));
tcase_add_loop_test(tc_fragment,
nsurl_refragment_test,
- 0, NELEMS(parent_tests));
+ 0, NELEMS(fragment_tests));
suite_add_tcase(s, tc_fragment);
/* component */
- tc_component = tcase_create("Component");
-
- tcase_add_unchecked_fixture(tc_component,
- corestring_create,
- corestring_teardown);
-
- tcase_add_loop_test(tc_component,
- nsurl_get_component_test,
- 0, NELEMS(component_tests));
- tcase_add_loop_test(tc_component,
- nsurl_has_component_test,
- 0, NELEMS(component_tests));
-
- suite_add_tcase(s, tc_component);
+ suite_add_tcase(s, nsurl_component_case_create());
/* parent */
- tc_parent = tcase_create("Parent");
+ suite_add_tcase(s, nsurl_parent_case_create());
- tcase_add_unchecked_fixture(tc_parent,
- corestring_create,
- corestring_teardown);
+ /* UTF-8 output */
+ suite_add_tcase(s, nsurl_utf8_case_create());
- tcase_add_loop_test(tc_parent,
- nsurl_parent_test,
- 0, NELEMS(parent_tests));
-
- suite_add_tcase(s, tc_parent);
return s;
}
+
int main(int argc, char **argv)
{
int number_failed;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
