cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use native CATCH macros in wxDir unit test

Browse Source 
They provide more information than CppUnit-compatibility ones.
This commit is contained in:
Vadim Zeitlin 2021-08-22 21:35:14 +02:00
parent 3e9d66f925
commit 683dfcdfae
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/file/dir.cpp
View File

@ -78,7 +78,7 @@ wxArrayString DirTestCase::DirEnumHelper(wxDir& dir,
const wxString& filespec)
{
wxArrayString ret;
CPPUNIT_ASSERT( dir.IsOpened() );
CHECK( dir.IsOpened() );
wxString filename;
bool cont = dir.GetFirst(&filename, filespec, flags);
@ -98,28 +98,28 @@ wxArrayString DirTestCase::DirEnumHelper(wxDir& dir,
TEST_CASE_METHOD(DirTestCase, "Dir::Enum", "[dir]")
{
wxDir dir(DIRTEST_FOLDER);
CPPUNIT_ASSERT( dir.IsOpened() );
CHECK( dir.IsOpened() );
// enumerating everything in test directory
CPPUNIT_ASSERT_EQUAL(4, DirEnumHelper(dir).size());
CHECK( DirEnumHelper(dir).size() == 4 );
// enumerating really everything in test directory recursively
CPPUNIT_ASSERT_EQUAL(6, DirEnumHelper(dir, wxDIR_DEFAULT | wxDIR_DOTDOT).size());
CHECK( DirEnumHelper(dir, wxDIR_DEFAULT | wxDIR_DOTDOT).size() == 6 );
// enumerating object files in test directory
CPPUNIT_ASSERT_EQUAL(0, DirEnumHelper(dir, wxDIR_DEFAULT, "*.o*").size());
CHECK( DirEnumHelper(dir, wxDIR_DEFAULT, "*.o*").size() == 0 );
// enumerating directories in test directory
CPPUNIT_ASSERT_EQUAL(3, DirEnumHelper(dir, wxDIR_DIRS).size());
CHECK( DirEnumHelper(dir, wxDIR_DIRS).size() == 3 );
// enumerating files in test directory
CPPUNIT_ASSERT_EQUAL(1, DirEnumHelper(dir, wxDIR_FILES).size());
CHECK( DirEnumHelper(dir, wxDIR_FILES).size() == 1 );
// enumerating files including hidden in test directory
CPPUNIT_ASSERT_EQUAL(1, DirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN).size());
CHECK( DirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN).size() == 1 );
// enumerating files and folders in test directory
CPPUNIT_ASSERT_EQUAL(4, DirEnumHelper(dir, wxDIR_FILES | wxDIR_DIRS).size());
CHECK( DirEnumHelper(dir, wxDIR_FILES | wxDIR_DIRS).size() == 4 );
}
class TestDirTraverser : public wxDirTraverser
@ -143,16 +143,16 @@ TEST_CASE_METHOD(DirTestCase, "Dir::Traverse", "[dir]")
{
// enum all files
wxArrayString files;
CPPUNIT_ASSERT_EQUAL(4, wxDir::GetAllFiles(DIRTEST_FOLDER, &files));
CHECK( wxDir::GetAllFiles(DIRTEST_FOLDER, &files) == 4 );
// enum all files according to the filter
CPPUNIT_ASSERT_EQUAL(1, wxDir::GetAllFiles(DIRTEST_FOLDER, &files, "*.foo"));
CHECK( wxDir::GetAllFiles(DIRTEST_FOLDER, &files, "*.foo") == 1 );
// enum again with custom traverser
wxDir dir(DIRTEST_FOLDER);
TestDirTraverser traverser;
dir.Traverse(traverser, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN);
CPPUNIT_ASSERT_EQUAL(6, traverser.dirs.size());
CHECK( traverser.dirs.size() == 6 );
}
TEST_CASE_METHOD(DirTestCase, "Dir::Exists", "[dir]")
@ -205,29 +205,30 @@ TEST_CASE_METHOD(DirTestCase, "Dir::Exists", "[dir]")
dirname.Replace("$MSW_DRIVE", homedrive);
#endif // __WINDOWS__
std::string errDesc = wxString::Format("failed on directory '%s'", dirname).ToStdString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(errDesc, testData[n].shouldExist, wxDir::Exists(dirname));
const bool shouldExist = testData[n].shouldExist;
INFO("Directory " << dirname << ", should exist: " << shouldExist);
CHECK( wxDir::Exists(dirname) == shouldExist );
wxDir d(dirname);
CPPUNIT_ASSERT_EQUAL(testData[n].shouldExist, d.IsOpened());
CHECK( d.IsOpened() == shouldExist );
}
CPPUNIT_ASSERT( wxDir::Exists(wxGetCwd()) );
CHECK( wxDir::Exists(wxGetCwd()) );
}
TEST_CASE_METHOD(DirTestCase, "Dir::GetName", "[dir]")
{
wxDir d;
CPPUNIT_ASSERT( d.Open(".") );
CPPUNIT_ASSERT( d.GetName().Last() != wxFILE_SEP_PATH );
CPPUNIT_ASSERT( d.GetNameWithSep().Last() == wxFILE_SEP_PATH );
CPPUNIT_ASSERT_EQUAL( d.GetName() + wxFILE_SEP_PATH,
d.GetNameWithSep() );
CHECK( d.Open(".") );
CHECK( d.GetName().Last() != wxFILE_SEP_PATH );
CHECK( d.GetNameWithSep().Last() == wxFILE_SEP_PATH );
CHECK( d.GetNameWithSep() == d.GetName() + wxFILE_SEP_PATH );
#ifdef __UNIX__
CPPUNIT_ASSERT( d.Open("/") );
CPPUNIT_ASSERT_EQUAL( "/", d.GetName() );
CPPUNIT_ASSERT_EQUAL( "/", d.GetNameWithSep() );
CHECK( d.Open("/") );
CHECK( d.GetName() == "/" );
CHECK( d.GetNameWithSep() == "/" );
#endif
}