smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix running libpbd unit tests when $TOP(in test scripts) is set as relative path

Browse source 
Add test for PBD::canonical_path that was used to track down silly mistake
in test code
This commit is contained in:
Tim Mayberry 2014-12-02 20:40:50 +07:00
parent dd976d8c7a
commit 0ec85a4164
2 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libs/pbd/test/filesystem_test.cc
View file

@ -10,6 +10,7 @@
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "pbd/pathexpand.h"
#include "test_common.h" #include "test_common.h"
@ -23,6 +24,8 @@ FilesystemTest::testPathIsWithin ()
{ {
#ifndef PLATFORM_WINDOWS #ifndef PLATFORM_WINDOWS
string output_path = test_output_directory ("testPathIsWithin"); string output_path = test_output_directory ("testPathIsWithin");
string orig_path = Glib::get_current_dir ();
CPPUNIT_ASSERT (g_chdir (output_path.c_str()) == 0); CPPUNIT_ASSERT (g_chdir (output_path.c_str()) == 0);
CPPUNIT_ASSERT (g_mkdir_with_parents ("foo/bar/baz", 0755) == 0); CPPUNIT_ASSERT (g_mkdir_with_parents ("foo/bar/baz", 0755) == 0);
@ -45,6 +48,7 @@ FilesystemTest::testPathIsWithin ()
CPPUNIT_ASSERT (PBD::path_is_within ("foo/bar", "foo/bar")); CPPUNIT_ASSERT (PBD::path_is_within ("foo/bar", "foo/bar"));
CPPUNIT_ASSERT (PBD::path_is_within ("foo/jim/baz", "frobozz") == false); CPPUNIT_ASSERT (PBD::path_is_within ("foo/jim/baz", "frobozz") == false);
CPPUNIT_ASSERT (g_chdir (orig_path.c_str()) == 0);
#endif #endif
} }
@ -205,3 +209,33 @@ FilesystemTest::testRemoveDirectory ()
CPPUNIT_ASSERT (files_in_output_dir.size () == 0); CPPUNIT_ASSERT (files_in_output_dir.size () == 0);
} }
void
FilesystemTest::testCanonicalPath ()
{
#ifndef PLATFORM_WINDOWS
string top_dir = test_output_directory ("testCanonicalPath");
string orig_path = Glib::get_current_dir ();
CPPUNIT_ASSERT (g_chdir (top_dir.c_str()) == 0);
string pwd = Glib::get_current_dir ();
CPPUNIT_ASSERT (!pwd.empty());
CPPUNIT_ASSERT (pwd == top_dir);
CPPUNIT_ASSERT (g_mkdir ("gtk2_ardour", 0755) == 0);
CPPUNIT_ASSERT (g_mkdir_with_parents ("libs/pbd/test", 0755) == 0);
const char* relative_path = "./gtk2_ardour/../libs/pbd/test";
string canonical_path = PBD::canonical_path (relative_path);
// no expansion expected in this case
string expanded_path = PBD::path_expand (relative_path);
string expected_path = top_dir + string("/libs/pbd/test");
CPPUNIT_ASSERT (canonical_path == expected_path);
CPPUNIT_ASSERT (expanded_path == expected_path);
CPPUNIT_ASSERT (g_chdir (orig_path.c_str()) == 0);
#endif
}

2
libs/pbd/test/filesystem_test.h
View file

@ -10,6 +10,7 @@ class FilesystemTest : public CppUnit::TestFixture
CPPUNIT_TEST (testFindFilesMatchingPattern); CPPUNIT_TEST (testFindFilesMatchingPattern);
CPPUNIT_TEST (testClearDirectory); CPPUNIT_TEST (testClearDirectory);
CPPUNIT_TEST (testRemoveDirectory); CPPUNIT_TEST (testRemoveDirectory);
CPPUNIT_TEST (testCanonicalPath);
CPPUNIT_TEST_SUITE_END (); CPPUNIT_TEST_SUITE_END ();
public: public:
@ -19,5 +20,6 @@ public:
void testFindFilesMatchingPattern (); void testFindFilesMatchingPattern ();
void testClearDirectory (); void testClearDirectory ();
void testRemoveDirectory (); void testRemoveDirectory ();
void testCanonicalPath ();
}; };