Extract Library wildmat and add tests

Author: LegalizeAdulthood

CMakeLists.txt

@@ -52,6 +52,7 @@ add_subdirectory(parsedate)
 add_subdirectory(tool)
 add_subdirectory(trn-artchk)
 add_subdirectory(util)
+add_subdirectory(wildmat)
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()

nntplist/nntplist.cpp

@@ -10,7 +10,7 @@
 #include <trn/string-algos.h>
 #include <util/env.h>
 #include <util/util2.h>
-#include <util/wildmat.h>
+#include <wildmat/wildmat.h>
 
 #include <cstdio>
 #include <cstdlib>

tests/CMakeLists.txt

@@ -22,6 +22,7 @@ add_executable(trn-test
     test_rt-util.cpp
     test_string-algos.cpp
     test_utf.cpp
+    test_wildmat.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/test_config.h
     ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/test_mime.h

tests/test_wildmat.cpp

@@ -0,0 +1,20 @@
+#include <wildmat/wildmat.h>
+
+#include <gtest/gtest.h>
+
+TEST(TestWildMat, exactMatch)
+{
+    EXPECT_TRUE(wildcard_match("alt.flame", "alt.flame"));
+}
+
+TEST(TestWildMat, fontMatch)
+{
+    EXPECT_TRUE(
+        wildcard_match("-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1", "-*-*-*-*-*-*-12-*-*-*-m-*-*-*"));
+}
+
+TEST(TestWildMat, fontMisMatch)
+{
+    EXPECT_FALSE(
+        wildcard_match("-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1", "-*-*-*-*-*-*-12-*-*-*-m-*-*-*"));
+}

util/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_library(util
     env.cpp include/util/env.h include/util/env-internal.h
     util2.cpp include/util/util2.h
-    wildmat.cpp include/util/wildmat.h
 )
 source_group("CMake Scripts" REGULAR_EXPRESSION "^.*\\.cmake$")
 source_group("Template Files" REGULAR_EXPRESSION "^.*\\.in$")
@@ -10,5 +9,5 @@ if(WIN32)
 endif()
 target_include_directories(util PUBLIC include)
 target_include_directories(util PRIVATE ../libtrn/include ../tool/include)
-target_link_libraries(util PUBLIC config)
+target_link_libraries(util PUBLIC config wildmat)
 target_folder(util "Libraries")

wildmat/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library(wildmat
+    wildmat.cpp include/wildmat/wildmat.h
+)
+if(WIN32)
+    target_compile_definitions(wildmat PUBLIC _CRT_DECLARE_NONSTDC_NAMES=1 _CRT_INTERNAL_NONSTDC_NAMES=1)
+endif()
+target_include_directories(wildmat PUBLIC include)
+target_folder(wildmat "Libraries")

util/include/util/wildmat.h wildmat/include/wildmat/wildmat.hutil/include/util/wildmat.h renamed to wildmat/include/wildmat/wildmat.h

@@ -36,7 +36,7 @@
 **  on.
 */
 
-#include "util/wildmat.h"
+#include "wildmat/wildmat.h"
 
     // What character marks an inverted character class?
 #define NEGATE_CLASS            '^'