From 116ff24da3ea2c5a9d7efd713f518486d4212515 Mon Sep 17 00:00:00 2001 From: Tim Stack Date: Mon, 7 Aug 2023 10:05:22 -0700 Subject: [PATCH] [tests] add regexp test Related to #1177 --- test/Makefile.am | 1 + test/expected/expected.am | 4 ++-- ...sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.err | 0 ...sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out | 3 +++ test/logfile_regexp_access_log.0 | 2 ++ test/test_sql_regexp.sh | 4 ++++ 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.err create mode 100644 test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out create mode 100644 test/logfile_regexp_access_log.0 diff --git a/test/Makefile.am b/test/Makefile.am index a9fa29a6..a9bfb758 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -333,6 +333,7 @@ dist_noinst_DATA = \ logfile_plain.0 \ logfile_pretty.0 \ logfile_procstate.0 \ + logfile_regexp_access_log.0 \ logfile_rollover.0 \ logfile_rollover.1 \ logfile_strace_log.0 \ diff --git a/test/expected/expected.am b/test/expected/expected.am index e8776b7a..c4661518 100644 --- a/test/expected/expected.am +++ b/test/expected/expected.am @@ -664,8 +664,6 @@ EXPECTED_FILES = \ $(srcdir)/%reldir%/test_sql_fs_func.sh_469380561dccd79c7249562067107c330838eaad.out \ $(srcdir)/%reldir%/test_sql_fs_func.sh_54b004f301907860d360434b37fd6c81fcc12f99.err \ $(srcdir)/%reldir%/test_sql_fs_func.sh_54b004f301907860d360434b37fd6c81fcc12f99.out \ - $(srcdir)/%reldir%/test_sql_fs_func.sh_5a69557a4e14e33e4a213932accbcd4803c947b4.err \ - $(srcdir)/%reldir%/test_sql_fs_func.sh_5a69557a4e14e33e4a213932accbcd4803c947b4.out \ $(srcdir)/%reldir%/test_sql_fs_func.sh_73df81c6889d1f06fb3f3b6bf30c6046b3f52c8b.err \ $(srcdir)/%reldir%/test_sql_fs_func.sh_73df81c6889d1f06fb3f3b6bf30c6046b3f52c8b.out \ $(srcdir)/%reldir%/test_sql_fs_func.sh_74ca242a126316bcb82ccefd9369f9e43b7fd2e1.err \ @@ -792,6 +790,8 @@ EXPECTED_FILES = \ $(srcdir)/%reldir%/test_sql_json_func.sh_f34205b59e04f261897ad89f659595c743a18ca9.out \ $(srcdir)/%reldir%/test_sql_json_func.sh_f34f5dfa938a1ac7721f924beb16bbceec127a1b.err \ $(srcdir)/%reldir%/test_sql_json_func.sh_f34f5dfa938a1ac7721f924beb16bbceec127a1b.out \ + $(srcdir)/%reldir%/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.err \ + $(srcdir)/%reldir%/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out \ $(srcdir)/%reldir%/test_sql_regexp.sh_03257c56e85558aa0cc925b68d3af962afc25125.err \ $(srcdir)/%reldir%/test_sql_regexp.sh_03257c56e85558aa0cc925b68d3af962afc25125.out \ $(srcdir)/%reldir%/test_sql_regexp.sh_219a579cf7744fa08ab79fadd08b521b2f18a661.err \ diff --git a/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.err b/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.err new file mode 100644 index 00000000..e69de29b diff --git a/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out b/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out new file mode 100644 index 00000000..cba5ca06 --- /dev/null +++ b/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out @@ -0,0 +1,3 @@ +regexp_replace(cs_uri_query, '.*rapidView=(\d+).*', '\1')  +1295 +1839 diff --git a/test/logfile_regexp_access_log.0 b/test/logfile_regexp_access_log.0 new file mode 100644 index 00000000..6f37afd9 --- /dev/null +++ b/test/logfile_regexp_access_log.0 @@ -0,0 +1,2 @@ +localhost:443 178.20.184.42 1j0vhgd jsmith [26/Jul/2023:00:01:26 -0700] "GET /secure/RapidBoard.jspa?rapidView=1295&selectedIssue=AA-409111&quickFilter=385508&quickFilter=387097 HTTP/2.0" 200 17163 "-" "Mozilla/5.0" 116075 +localhost:443 154.57.4.229 cger1e khenry [26/Jul/2023:00:02:12 -0700] "GET /secure/RapidBoard.jspa?rapidView=1839&view=planning.nodetail&issueLimit=100 HTTP/2.0" 200 16517 "https://localhost/secure/RapidBoard.jspa?rapidView=1843&view=planning.nodetail&issueLimit=100" "Mozilla/5.0" 156302 diff --git a/test/test_sql_regexp.sh b/test/test_sql_regexp.sh index 89b90d9b..06d74571 100644 --- a/test/test_sql_regexp.sh +++ b/test/test_sql_regexp.sh @@ -36,3 +36,7 @@ run_cap_test ${lnav_test} -nN \ run_cap_test ${lnav_test} -nN \ -c ";SELECT * from regexp_capture_into_json('abc=def;ghi=jkl;', '^(')" + +run_cap_test ${lnav_test} -n \ + -c ";select regexp_replace(cs_uri_query, '.*rapidView=(\d+).*', '\1') from access_log;" \ + ${test_dir}/logfile_regexp_access_log.0