[FIX] : add test case for a crash for particulur compareason case in …

…Natural Sorting
aiekick · Jul 7, 2024 · 797cbb8 · 797cbb8
1 parent 64a3d01
commit 797cbb8
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 3 deletions.
diff --git a/ImGuiFileDialog b/ImGuiFileDialog
diff --git a/mainWinLinuxMacos.cpp b/mainWinLinuxMacos.cpp
@@ -64,7 +64,7 @@ int main(int, char**) {
     if (!glfwInit()) return 1;
 
         // Decide GL+GLSL versions
-#if APPLE
+#ifdef __APPLE__
     // GL 3.2 + GLSL 150
     const char* glsl_version = "#version 150";
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);

diff --git a/samples/natural_sorting/-FILES.txt b/samples/natural_sorting/-FILES.txt
diff --git a/samples/natural_sorting/lesauxvi/file1.txt b/samples/natural_sorting/lesauxvi/file1.txt
diff --git a/samples/natural_sorting/lesauxvi/file11.txt b/samples/natural_sorting/lesauxvi/file11.txt
diff --git a/samples/natural_sorting/lesauxvi/file2.txt b/samples/natural_sorting/lesauxvi/file2.txt
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -178,3 +178,4 @@ SetTest(Test_IGFD_Utils_NaturalCompare_0)
 SetTest(Test_IGFD_Utils_NaturalCompare_1)
 SetTest(Test_IGFD_Utils_NaturalCompare_2)
 SetTest(Test_IGFD_Utils_NaturalCompare_3)
+SetTest(Test_IGFD_Utils_NaturalCompare_4)
diff --git a/tests/ImGuiFileDialog/Test_Utils.cpp b/tests/ImGuiFileDialog/Test_Utils.cpp
@@ -489,6 +489,40 @@ bool Test_IGFD_Utils_NaturalCompare_3() {
     return true;
 };
 
+// natural sort : a crash occured is std::sort where a is filedialog_1 and b is filedialog
+bool Test_IGFD_Utils_NaturalCompare_4() {
+    static constexpr size_t s_count_items           = 16U;
+    std::array<std::string, s_count_items> bad_sort =  //
+        {
+            "filed",         //
+            "file",          //
+            "filedialog_1",  //
+            "filedialog",    //
+            "filedialog_2",  //
+        };
+
+    std::sort(bad_sort.begin(), bad_sort.end(),                         //
+              [](const std::string& a, const std::string& b) -> bool {  //
+                  return IGFD::Utils::NaturalCompare(a, b, true, false);
+              });
+
+    std::array<std::string, s_count_items> good_sort =  //
+        {
+            "file",          //
+            "filed",         //
+            "filedialog",    //
+            "filedialog_1",  //
+            "filedialog_2",  //
+        };
+
+    for (size_t idx = 0; idx < s_count_items; ++idx) {
+        if (good_sort.at(idx) != bad_sort.at(idx)) {
+            return false;
+        }
+    }
+    return true;
+};
+
 ////////////////////////////////////////////////////////////////////////////
 //// ENTRY POINT ///////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////
@@ -524,6 +558,7 @@ bool Test_Utils(const std::string& vTest) {
     else IfTestExist(Test_IGFD_Utils_NaturalCompare_1);
     else IfTestExist(Test_IGFD_Utils_NaturalCompare_2);
     else IfTestExist(Test_IGFD_Utils_NaturalCompare_3);
+    else IfTestExist(Test_IGFD_Utils_NaturalCompare_4);
 
     assert(0);
 

diff --git a/tests/main.cpp b/tests/main.cpp
@@ -29,7 +29,7 @@ int main(int argc, char** argv) {
         return Test_ImGuiFileDialog(argv[1]) ? 0 : 1;
     }
 
-    return Test_ImGuiFileDialog("Test_IGFD_Utils_ExtractNumFromStringAtPos_2") ? 0 : 1;
+    return Test_ImGuiFileDialog("Test_IGFD_Utils_NaturalCompare_4") ? 0 : 1;
 
     return 0;
 }