diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2021-06-18 20:35:05 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2021-06-18 20:35:24 +0100 |
| commit | 447755d6c8951bdf9593dab9593dac368bcaa372 (patch) | |
| tree | 733e2cc6e71edc604b116d1fd167b904bfebaee5 /src | |
| parent | 43055e2379b4796d146a3825df5b314681041a2b (diff) | |
| download | rspamd-447755d6c8951bdf9593dab9593dac368bcaa372.tar.gz rspamd-447755d6c8951bdf9593dab9593dac368bcaa372.zip | |
[Test] Slightly reorganize tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/libserver/css/css_parser.cxx | 2 | ||||
| -rw-r--r-- | src/libserver/css/css_rule.cxx | 2 | ||||
| -rw-r--r-- | src/libserver/css/css_selector.cxx | 2 | ||||
| -rw-r--r-- | src/libserver/css/css_value.cxx | 2 | ||||
| -rw-r--r-- | src/libserver/html/html.cxx | 19 |
5 files changed, 15 insertions, 12 deletions
diff --git a/src/libserver/css/css_parser.cxx b/src/libserver/css/css_parser.cxx index 6943e1cf6..bac5a72eb 100644 --- a/src/libserver/css/css_parser.cxx +++ b/src/libserver/css/css_parser.cxx @@ -817,7 +817,7 @@ parse_css_declaration(rspamd_mempool_t *pool, const std::string_view &st) return nullptr; } -TEST_SUITE("css parser") { +TEST_SUITE("css") { TEST_CASE("parse colors") { const std::vector<const char *> cases{ "P { CoLoR: rgb(100%, 50%, 0%); opacity: -1; width: 1em; display: none; } /* very transparent solid orange ัะตัั */", diff --git a/src/libserver/css/css_rule.cxx b/src/libserver/css/css_rule.cxx index 52003ac23..d8c3a04dd 100644 --- a/src/libserver/css/css_rule.cxx +++ b/src/libserver/css/css_rule.cxx @@ -500,7 +500,7 @@ void css_rule::add_value(const css_value &value) } -TEST_SUITE("css rules") { +TEST_SUITE("css") { TEST_CASE("simple css rules") { const std::vector<std::pair<const char *, std::vector<css_property>>> cases{ { diff --git a/src/libserver/css/css_selector.cxx b/src/libserver/css/css_selector.cxx index a4e1eb566..28b64a9fd 100644 --- a/src/libserver/css/css_selector.cxx +++ b/src/libserver/css/css_selector.cxx @@ -191,7 +191,7 @@ css_selector::debug_str() const -> std::string return ret; } -TEST_SUITE("css selectors") { +TEST_SUITE("css") { TEST_CASE("simple css selectors") { const std::vector<std::pair<const char *, std::vector<css_selector::selector_type>>> cases{ {"em", {css_selector::selector_type::SELECTOR_TAG}}, diff --git a/src/libserver/css/css_value.cxx b/src/libserver/css/css_value.cxx index d187f1031..87d6ceb85 100644 --- a/src/libserver/css/css_value.cxx +++ b/src/libserver/css/css_value.cxx @@ -377,7 +377,7 @@ auto css_value::debug_str() const -> std::string { return ret; } -TEST_SUITE("css values") { +TEST_SUITE("css") { TEST_CASE("css hex colors") { const std::pair<const char*, css_color> hex_tests[] = { {"000", css_color(0, 0, 0)}, diff --git a/src/libserver/html/html.cxx b/src/libserver/html/html.cxx index bb6d8b725..073b733a2 100644 --- a/src/libserver/html/html.cxx +++ b/src/libserver/html/html.cxx @@ -1796,17 +1796,19 @@ auto html_tag_by_name(const std::string_view &name) * Tests part */ -TEST_CASE("html parsing") { +TEST_SUITE("html") { +TEST_CASE("html parsing") +{ const std::vector<std::pair<std::string, std::string>> cases{ - {"<html><!DOCTYPE html><body>", "+html;++body;"}, - {"<html><div><div></div></div></html>", "+html;++div;+++div;"}, - {"<html><div><div></div></html>", "+html;++div;+++div;"}, - {"<html><div><div></div></html></div>", "+html;++div;+++div;"}, - {"<p><p><a></p></a></a>", "+p;++p;+++a;"}, + {"<html><!DOCTYPE html><body>", "+html;++body;"}, + {"<html><div><div></div></div></html>", "+html;++div;+++div;"}, + {"<html><div><div></div></html>", "+html;++div;+++div;"}, + {"<html><div><div></div></html></div>", "+html;++div;+++div;"}, + {"<p><p><a></p></a></a>", "+p;++p;+++a;"}, {"<div><a href=\"http://example.com\"></div></a>", "+div;++a;"}, {"<html><!DOCTYPE html><body><head><body></body></html></body></html>", - "+html;++body;+++head;++++body;"} + "+html;++body;+++head;++++body;"} }; rspamd_url_init(NULL); @@ -1815,7 +1817,7 @@ TEST_CASE("html parsing") { for (const auto &c : cases) { GByteArray *tmp = g_byte_array_sized_new(c.first.size()); - g_byte_array_append(tmp, (const guint8 *)c.first.data(), c.first.size()); + g_byte_array_append(tmp, (const guint8 *) c.first.data(), c.first.size()); auto *hc = html_process_input(pool, tmp, nullptr, nullptr, nullptr, true); CHECK(hc != nullptr); auto dump = html_debug_structure(*hc); @@ -1825,6 +1827,7 @@ TEST_CASE("html parsing") { rspamd_mempool_delete(pool); } +} } |