From 168de93a068e489eb96c541172de5e43e13a5873 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Fri, 12 Jun 2015 00:35:10 -0300 Subject: Revert "added content excerpt support" This reverts commit 1851274f9524c462806d6ab64e024effb0392231. --- tests/check_loader.c | 2 +- tests/check_source_parser.c | 89 +++------------------------------------------ 2 files changed, 6 insertions(+), 85 deletions(-) (limited to 'tests') diff --git a/tests/check_loader.c b/tests/check_loader.c index 2d16dba..865d598 100644 --- a/tests/check_loader.c +++ b/tests/check_loader.c @@ -117,7 +117,7 @@ test_source_parse_from_file(void **state) assert_string_equal(b_trie_lookup(t, "ASD"), "123"); assert_string_equal(b_trie_lookup(t, "FILENAME"), "bola"); assert_string_equal(b_trie_lookup(t, "CONTENT"), "

bola

\n"); - assert_string_equal(b_trie_lookup(t, "EXCERPT"), "

bola

\n"); + assert_string_equal(b_trie_lookup(t, "RAW_CONTENT"), "bola"); b_trie_free(t); } diff --git a/tests/check_source_parser.c b/tests/check_source_parser.c index c33b4c1..0cec364 100644 --- a/tests/check_source_parser.c +++ b/tests/check_source_parser.c @@ -40,42 +40,10 @@ test_source_parse(void **state) assert_string_equal(b_trie_lookup(source, "CONTENT"), "

This is a test

\n" "

bola

\n"); - assert_string_equal(b_trie_lookup(source, "EXCERPT"), - "

This is a test

\n" - "

bola

\n"); - b_trie_free(source); -} - - -static void -test_source_parse_with_excerpt(void **state) -{ - const char *a = - "VAR1: asd asd\n" - "VAR2: 123chunda\n" - "----------\n" + assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"), "# This is a test\n" "\n" - "bola\n" - "\n" - "...\n" - "guda\n" - "bola\n"; - blogc_error_t *err = NULL; - b_trie_t *source = blogc_source_parse(a, strlen(a), &err); - assert_null(err); - assert_non_null(source); - assert_int_equal(b_trie_size(source), 4); - assert_string_equal(b_trie_lookup(source, "VAR1"), "asd asd"); - assert_string_equal(b_trie_lookup(source, "VAR2"), "123chunda"); - assert_string_equal(b_trie_lookup(source, "CONTENT"), - "

This is a test

\n" - "

bola

\n" - "

guda\n" - "bola

\n"); - assert_string_equal(b_trie_lookup(source, "EXCERPT"), - "

This is a test

\n" - "

bola

\n"); + "bola\n"); b_trie_free(source); } @@ -102,37 +70,10 @@ test_source_parse_with_spaces(void **state) assert_string_equal(b_trie_lookup(source, "CONTENT"), "

This is a test

\n" "

bola

\n"); - assert_string_equal(b_trie_lookup(source, "EXCERPT"), - "

This is a test

\n" - "

bola

\n"); - b_trie_free(source); -} - - -static void -test_source_parse_with_spaces_and_excerpt(void **state) -{ - const char *a = - "\n \n" - "VAR1: chunda \t \n" - "\n\n" - "BOLA: guda\n" - "----------\n" + assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"), "# This is a test\n" - "..\n" - "bola\n"; - blogc_error_t *err = NULL; - b_trie_t *source = blogc_source_parse(a, strlen(a), &err); - assert_null(err); - assert_non_null(source); - assert_int_equal(b_trie_size(source), 4); - assert_string_equal(b_trie_lookup(source, "VAR1"), "chunda"); - assert_string_equal(b_trie_lookup(source, "BOLA"), "guda"); - assert_string_equal(b_trie_lookup(source, "CONTENT"), - "

This is a test

\n" - "

bola

\n"); - assert_string_equal(b_trie_lookup(source, "EXCERPT"), - "

This is a test

\n"); + "\n" + "bola\n"); b_trie_free(source); } @@ -434,31 +375,12 @@ test_source_parse_invalid_separator(void **state) } -static void -test_source_parse_invalid_excerpt_separator(void **state) -{ - const char *a = "BOLA: asd\n---\nbola\n...#"; - blogc_error_t *err = NULL; - b_trie_t *source = blogc_source_parse(a, strlen(a), &err); - assert_null(source); - assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "Invalid excerpt separator. Must be more than one '.' characters.\n" - "Error occurred near to '#'"); - blogc_error_free(err); - b_trie_free(source); -} - - int main(void) { const UnitTest tests[] = { unit_test(test_source_parse), - unit_test(test_source_parse_with_excerpt), unit_test(test_source_parse_with_spaces), - unit_test(test_source_parse_with_spaces_and_excerpt), unit_test(test_source_parse_config_empty), unit_test(test_source_parse_config_invalid_key), unit_test(test_source_parse_config_no_key), @@ -477,7 +399,6 @@ main(void) unit_test(test_source_parse_config_reserved_name10), unit_test(test_source_parse_config_value_no_line_ending), unit_test(test_source_parse_invalid_separator), - unit_test(test_source_parse_invalid_excerpt_separator), }; return run_tests(tests); } -- cgit v1.2.3-18-g5258