Skip to content

Commit

Permalink
Remove unused TempDirectoryPolicy
Browse files Browse the repository at this point in the history
  • Loading branch information
rikyoz committed Dec 4, 2023
1 parent 78999dc commit a1242dd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
10 changes: 5 additions & 5 deletions tests/src/utils/filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,11 @@ auto create_temp_directory( const std::string& name ) -> fs::path {
return tempDir;
}

TempDirectory::TempDirectory( const std::string& dirName, TempDirectoryPolicy policy )
: mDirectory{ create_temp_directory( dirName + "_" + random_test_id() ) }, mPolicy{ policy } {}
TempDirectory::TempDirectory( const std::string& dirName )
: mDirectory{ create_temp_directory( dirName + "_" + random_test_id() ) } {}

TempDirectory::~TempDirectory() {
if ( mPolicy == TempDirectoryPolicy::CleanupOnExit && fs::is_empty( mDirectory ) ) {
if ( fs::is_empty( mDirectory ) ) {
fs::remove( mDirectory );
}
}
Expand All @@ -301,8 +301,8 @@ auto TempDirectory::path() -> const fs::path& {
return mDirectory;
}

TempTestDirectory::TempTestDirectory( const std::string& dirName, TempDirectoryPolicy policy )
: TempDirectory{ dirName, policy }, TestDirectory{ path() } {}
TempTestDirectory::TempTestDirectory( const std::string& dirName )
: TempDirectory{ dirName }, TestDirectory{ path() } {}

} // namespace filesystem
} // namespace test
Expand Down
12 changes: 2 additions & 10 deletions tests/src/utils/filesystem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,9 @@ class TestDirectory {
fs::path mOldCurrentDirectory;
};

enum struct TempDirectoryPolicy : std::uint8_t {
CleanupOnExit,
KeepOnExit
};

class TempDirectory {
public:
explicit TempDirectory( const std::string& dirName,
TempDirectoryPolicy policy = TempDirectoryPolicy::CleanupOnExit );
explicit TempDirectory( const std::string& dirName );

explicit TempDirectory( const TempDirectory& ) = delete;

Expand All @@ -183,12 +177,10 @@ class TempDirectory {

private:
fs::path mDirectory;
TempDirectoryPolicy mPolicy;
};

struct TempTestDirectory : TempDirectory, TestDirectory {
explicit TempTestDirectory( const std::string& dirName,
TempDirectoryPolicy policy = TempDirectoryPolicy::CleanupOnExit );
explicit TempTestDirectory( const std::string& dirName );
};

#endif
Expand Down

0 comments on commit a1242dd

Please sign in to comment.