cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't mix flags from different enums in wxRegEx unit test

Browse Source 
Pass compilation and matching flags using separate parameters instead of
passing them as a single int and then separating them inside the
function.

This is a bit cleaner and also avoids warning about using deprecated
enum operations when using C++20.

(cherry picked from commit 4b0fa10a290d899278007f4743df3f811df506a1)
This commit is contained in:
Vadim Zeitlin 2022-07-31 22:21:56 +02:00
parent 0413f02f40
commit 8e50da6875
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/regex/wxregextest.cpp
View File

@ -71,12 +71,12 @@ static void
CheckMatch(const char* pattern, CheckMatch(const char* pattern,
const char* text, const char* text,
const char* expected = NULL, const char* expected = NULL,
int flags = wxRE_DEFAULT) int compileFlags = wxRE_DEFAULT,
int matchFlags = 0)
{ {
int compileFlags = flags & ~(wxRE_NOTBOL | wxRE_NOTEOL); INFO( "Pattern: "
int matchFlags = flags & (wxRE_NOTBOL | wxRE_NOTEOL); << pattern << FlagStr(static_cast<int>(compileFlags) | matchFlags)
<< ", match: " << text );
INFO( "Pattern: " << pattern << FlagStr(flags) << ", match: " << text );
wxRegEx re(pattern, compileFlags); wxRegEx re(pattern, compileFlags);
if ( !re.IsValid() ) if ( !re.IsValid() )
@ -104,7 +104,7 @@ CheckMatch(const char* pattern,
CHECK( re.GetMatch(text, i) == tkz.GetNextToken() ); CHECK( re.GetMatch(text, i) == tkz.GetNextToken() );
} }
if ((flags & wxRE_NOSUB) == 0) if ((compileFlags & wxRE_NOSUB) == 0)
CHECK(re.GetMatchCount() == i); CHECK(re.GetMatchCount() == i);
} }
@ -124,8 +124,8 @@ TEST_CASE("wxRegEx::Match", "[regex][match]")
CheckMatch("^[A-Z].*$", "AA\nbb\nCC", "AA\nbb\nCC"); CheckMatch("^[A-Z].*$", "AA\nbb\nCC", "AA\nbb\nCC");
CheckMatch("^[A-Z].*$", "AA\nbb\nCC", "AA", wxRE_NEWLINE); CheckMatch("^[A-Z].*$", "AA\nbb\nCC", "AA", wxRE_NEWLINE);
CheckMatch("^[a-z].*$", "AA\nbb\nCC", "bb", wxRE_NEWLINE); CheckMatch("^[a-z].*$", "AA\nbb\nCC", "bb", wxRE_NEWLINE);
CheckMatch("^[A-Z].*$", "AA\nbb\nCC", "CC", wxRE_NEWLINE | wxRE_NOTBOL); CheckMatch("^[A-Z].*$", "AA\nbb\nCC", "CC", wxRE_NEWLINE, wxRE_NOTBOL);
CheckMatch("^[A-Z].*$", "AA\nbb\nCC", NULL, wxRE_NEWLINE | wxRE_NOTBOL | wxRE_NOTEOL); CheckMatch("^[A-Z].*$", "AA\nbb\nCC", NULL, wxRE_NEWLINE, wxRE_NOTBOL | wxRE_NOTEOL);
CheckMatch("([[:alpha:]]+) ([[:alpha:]]+) ([[:digit:]]+).* ([[:digit:]]+)$", CheckMatch("([[:alpha:]]+) ([[:alpha:]]+) ([[:digit:]]+).* ([[:digit:]]+)$",
"Fri Jul 13 18:37:52 CEST 2001", "Fri Jul 13 18:37:52 CEST 2001",
"Fri Jul 13 18:37:52 CEST 2001\tFri\tJul\t13\t2001"); "Fri Jul 13 18:37:52 CEST 2001\tFri\tJul\t13\t2001");