Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/util-unit-tests'

Browse source 
* origin/topic/timw/util-unit-tests:
  fixup! Add unit tests to util.cc and module_util.cc
  Mark safe_snprintf and safe_vsnprintf as deprecated, remove uses of them
  Add unit tests to util.cc and module_util.cc
This commit is contained in:
Jon Siwek 2020-01-06 09:44:11 -08:00
commit a4fab5327a
20 changed files with 392 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/module_util.cc
View file

@ -1,10 +1,14 @@
//
// See the file "COPYING" in the main distribution directory for copyright.
#include <string>
#include <string.h>
#include "module_util.h"
#include <string.h>
#include <iostream>
#include <string>
#include "3rdparty/doctest.h"
using namespace std;
static int streq(const char* s1, const char* s2)
@ -12,7 +16,20 @@ static int streq(const char* s1, const char* s2)
return ! strcmp(s1, s2);
}
// Returns it without trailing "::".
TEST_CASE("module_util streq")
{
CHECK(streq("abcd", "abcd") == true);
CHECK(streq("abcd", "efgh") == false);
}
TEST_CASE("module_util extract_module_name")
{
CHECK(extract_module_name("mod") == GLOBAL_MODULE_NAME);
CHECK(extract_module_name("mod::") == "mod");
CHECK(extract_module_name("mod::var") == "mod");
}
// Returns it without trailing "::" var section.
string extract_module_name(const char* name)
{
string module_name = name;
@ -26,6 +43,14 @@ string extract_module_name(const char* name)
return module_name;
}
TEST_CASE("module_util extract_var_name")
{
CHECK(extract_var_name("mod") == "mod");
CHECK(extract_var_name("mod::") == "");
CHECK(extract_var_name("mod::var") == "var");
CHECK(extract_var_name("::var") == "var");
}
string extract_var_name(const char *name)
{
string var_name = name;
@ -40,6 +65,13 @@ string extract_var_name(const char *name)
return var_name.substr(pos+2);
}
TEST_CASE("module_util normalized_module_name")
{
CHECK(normalized_module_name("a") == "a");
CHECK(normalized_module_name("module") == "module");
CHECK(normalized_module_name("module::") == "module");
}
string normalized_module_name(const char* module_name)
{
int mod_len;
@ -50,6 +82,18 @@ string normalized_module_name(const char* module_name)
return string(module_name, mod_len);
}
TEST_CASE("module_util make_full_var_name")
{
CHECK(make_full_var_name(nullptr, "GLOBAL::var") == "var");
CHECK(make_full_var_name(GLOBAL_MODULE_NAME, "var") == "var");
CHECK(make_full_var_name(nullptr, "notglobal::var") == "notglobal::var");
CHECK(make_full_var_name(nullptr, "::var") == "::var");
CHECK(make_full_var_name("module", "var") == "module::var");
CHECK(make_full_var_name("module::", "var") == "module::var");
CHECK(make_full_var_name("", "var") == "::var");
}
string make_full_var_name(const char* module_name, const char* var_name)
{
if ( ! module_name || streq(module_name, GLOBAL_MODULE_NAME) ||