Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Revert "Fixed handling of another numeration format"

by Simon Betz

Module: check_mk Branch: master Commit: 41770b334e356a95e090923d39c901696dae23dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41770b334e356a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 9 12:11:47 2018 +0100 Revert "Fixed handling of another numeration format" This reverts commit 48a20ff4676976e5f2166b2aac3df7d54b81f94b. --- cmk/structured_data.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index 52caf71..af36fa2 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -194,15 +194,10 @@ class StructuredDataTree(object): # In the second case we have to deal with nested numerations # We take a look at children which may be real numerations # or sub trees. - # May also be a flat list, thus we convert to expected - # numeration format: [{KEY: VAL,..},..] - entries_type = self._get_entries_type(v) - if isinstance(entries_type, Numeration): + if self._is_numeration(v): sub_raw_tree.setdefault(k, v) - elif isinstance(entries_type, Container): - sub_raw_tree.setdefault(k, dict(enumerate(v))) else: - sub_raw_tree.setdefault(k, [{"name": e} for e in v]) + sub_raw_tree.setdefault(k, dict(enumerate(v))) else: # Here we collect all other values meaning simple # attributes of this node. @@ -210,15 +205,12 @@ class StructuredDataTree(object): return sub_raw_tree, leaf_data - def _get_entries_type(self, entries): - #TODO test + def _is_numeration(self, entries): for entry in entries: - if not isinstance(entry, dict): - return for k, v in entry.iteritems(): if isinstance(v, list): - return Container() - return Numeration() + return False + return True # ---delegators-----------------------------------------------------------

6 years, 4 months

Fixed issue in class hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 002ae64e8271c6a281193b5801010a798fa7bde7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=002ae64e8271c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 9 11:59:19 2018 +0100 Fixed issue in class hierarchy Change-Id: Idc21526f8bc59ce8d8872f6267f0dc505285abf5 --- web/htdocs/pagetypes.py | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 32f77a9..fd0b7a0 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -178,6 +178,10 @@ class Base(object): return False + def _can_be_linked(self): + return True + + def render_title(self): return _u(self.title()) @@ -396,23 +400,6 @@ class PageRenderer(Base): return self.title() - def _can_be_linked(self): - """Whether or not the thing can be linked to""" - if self.is_hidden(): - return False # don't link to hidden things - - if self.is_mine(): - return True - - # Is this the visual which would be shown to the user in case the user - # requests a visual with the current name? - page = self.find_page(self.name()) - if page.owner() != self.owner(): - return False - - return self.is_public() - - #. # .--Overridable---------------------------------------------------------. @@ -494,6 +481,23 @@ class Overridable(Base): return self.is_mine() and config.user.may("general.edit_" + self.type_name()) + def _can_be_linked(self): + """Whether or not the thing can be linked to""" + if self.is_hidden(): + return False # don't link to hidden things + + if self.is_mine(): + return True + + # Is this the visual which would be shown to the user in case the user + # requests a visual with the current name? + page = self.find_page(self.name()) + if page.owner() != self.owner(): + return False + + return self.is_public() + + @classmethod def _delete_permission(cls): return "general.edit_" + cls.type_name()

6 years, 4 months

5762 FIX mk_jolokia, mk_logwatch, win_eventlog, win_logwatch, winperf: Fixed UnicodeEncodeError while baking agents

by Simon Betz

Module: check_mk Branch: master Commit: 3f5634e2acc20a1eb797327ff9827e03dbd23a10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f5634e2acc20a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 8 16:06:47 2018 +0100 5762 FIX mk_jolokia, mk_logwatch, win_eventlog, win_logwatch, winperf: Fixed UnicodeEncodeError while baking agents Change-Id: I3bad35518120d7519f5096e4a6b8b2cb13a2c2ff --- .werks/5762 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5762 b/.werks/5762 new file mode 100644 index 0000000..2cf904d --- /dev/null +++ b/.werks/5762 @@ -0,0 +1,11 @@ +Title: mk_jolokia, mk_logwatch, win_eventlog, win_logwatch, winperf: Fixed UnicodeEncodeError while baking agents +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i3 +Date: 1518102359 + +

6 years, 4 months

Fixed werk version.

by Marcel Schulte

