Skip to content

Commit 51a0238

Browse files
committed
fix tests
1 parent a7ac274 commit 51a0238

File tree

3 files changed

+399
-387
lines changed

3 files changed

+399
-387
lines changed

tests/ImGuiFileDialog/Test_FileManager.cpp

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
#pragma region Helper
1919

20-
class FileManagerTestHelper {
20+
namespace IGFD {
21+
22+
class TestFileManager {
2123
private:
2224
IGFD::FileDialogInternal fd;
2325
std::set<std::string> arr;
@@ -96,14 +98,15 @@ class FileManagerTestHelper {
9698
GetCurrentDir(buffer, 1024);
9799
return std::string(buffer);
98100
}
99-
};
101+
};
102+
} // namespace IGFD
100103

101104
#pragma endregion
102105

103106
#pragma region Filtering for .* patterns
104107

105108
bool Test_IGFD_FileManager_Filtering_asterisk_0() {
106-
FileManagerTestHelper mgr;
109+
IGFD::TestFileManager mgr;
107110
mgr.addFilter(".*");
108111
mgr.addFiles({"toto.a", "toto.b","titi.c"});
109112

@@ -115,7 +118,7 @@ bool Test_IGFD_FileManager_Filtering_asterisk_0() {
115118
}
116119

117120
bool Test_IGFD_FileManager_Filtering_asterisk_1() {
118-
FileManagerTestHelper mgr;
121+
IGFD::TestFileManager mgr;
119122
mgr.addFilter(".*.*");
120123
mgr.addFiles({"toto.a.b", "toto.b.c", "titi.c"});
121124

@@ -127,7 +130,7 @@ bool Test_IGFD_FileManager_Filtering_asterisk_1() {
127130
}
128131

129132
bool Test_IGFD_FileManager_Filtering_asterisk_2() {
130-
FileManagerTestHelper mgr;
133+
IGFD::TestFileManager mgr;
131134
mgr.addFilter(".a.*");
132135
mgr.addFiles({"toto.a.b", "toto.b.c", "titi.a.c"});
133136

@@ -139,7 +142,7 @@ bool Test_IGFD_FileManager_Filtering_asterisk_2() {
139142
}
140143

141144
bool Test_IGFD_FileManager_Filtering_asterisk_3() {
142-
FileManagerTestHelper mgr;
145+
IGFD::TestFileManager mgr;
143146
mgr.addFilter(".*.b");
144147
mgr.addFiles({"toto.a.b", "toto.c.b", "titi.a.bb"});
145148

@@ -155,7 +158,7 @@ bool Test_IGFD_FileManager_Filtering_asterisk_3() {
155158
#pragma region Filtering Divers
156159

157160
bool Test_IGFD_FileManager_Filtering_divers_0() {
158-
FileManagerTestHelper mgr;
161+
IGFD::TestFileManager mgr;
159162
mgr.addFilter(".a.b");
160163
mgr.addFiles({"toto.a.b", "toto.b.c", "titi.a.c"});
161164

@@ -167,7 +170,7 @@ bool Test_IGFD_FileManager_Filtering_divers_0() {
167170
}
168171

169172
bool Test_IGFD_FileManager_Filtering_divers_1() {
170-
FileManagerTestHelper mgr;
173+
IGFD::TestFileManager mgr;
171174
mgr.addFilter("{.filters, .a.b}");
172175
mgr.addFiles({"toto.a.filters", "titi.a.b", "toto.c.a.b", "tata.t.o", "toto.filters"});
173176

@@ -181,7 +184,7 @@ bool Test_IGFD_FileManager_Filtering_divers_1() {
181184
}
182185

183186
bool Test_IGFD_FileManager_Filtering_divers_2() {
184-
FileManagerTestHelper mgr;
187+
IGFD::TestFileManager mgr;
185188
mgr.addFilter("Shader files{.glsl,.comp,.vert,.frag}");
186189
mgr.addFiles({"toto.comp", "titi.vert", "toto.frag", "tata.glsl"});
187190

@@ -200,7 +203,7 @@ bool Test_IGFD_FileManager_Filtering_divers_2() {
200203

201204
// issue #140
202205
bool Test_IGFD_FileManager_Filtering_sensitive_case_0() {
203-
FileManagerTestHelper mgr;
206+
IGFD::TestFileManager mgr;
204207
mgr.addFilter(".cpp");
205208
mgr.addFiles({"toto.cpp", "titi.CPP"});
206209

@@ -212,7 +215,7 @@ bool Test_IGFD_FileManager_Filtering_sensitive_case_0() {
212215

213216
// issue #140
214217
bool Test_IGFD_FileManager_Filtering_sensitive_case_1() {
215-
FileManagerTestHelper mgr;
218+
IGFD::TestFileManager mgr;
216219
mgr.addFilter(".CPP");
217220
mgr.addFiles({"toto.cpp", "titi.CPP"});
218221

@@ -224,7 +227,7 @@ bool Test_IGFD_FileManager_Filtering_sensitive_case_1() {
224227

225228
// issue #140
226229
bool Test_IGFD_FileManager_Filtering_insensitive_case_0() {
227-
FileManagerTestHelper mgr;
230+
IGFD::TestFileManager mgr;
228231
mgr.useFlags(ImGuiFileDialogFlags_CaseInsensitiveExtentionFiltering);
229232
mgr.addFilter(".cpp");
230233
mgr.addFiles({"toto.cpp", "titi.CPP"});
@@ -237,7 +240,7 @@ bool Test_IGFD_FileManager_Filtering_insensitive_case_0() {
237240

238241
// issue #140
239242
bool Test_IGFD_FileManager_Filtering_insensitive_case_1() {
240-
FileManagerTestHelper mgr;
243+
IGFD::TestFileManager mgr;
241244
mgr.useFlags(ImGuiFileDialogFlags_CaseInsensitiveExtentionFiltering);
242245
mgr.addFilter(".CPP");
243246
mgr.addFiles({"toto.cpp", "titi.CPP"});
@@ -272,7 +275,7 @@ bool Test_IGFD_FileManager_FileInfos_SearchForExts_0() {
272275

273276
// ensure #144
274277
bool Test_IGFD_FileManager_GetResultingFilePathName_issue_144() {
275-
FileManagerTestHelper mgr;
278+
IGFD::TestFileManager mgr;
276279
auto& fd = mgr.getFileDialogInternal();
277280
mgr.setInput("toto.cpp");
278281
if (fd.fileManager.GetResultingFileName(fd, IGFD_ResultMode_AddIfNoFileExt) != "toto.cpp") return false;
@@ -286,7 +289,7 @@ bool Test_IGFD_FileManager_GetResultingFilePathName_issue_144() {
286289

287290
// ensure #184
288291
bool Test_IGFD_FileManager_GetResultingFilePathName_issue_184() {
289-
FileManagerTestHelper mgr;
292+
IGFD::TestFileManager mgr;
290293
auto& fd = mgr.getFileDialogInternal();
291294
mgr.setInput("toto.cpp");
292295
if (fd.fileManager.GetResultingFileName(fd, IGFD_ResultMode_AddIfNoFileExt) != "toto.cpp") return false;

0 commit comments

Comments
 (0)