Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Don't clear pathnames in vfs::GetPathnames so it can be called several times.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D1914
This was SVN commit r22312.
This commit is contained in:
wraitii 2019-05-28 10:18:04 +00:00
parent 899714f667
commit e2233a4a90
2 changed files with 96 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
source/lib/file/vfs/tests/test_vfs_util.h Executable file
View File

@ -0,0 +1,95 @@
/* Copyright (C) 2019 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "lib/self_test.h"
#include "lib/file/vfs/vfs_util.h"
#include "lib/file/file_system.h"
#include "lib/os_path.h"
static OsPath MOD_PATH(DataDir()/"mods"/"_test.vfs");
static OsPath CACHE_PATH(DataDir()/"_testcache");
extern PIVFS g_VFS;
class TestVfsUtil : public CxxTest::TestSuite
{
void initVfs()
{
// Initialise VFS:
// Make sure the required directories doesn't exist when we start,
// in case the previous test aborted and left them full of junk
if(DirectoryExists(MOD_PATH))
DeleteDirectory(MOD_PATH);
if(DirectoryExists(CACHE_PATH))
DeleteDirectory(CACHE_PATH);
g_VFS = CreateVfs();
TS_ASSERT_OK(g_VFS->Mount(L"", MOD_PATH));
// Mount _testcache onto virtual /cache - don't use the normal cache
// directory because that's full of loads of cached files from the
// proper game and takes a long time to load.
TS_ASSERT_OK(g_VFS->Mount(L"cache/", CACHE_PATH));
}
void deinitVfs()
{
g_VFS.reset();
DeleteDirectory(MOD_PATH);
DeleteDirectory(CACHE_PATH);
}
public:
void setUp()
{
initVfs();
}
void tearDown()
{
deinitVfs();
}
void test_getPathnames()
{
std::shared_ptr<u8> nodata(new u8);
g_VFS->CreateFile("test_file.txt", nodata, 0);
g_VFS->CreateFile("test_file2.txt", nodata, 0);
g_VFS->CreateFile("test_file3.txt", nodata, 0);
g_VFS->CreateFile("test_file2.not_txt", nodata, 0);
g_VFS->CreateFile("sub_folder_a/sub_test_file1.txt", nodata, 0);
g_VFS->CreateFile("sub_folder_a/sub_test_file2.txt", nodata, 0);
g_VFS->CreateFile("sub_folder_b/sub_test_file1.txt", nodata, 0);
g_VFS->CreateFile("sub_folder_b/another_file.not_txt", nodata, 0);
VfsPaths pathNames;
vfs::GetPathnames(g_VFS, "", L"*.txt", pathNames);
TS_ASSERT_EQUALS(pathNames.size(), 3);
vfs::GetPathnames(g_VFS, "sub_folder_a/", L"*.txt", pathNames);
TS_ASSERT_EQUALS(pathNames.size(), 5);
vfs::GetPathnames(g_VFS, "sub_folder_b/", L"*.txt", pathNames);
TS_ASSERT_EQUALS(pathNames.size(), 6);
};
};

3
source/lib/file/vfs/vfs_util.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -43,7 +43,6 @@ Status GetPathnames(const PIVFS& fs, const VfsPath& path, const wchar_t* filter,
std::vector<CFileInfo> files;
RETURN_STATUS_IF_ERR(fs->GetDirectoryEntries(path, &files, 0));
pathnames.clear();
pathnames.reserve(files.size());
for(size_t i = 0; i < files.size(); i++)