Module: check_mk Branch: master Commit: e446fbd7567a3cb00346b0747d16a160ca97814c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e446fbd7567a3c… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 9 11:54:08 2018 +0100 Fixed werk version. Change-Id: I41581faf880a2236a8d07089449ba14d485be842 --- .werks/4865 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4865 b/.werks/4865 index 3c6094c..dc74b4d 100644 --- a/.werks/4865 +++ b/.werks/4865 @@ -3,7 +3,7 @@ Level: 1 Component: checks Compatible: compat Edition: cre -Version: 1.5.0i2 +Version: 1.5.0i3 Date: 1513162782 Class: feature

6 years, 4 months

5722 FIX View/dashboard list: Show link to view only for not hidden and published views

by Lars Michelsen

Module: check_mk Branch: master Commit: e857e0bad0892b2e6accfc940975dbdd2fee43b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e857e0bad0892b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 8 13:06:07 2018 +0100 5722 FIX View/dashboard list: Show link to view only for not hidden and published views Change-Id: I14566875f827aa8c46b0b7cd87d3655194cf1d01 --- .werks/5722 | 10 ++++++++++ web/htdocs/visuals.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5722 b/.werks/5722 new file mode 100644 index 0000000..d620f59 --- /dev/null +++ b/.werks/5722 @@ -0,0 +1,10 @@ +Title: View/dashboard list: Show link to view only for not hidden and published views +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518091485 +Class: fix + + diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 4059fef..587cd52 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -452,7 +452,7 @@ def page_list(what, title, visuals, custom_columns = None, # Title table.cell(_('Title')) title = _u(visual['title']) - if not visual["hidden"]: + if not visual["hidden"] and (owner == config.user.id or visual["public"]): html.a(title, href="%s.py?%s=%s" % (what_s, visual_types[what]['ident_attr'], visual_name)) else: html.write_text(title)

6 years, 4 months

5723 FIX Fixed broken sorting of services

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c5ca8eacda26a122f6c507f0e8bfe2f7fd73b59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c5ca8eacda26a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 8 14:05:17 2018 +0100 5723 FIX Fixed broken sorting of services The sorting was a case insentivitve text sorting at least since 1.4.0p7. This has now been fixed to work like as case insensitive sort with the addition that texts and numbers are separated from eachother before sorting. Change-Id: I252cf3f98b6493b2050ed179ff980caf266035da --- .werks/5723 | 14 ++++++++++++++ web/htdocs/views.py | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/5723 b/.werks/5723 new file mode 100644 index 0000000..54d0135 --- /dev/null +++ b/.werks/5723 @@ -0,0 +1,14 @@ +Title: Fixed broken sorting of services +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1518095011 + +The sorting was a case insentivitve text sorting at least since +1.4.0p7. This has now been fixed to work like as case insensitive +sort with the addition that texts and numbers are separated from +eachother before sorting. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ad80c3c..34a5e81 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -3001,9 +3001,9 @@ def cmp_simple_string(column, r1, r2): return cmp_insensitive_string(v1, v2) def cmp_num_split(column, r1, r2): - c1 = r1[column] - c2 = r2[column] - return cmp_string_list(column, r1, r2) + c1 = num_split(r1[column].lower()) + c2 = num_split(r2[column].lower()) + return cmp(c1, c2) def cmp_string_list(column, r1, r2): v1 = ''.join(r1.get(column, []))

6 years, 4 months

5725 FIX Fixed changing view filter default values not being effective right after editing

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bbc5f9c9ffe10afdee4c48925cbd4608c3124f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bbc5f9c9ffe10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 8 17:32:10 2018 +0100 5725 FIX Fixed changing view filter default values not being effective right after editing When editing the default values of filters in views (or dashboards) and saving the view, the default filter variables were not effective in all cases in the view rendered after edit. When closing and opening the view again the filter options were set as configured. Change-Id: I809e39931360207a61d2961383273e5a978332a8 --- .werks/5725 | 12 ++++++++++++ web/htdocs/html_mod_python.py | 2 ++ web/htdocs/htmllib.py | 7 +++++++ web/htdocs/views.py | 15 +++++++++------ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.werks/5725 b/.werks/5725 new file mode 100644 index 0000000..87424e9 --- /dev/null +++ b/.werks/5725 @@ -0,0 +1,12 @@ +Title: Fixed changing view filter default values not being effective right after editing +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.4.0p25 +Date: 1518119511 +Class: fix + +When editing the default values of filters in views (or dashboards) and saving the view, +the default filter variables were not effective in all cases in the view rendered after +edit. When closing and opening the view again the filter options were set as configured. diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 16d16f4..5baae11 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -64,6 +64,8 @@ class html_mod_python(htmllib.html): self.read_get_vars() self.read_cookies() + self._requested_url = self.makeuri_contextless(self.vars.items()) + # Disable caching for all our pages as they are mostly dynamically generated, # user related and are required to be up-to-date on every refresh self.set_http_header("Cache-Control", "no-cache") diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index db11e1a..30f74da 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1415,6 +1415,7 @@ class html(HTMLGenerator, RequestHandler): self.browser_redirect = '' self.link_target = None self.keybindings_enabled = True + self._requested_url = None self.myfile = None # Browser options @@ -1758,6 +1759,12 @@ class html(HTMLGenerator, RequestHandler): # URL building # + def requested_url(self): + """Returns the URL requested by the user. + This is not the bare original URL used by the user. Some HTTP variables may + have been filtered by Check_MK while parsing the incoming request.""" + return self._requested_url + # [('varname1', value1), ('varname2', value2) ] def makeuri(self, addvars, remove_prefix=None, filename=None, delvars=None): new_vars = [ nv[0] for nv in addvars ] diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 34a5e81..27fe04c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2169,12 +2169,15 @@ def show_context_links(thisview, datasource, show_filters, # Customize/Edit view button if display_options.enabled(display_options.E) and config.user.may("general.edit_views"): - backurl = html.urlencode(html.makeuri([])) - if thisview["owner"] == config.user.id: - url = "edit_view.py?load_name=%s&back=%s" % (thisview["name"], backurl) - else: - url = "edit_view.py?load_user=%s&load_name=%s&back=%s" % \ - (thisview["owner"], thisview["name"], backurl) + url_vars = [ + ("back", html.requested_url()), + ("load_name", thisview["name"]), + ] + + if thisview["owner"] != config.user.id: + url_vars.append(("load_user", thisview["owner"])) + + url = html.makeuri_contextless(url_vars, filename="edit_view.py") html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) if display_options.enabled(display_options.E):

6 years, 4 months

5724 FIX View/Dashboard list: Link titles only for views/

by Lars Michelsen

dashboards visible to the user Message-ID: <5a7d7a93.E8FLVLGrzDzZiokW%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8e3740c710372a977fd5a328ee1e31fd98d79be5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e3740c710372a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 8 17:22:33 2018 +0100 5724 FIX View/Dashboard list: Link titles only for views/dashboards visible to the user Previously also overriden views/dashboards were linked. Change-Id: If60b507acabd5dc4bc211e2f663893b3d49628da --- .werks/5724 | 10 ++++++++++ web/htdocs/visuals.py | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.werks/5724 b/.werks/5724 new file mode 100644 index 0000000..0de4a50 --- /dev/null +++ b/.werks/5724 @@ -0,0 +1,10 @@ +Title: View/Dashboard list: Link titles only for views/dashboards visible to the user +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518116400 +Class: fix + +Previously also overriden views/dashboards were linked. diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 587cd52..9d9730f 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -452,7 +452,7 @@ def page_list(what, title, visuals, custom_columns = None, # Title table.cell(_('Title')) title = _u(visual['title']) - if not visual["hidden"] and (owner == config.user.id or visual["public"]): + if _visual_can_be_linked(what, visual_name, visuals, visual, owner): html.a(title, href="%s.py?%s=%s" % (what_s, visual_types[what]['ident_attr'], visual_name)) else: html.write_text(title) @@ -478,6 +478,22 @@ def page_list(what, title, visuals, custom_columns = None, html.footer() + +def _visual_can_be_linked(what, visual_name, all_visuals, visual, owner): + if visual["hidden"]: + return False # don't link to hidden visuals + + if owner == config.user.id: + return True + + # Is this the visual which would be shown to the user in case the user + # requests a visual with the current name? + user_visuals = available(what, all_visuals) + if user_visuals.get(visual_name) != visual: + return False + + return visual["public"] + #. # .--Create Visual-------------------------------------------------------. # | ____ _ __ ___ _ |

6 years, 4 months

adapted visual linking logic to pagetypes

by Lars Michelsen

Module: check_mk Branch: master Commit: 748738b9687edc73b2fd825372499719104dbb72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=748738b9687edc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 8 18:02:54 2018 +0100 adapted visual linking logic to pagetypes Change-Id: Ia81264e76e28afce3542ecee191e88132fe25404 --- web/htdocs/pagetypes.py | 20 +++++++++++++++++++- web/htdocs/visuals.py | 6 +----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index b706c53..32f77a9 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -390,12 +390,30 @@ class PageRenderer(Base): def render_title(self): - if not self.is_hidden(): + if self._can_be_linked(): return html.render_a(self.title(), href=self.page_url()) else: return self.title() + def _can_be_linked(self): + """Whether or not the thing can be linked to""" + if self.is_hidden(): + return False # don't link to hidden things + + if self.is_mine(): + return True + + # Is this the visual which would be shown to the user in case the user + # requests a visual with the current name? + page = self.find_page(self.name()) + if page.owner() != self.owner(): + return False + + return self.is_public() + + + #. # .--Overridable---------------------------------------------------------. # | ___ _ _ _ _ | diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 9d9730f..31a6485 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -25,11 +25,7 @@ # Boston, MA 02110-1301 USA. import os, copy, sys - -try: - import simplejson as json -except ImportError: - import json +import json from lib import * from valuespec import *

6 years, 4 months

5702 Allow spaces in Windows eventlog name

by Jukka Aro

Module: check_mk Branch: master Commit: aba03cf7739664913fb35dfdb1dc8a8df8018a54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aba03cf7739664… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jan 23 16:47:49 2018 +0100 5702 Allow spaces in Windows eventlog name Add support for Windows eventlogs whose names contain spaces. Previously, such eventlog names could not be handled as the first space-separated word was interpreted to be the complete name. --- .werks/5702 | 14 ++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 2 +- agents/windows/sections/SectionEventlog.h | 21 +++++---- agents/windows/stringutil.cc | 3 +- agents/windows/test/stringutilTest.cc | 69 +++++++++++++++++++++++++++++- 6 files changed, 98 insertions(+), 13 deletions(-) diff --git a/.werks/5702 b/.werks/5702 new file mode 100644 index 0000000..a045f53 --- /dev/null +++ b/.werks/5702 @@ -0,0 +1,14 @@ +Title: Allow spaces in Windows eventlog name +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518165429 +Class: feature + +Add support for Windows eventlogs whose names contain spaces. Previously, such +eventlog names could not be handled as the first space-separated word was +interpreted to be the complete name. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 09dcc41..64d570b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3090 +3092 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 916769a..ab6b44f 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -285,7 +285,7 @@ uint64_t SectionEventlog::outputEventlog(std::ostream &out, const char *logname, void SectionEventlog::registerEventlog(const char *logname) { // check if we already know this one... for (auto &state : _state) { - if (state.name.compare(logname) == 0) { + if (ci_equal(state.name, logname)) { state.newly_discovered = true; return; } diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index 75340ff..f2ae38b 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -78,10 +78,9 @@ class EventlogConfigurable : public ListConfigurable<eventlog_config_t, BlockMode::Nop<eventlog_config_t>, AddMode::PriorityAppend<eventlog_config_t>> { - typedef ListConfigurable<eventlog_config_t, - BlockMode::Nop<eventlog_config_t>, - AddMode::PriorityAppend<eventlog_config_t>> - SuperT; + using SuperT = + ListConfigurable<eventlog_config_t, BlockMode::Nop<eventlog_config_t>, + AddMode::PriorityAppend<eventlog_config_t>>; public: EventlogConfigurable(Configuration &config, const char *section, @@ -92,11 +91,15 @@ public: const std::string &value) override { eventlog_config_entry entry = from_string<eventlog_config_entry>(_winapi, value); - std::istringstream str(var); - std::string key; - getline(str, key, ' '); - getline(str, entry.name, ' '); - entry.vista_api = (key == "logname"); + const auto tokens = tokenize(var, " "); + + if (tokens.size() < 2) { + std::cerr << "Invalid eventlog logname entry: '" << var << "'" + << std::endl; + } + + entry.name = join(std::next(tokens.cbegin()), tokens.cend(), " "); + entry.vista_api = (tokens[0] == "logname"); add(entry); } }; diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 67e5060..3b06e5e 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -150,7 +150,8 @@ bool ci_compare_pred(unsigned char lhs, unsigned char rhs) { } bool ci_equal(const std::string &lhs, const std::string &rhs) { - return std::equal(lhs.begin(), lhs.end(), rhs.begin(), ci_compare_pred); + return std::equal(lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend(), + ci_compare_pred); } bool globmatch(const char *pattern, const char *astring) { diff --git a/agents/windows/test/stringutilTest.cc b/agents/windows/test/stringutilTest.cc index 56c4ecc..fa66535 100644 --- a/agents/windows/test/stringutilTest.cc +++ b/agents/windows/test/stringutilTest.cc @@ -13,10 +13,16 @@ TEST(wa_stringutilTest, tokenize_Eventlog_Application_state_valid) { ASSERT_EQ(expected, tokenize(input, "\\|")); } +TEST(wa_stringutilTest, tokenize_wstring_Eventlog_Application_state_valid) { + const wstring input{L"Application|19881"}; + const vector<wstring> expected{L"Application", L"19881"}; + ASSERT_EQ(expected, tokenize(input, L"\\|")); +} + TEST(wa_stringutilTest, tokenize_Eventlog_Application_state_missing_value) { const string input{"Application|"}; const vector<string> expected{"Application"}; - ASSERT_EQ(expected, tokenize(input, "\\|")); + ASSERT_EQ(expected, tokenize(input, {"\\|"})); } TEST(wa_stringutilTest, @@ -32,12 +38,43 @@ TEST(wa_stringutilTest, tokenize_logfile_state_valid) { ASSERT_EQ(expected, tokenize(input, "\\|")); } +// Note intentional mixture of tabs and spaces. TEST(wa_stringutilTest, tokenize_whitespace_separator) { const string input{"This is an example sentence."}; const vector<string> expected{"This", "is", "an", "example", "sentence."}; ASSERT_EQ(expected, tokenize(input, "\\s+")); } +// Note intentional mixture of tabs and spaces. +TEST(wa_stringutilTest, tokenizePossiblyQuoted_no_quoted) { + const string input{"This is an example sentence."}; + const vector<string> expected{"This", "is", "an", "example", "sentence."}; + ASSERT_EQ(expected, tokenizePossiblyQuoted(input)); +} + +// Note intentional mixture of tabs and spaces. +TEST(wa_stringutilTest, tokenizePossiblyQuoted_double_quoted) { + const string input{"\"This is an\" \"example sentence.\""}; + const vector<string> expected{"\"This is an\"", + "\"example sentence.\""}; + ASSERT_EQ(expected, tokenizePossiblyQuoted(input)); +} + +// Note intentional mixture of tabs and spaces. +TEST(wa_stringutilTest, tokenizePossiblyQuoted_single_quoted) { + const string input{"'This is an' 'example sentence.'"}; + const vector<string> expected{"'This is an'", + "'example sentence.'"}; + ASSERT_EQ(expected, tokenizePossiblyQuoted(input)); +} + +// Note intentional mixture of tabs and spaces. +TEST(wa_stringutilTest, tokenizePossiblyQuoted_mixed_double_single_non_quoted) { + const string input{"This 'is an' \"example sentence.\""}; + const vector<string> expected{"This", "'is an'", "\"example sentence.\""}; + ASSERT_EQ(expected, tokenizePossiblyQuoted(input)); +} + TEST(wa_stringutilTest, join_strings_space_separator) { const vector<string> input{"This", "is", "an", "example", "sentence."}; const string expected{"This is an example sentence."}; @@ -152,3 +189,33 @@ TEST(wa_stringutilTest, isPathRelative_relative_with_whitespace_quotes_unix) { const std::string path{"\"foo bar/baz\""}; ASSERT_TRUE(isPathRelative(path)) << path << " recognized as relative"; } + +TEST(wa_stringutilTest, ci_equal__equal_cases_equal) { + const std::string s1{"asdfgh"}; + const std::string s2{s1}; + ASSERT_TRUE(ci_equal(s1, s2)); +} + +TEST(wa_stringutilTest, ci_equal__equal_cases_unequal) { + const std::string s1{"asdfgh§$"}; + const std::string s2{"aSdFgH§$"}; + ASSERT_TRUE(ci_equal(s1, s2)); +} + +TEST(wa_stringutilTest, ci_equal__unequal_first_shorter) { + const std::string s1{"asdfgh"}; + const std::string s2{"aSdFgH§$"}; + ASSERT_FALSE(ci_equal(s1, s2)); +} + +TEST(wa_stringutilTest, ci_equal__unequal_first_longer) { + const std::string s1{"asdfgh§$"}; + const std::string s2{"aSdFgH"}; + ASSERT_FALSE(ci_equal(s1, s2)); +} + +TEST(wa_stringutilTest, ci_equal__unequal) { + const std::string s1{"asdfg$"}; + const std::string s2{"aSdFgH"}; + ASSERT_FALSE(ci_equal(s1, s2)); +}

6 years, 4 months

← Newer
1
...
22
23
24
25
26
27
28
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018