diff --git a/src/tests/test_regex.cpp b/src/tests/test_regex.cpp index 1c516dc..fe76582 100644 --- a/src/tests/test_regex.cpp +++ b/src/tests/test_regex.cpp @@ -11,7 +11,7 @@ using namespace alpr; TEST_CASE( "ASCII tests", "[Regex]" ) { - RegexRule rule1("us", "@@@####"); + RegexRule rule1("us", "@@@####", "[A-Za-z]", "[0-9]"); REQUIRE( rule1.match("123ABCD") == false); REQUIRE( rule1.match("123ABC") == false); @@ -28,7 +28,7 @@ TEST_CASE( "ASCII tests", "[Regex]" ) { REQUIRE( rule1.match("AAA1111") == true); REQUIRE( rule1.match("zzz1111") == true); - RegexRule rule2("us", "[ABC]@@####"); + RegexRule rule2("us", "[ABC]@@####", "[A-Z]", "[0-9]"); REQUIRE( rule2.match("ZBC1234") == false); REQUIRE( rule2.match("DBC1234") == false); @@ -38,7 +38,7 @@ TEST_CASE( "ASCII tests", "[Regex]" ) { REQUIRE( rule2.match("BAA1111") == true); REQUIRE( rule2.match("CAA1111") == true); - RegexRule rule3("us", "[A]@@###[12]"); + RegexRule rule3("us", "[A]@@###[12]", "[A-Z]", "[0-9]"); REQUIRE( rule3.match("ZBC1234") == false); REQUIRE( rule3.match("ZBC1231") == false); @@ -48,7 +48,7 @@ TEST_CASE( "ASCII tests", "[Regex]" ) { REQUIRE( rule3.match("ABC1232") == true); - RegexRule rule4("us", "[A-C][E-G]1111"); + RegexRule rule4("us", "[A-C][E-G]1111", "[A-Z]", "[0-9]"); REQUIRE( rule4.match("DG1111") == false); REQUIRE( rule4.match("AD1111") == false); @@ -61,7 +61,7 @@ TEST_CASE( "ASCII tests", "[Regex]" ) { REQUIRE( rule4.match("BF1111") == true); REQUIRE( rule4.match("BG1111") == true); - RegexRule rule5("us", "\\d\\d\\D\\D"); + RegexRule rule5("us", "\\d\\d\\D\\D", "[A-Z]", "[0-9]"); REQUIRE( rule5.match("AA11") == false); REQUIRE( rule5.match("11AA") == true); @@ -69,7 +69,7 @@ TEST_CASE( "ASCII tests", "[Regex]" ) { TEST_CASE( "Unicode tests", "[Regex]" ) { - RegexRule rule1("us", "@@@####"); + RegexRule rule1("us", "@@@####", "\\pL", "\\pN"); REQUIRE( rule1.match("123与与与下") == false); REQUIRE( rule1.match("与万12345") == false); @@ -78,7 +78,7 @@ TEST_CASE( "Unicode tests", "[Regex]" ) { REQUIRE( rule1.match("与万口1234") == true); - RegexRule rule2("us", "[십팔]@@####"); + RegexRule rule2("us", "[십팔]@@####", "\\pL", "\\pN"); REQUIRE( rule2.match("123与与与下") == false); REQUIRE( rule2.match("与万12345") == false); @@ -93,7 +93,7 @@ TEST_CASE( "Unicode tests", "[Regex]" ) { TEST_CASE( "Invalid tests", "[Regex]" ) { - RegexRule rule1("us", "[A@@####"); + RegexRule rule1("us", "[A@@####", "\\pL", "\\pN"); REQUIRE( rule1.match("123ABCD") == false); REQUIRE( rule1.match("123ABC") == false); @@ -103,6 +103,6 @@ TEST_CASE( "Invalid tests", "[Regex]" ) { REQUIRE( rule1.match("AAA1111") == false); REQUIRE( rule1.match("zzz1111") == false); - RegexRule rule2("us", "A####]"); + RegexRule rule2("us", "A####]", "\\pL", "\\pN"); REQUIRE( rule2.match("A1234") == false); } \ No newline at end of file