Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/0e5824c8e851ee6fd29868eddd3be2b738f3351e
...commit
http://git.netsurf-browser.org/netsurf.git/commit/0e5824c8e851ee6fd29868eddd3be2b738f3351e
...tree
http://git.netsurf-browser.org/netsurf.git/tree/0e5824c8e851ee6fd29868eddd3be2b738f3351e
The branch, master has been updated
via 0e5824c8e851ee6fd29868eddd3be2b738f3351e (commit)
from a815ad62502669e9a2b689f6f609eb03008a4ca4 (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=0e5824c8e851ee6fd29868eddd3be2b738f3351e
commit 0e5824c8e851ee6fd29868eddd3be2b738f3351e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
add bloom filter test for adding NULL string
diff --git a/test/bloom.c b/test/bloom.c
index 6ba3b48..0fd1b06 100644
--- a/test/bloom.c
+++ b/test/bloom.c
@@ -48,7 +48,7 @@ static struct bloom_filter *dict_bloom;
*/
static void dict_bloom_create(void)
{
- FILE *dictf;
+ FILE *dictf;
char buf[BUFSIZ];
int i;
@@ -84,6 +84,7 @@ START_TEST(bloom_create_test)
{
struct bloom_filter *b;
b = bloom_create(BLOOM_SIZE);
+ ck_assert(b != NULL);
bloom_insert_str(b, "NetSurf", 7);
ck_assert(bloom_search_str(b, "NetSurf", 7));
@@ -95,9 +96,43 @@ START_TEST(bloom_create_test)
}
END_TEST
+/**
+ * insert empty string test
+ */
+START_TEST(bloom_insert_empty_str_test)
+{
+ struct bloom_filter *b;
+ b = bloom_create(BLOOM_SIZE);
+ ck_assert(b != NULL);
+
+ bloom_insert_str(b, NULL, 7);
+
+ ck_assert(bloom_items(b) == 1);
+
+ bloom_destroy(b);
+}
+END_TEST
+
+
+/**
+ * Basic API creation test case
+ */
+static TCase *bloom_api_case_create(void)
+{
+ TCase *tc;
+
+ tc = tcase_create("Creation");
+
+ tcase_add_test(tc, bloom_create_test);
+ tcase_add_test(tc, bloom_insert_empty_str_test);
+
+ return tc;
+}
+
+
START_TEST(bloom_match_test)
{
- FILE *dictf;
+ FILE *dictf;
char buf[BUFSIZ];
int i;
@@ -112,9 +147,29 @@ START_TEST(bloom_match_test)
}
END_TEST
+
+/**
+ * Matching entry test case
+ */
+static TCase *bloom_match_case_create(void)
+{
+ TCase *tc;
+
+ tc = tcase_create("Match");
+
+ tcase_add_checked_fixture(tc,
+ dict_bloom_create,
+ dict_bloom_teardown);
+
+ tcase_add_test(tc, bloom_match_test);
+
+ return tc;
+}
+
+
START_TEST(bloom_falsepositive_test)
{
- FILE *dictf;
+ FILE *dictf;
char buf[BUFSIZ];
int i;
int false_positives = 0;
@@ -135,7 +190,7 @@ START_TEST(bloom_falsepositive_test)
}
fclose(dictf);
- printf("false positive rate %d%%/%d%%\n",
+ printf("false positive rate %d%%/%d%%\n",
(false_positives * 100)/BLOOM_SIZE,
FALSE_POSITIVE_RATE);
ck_assert(false_positives < ((BLOOM_SIZE * FALSE_POSITIVE_RATE) / 100));
@@ -143,47 +198,33 @@ START_TEST(bloom_falsepositive_test)
END_TEST
-/* Suite */
-
-static Suite *bloom_suite(void)
+/**
+ * Not matching test case
+ */
+static TCase *bloom_rate_case_create(void)
{
- Suite *s;
- TCase *tc_create;
- TCase *tc_match;
- TCase *tc_falsepositive;
-
- s = suite_create("Bloom filter");
-
- /* Basic API creation */
- tc_create = tcase_create("Creation");
-
- tcase_add_test(tc_create, bloom_create_test);
-
- suite_add_tcase(s, tc_create);
+ TCase *tc;
+ tc = tcase_create("False positive rate");
- /* Matching entry tests */
- tc_match = tcase_create("Match");
-
- tcase_add_checked_fixture(tc_match,
+ tcase_add_checked_fixture(tc,
dict_bloom_create,
dict_bloom_teardown);
- tcase_add_test(tc_match, bloom_match_test);
-
- suite_add_tcase(s, tc_match);
-
+ tcase_add_test(tc, bloom_falsepositive_test);
- /* Not matching tests */
- tc_falsepositive = tcase_create("False positive rate");
+ return tc;
+}
- tcase_add_checked_fixture(tc_falsepositive,
- dict_bloom_create,
- dict_bloom_teardown);
- tcase_add_test(tc_falsepositive, bloom_falsepositive_test);
+static Suite *bloom_suite(void)
+{
+ Suite *s;
+ s = suite_create("Bloom filter");
- suite_add_tcase(s, tc_falsepositive);
+ suite_add_tcase(s, bloom_api_case_create());
+ suite_add_tcase(s, bloom_match_case_create());
+ suite_add_tcase(s, bloom_rate_case_create());
return s;
}
-----------------------------------------------------------------------
Summary of changes:
test/bloom.c | 111 ++++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 76 insertions(+), 35 deletions(-)
diff --git a/test/bloom.c b/test/bloom.c
index 6ba3b48..0fd1b06 100644
--- a/test/bloom.c
+++ b/test/bloom.c
@@ -48,7 +48,7 @@ static struct bloom_filter *dict_bloom;
*/
static void dict_bloom_create(void)
{
- FILE *dictf;
+ FILE *dictf;
char buf[BUFSIZ];
int i;
@@ -84,6 +84,7 @@ START_TEST(bloom_create_test)
{
struct bloom_filter *b;
b = bloom_create(BLOOM_SIZE);
+ ck_assert(b != NULL);
bloom_insert_str(b, "NetSurf", 7);
ck_assert(bloom_search_str(b, "NetSurf", 7));
@@ -95,9 +96,43 @@ START_TEST(bloom_create_test)
}
END_TEST
+/**
+ * insert empty string test
+ */
+START_TEST(bloom_insert_empty_str_test)
+{
+ struct bloom_filter *b;
+ b = bloom_create(BLOOM_SIZE);
+ ck_assert(b != NULL);
+
+ bloom_insert_str(b, NULL, 7);
+
+ ck_assert(bloom_items(b) == 1);
+
+ bloom_destroy(b);
+}
+END_TEST
+
+
+/**
+ * Basic API creation test case
+ */
+static TCase *bloom_api_case_create(void)
+{
+ TCase *tc;
+
+ tc = tcase_create("Creation");
+
+ tcase_add_test(tc, bloom_create_test);
+ tcase_add_test(tc, bloom_insert_empty_str_test);
+
+ return tc;
+}
+
+
START_TEST(bloom_match_test)
{
- FILE *dictf;
+ FILE *dictf;
char buf[BUFSIZ];
int i;
@@ -112,9 +147,29 @@ START_TEST(bloom_match_test)
}
END_TEST
+
+/**
+ * Matching entry test case
+ */
+static TCase *bloom_match_case_create(void)
+{
+ TCase *tc;
+
+ tc = tcase_create("Match");
+
+ tcase_add_checked_fixture(tc,
+ dict_bloom_create,
+ dict_bloom_teardown);
+
+ tcase_add_test(tc, bloom_match_test);
+
+ return tc;
+}
+
+
START_TEST(bloom_falsepositive_test)
{
- FILE *dictf;
+ FILE *dictf;
char buf[BUFSIZ];
int i;
int false_positives = 0;
@@ -135,7 +190,7 @@ START_TEST(bloom_falsepositive_test)
}
fclose(dictf);
- printf("false positive rate %d%%/%d%%\n",
+ printf("false positive rate %d%%/%d%%\n",
(false_positives * 100)/BLOOM_SIZE,
FALSE_POSITIVE_RATE);
ck_assert(false_positives < ((BLOOM_SIZE * FALSE_POSITIVE_RATE) / 100));
@@ -143,47 +198,33 @@ START_TEST(bloom_falsepositive_test)
END_TEST
-/* Suite */
-
-static Suite *bloom_suite(void)
+/**
+ * Not matching test case
+ */
+static TCase *bloom_rate_case_create(void)
{
- Suite *s;
- TCase *tc_create;
- TCase *tc_match;
- TCase *tc_falsepositive;
-
- s = suite_create("Bloom filter");
-
- /* Basic API creation */
- tc_create = tcase_create("Creation");
-
- tcase_add_test(tc_create, bloom_create_test);
-
- suite_add_tcase(s, tc_create);
+ TCase *tc;
+ tc = tcase_create("False positive rate");
- /* Matching entry tests */
- tc_match = tcase_create("Match");
-
- tcase_add_checked_fixture(tc_match,
+ tcase_add_checked_fixture(tc,
dict_bloom_create,
dict_bloom_teardown);
- tcase_add_test(tc_match, bloom_match_test);
-
- suite_add_tcase(s, tc_match);
-
+ tcase_add_test(tc, bloom_falsepositive_test);
- /* Not matching tests */
- tc_falsepositive = tcase_create("False positive rate");
+ return tc;
+}
- tcase_add_checked_fixture(tc_falsepositive,
- dict_bloom_create,
- dict_bloom_teardown);
- tcase_add_test(tc_falsepositive, bloom_falsepositive_test);
+static Suite *bloom_suite(void)
+{
+ Suite *s;
+ s = suite_create("Bloom filter");
- suite_add_tcase(s, tc_falsepositive);
+ suite_add_tcase(s, bloom_api_case_create());
+ suite_add_tcase(s, bloom_match_case_create());
+ suite_add_tcase(s, bloom_rate_case_create());
return s;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
