[ADD] : add CTest steps in github actions

[UPD] : Update var names in tests
aiekick · Nov 4, 2023 · 9431254 · 9431254
1 parent 63ef08f
commit 9431254
Show file tree

Hide file tree

Showing 8 changed files with 245 additions and 314 deletions.
diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -17,11 +17,14 @@ jobs:
     - name: Install OpenGL lib  / Requirement for Glfw3
       run : sudo apt-get update && sudo apt-get install libgl1-mesa-dev libx11-dev libxi-dev libxrandr-dev libxinerama-dev libxcursor-dev
     - name: configure
-      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
+      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_TEST=ON
     - name: build
       run: cmake --build build
+    - name: CTest
+      run: ctest --test-dir build --output-on-failure
     - name: upload artifact
       uses: actions/upload-artifact@v3
       with:
         name: ImGuiFileDialog
         path: build/ImGuiFileDialog
+
diff --git a/.github/workflows/Osx.yml b/.github/workflows/Osx.yml
@@ -17,9 +17,11 @@ jobs:
     - name: Install OpenGL lib  / Requirement for Glfw3
       run : brew update
     - name: configure
-      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
+      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_TEST=ON
     - name: build
       run: cmake --build build
+    - name: CTest
+      run: ctest --test-dir build --output-on-failure
     - name: upload artifact
       uses: actions/upload-artifact@v3
       with:

diff --git a/.github/workflows/Win.yml b/.github/workflows/Win.yml
@@ -15,9 +15,11 @@ jobs:
     - name: checkout submodules
       run : git submodule update --init --recursive 
     - name: configure
-      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
+      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_TEST=ON
     - name: build
       run: cmake --build build --config Release
+    - name: CTest
+      run: ctest --test-dir build --output-on-failure
     - name: upload artifact
       uses: actions/upload-artifact@v3
       with:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/ImGuiFileDialog b/ImGuiFileDialog
diff --git a/tests/ImGuiFileDialog/Test_FileManager.cpp b/tests/ImGuiFileDialog/Test_FileManager.cpp
@@ -13,7 +13,7 @@ class FileManagerTestHelper {
 
 private:
     void compute_name_array() {
-        for (const auto& file_ptr : fd.puFileManager.prFileList) {
+        for (const auto& file_ptr : fd.fileManager.m_FileList) {
             if (file_ptr) {
                 arr.emplace(file_ptr->fileNameExt);
             }
@@ -22,12 +22,12 @@ class FileManagerTestHelper {
 
 public:
     void addFilter(const std::string& vFilter) {
-        fd.puFilterManager.ParseFilters(vFilter.c_str());
-        fd.puFilterManager.SetSelectedFilterWithExt(vFilter);
+        fd.filterManager.ParseFilters(vFilter.c_str());
+        fd.filterManager.SetSelectedFilterWithExt(vFilter);
     }
 
     void addFile(const std::string& vFile) {
-        fd.puFileManager.AddFile(fd, ".", vFile, IGFD::FileType(IGFD::FileType::ContentType::File, false));
+        fd.fileManager.m_AddFile(fd, ".", vFile, IGFD::FileType(IGFD::FileType::ContentType::File, false));
     };
 
     void addFiles(const std::vector<std::string>& vFiles) {
@@ -44,11 +44,11 @@ class FileManagerTestHelper {
     }
 
     void useFlags(ImGuiFileDialogFlags vFlags) {
-        fd.puDLGflags = vFlags;
+        fd.dLGflags = vFlags;
     }
 
     IGFD::FilterInfos getSelectedFilter() const {
-        return fd.puFilterManager.GetSelectedFilter();
+        return fd.filterManager.GetSelectedFilter();
     }
 
     IGFD::FileDialogInternal& getFileDialogInternal() {

diff --git a/tests/ImGuiFileDialog/Test_FileStyle.cpp b/tests/ImGuiFileDialog/Test_FileStyle.cpp
@@ -22,8 +22,8 @@
 
 public:
     void addFilter(const std::string& vFilter) {
-        fd.puFilterManager.ParseFilters(vFilter.c_str());
-        fd.puFilterManager.SetSelectedFilterWithExt(vFilter);
+        fd.filterManager.ParseFilters(vFilter.c_str());
+        fd.filterManager.SetSelectedFilterWithExt(vFilter);
     }
 
     void addFile(const std::string& vFile) {
+1,151 −1,180		ImGuiFileDialog.cpp
+327 −344		ImGuiFileDialog.h