Skip to content

ARROW-15055: [C++] Refactor GcsFileSystem tests #11953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
coryan wants to merge 1 commit into from
Closed

ARROW-15055: [C++] Refactor GcsFileSystem tests #11953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 10 additions & 49 deletions cpp/src/arrow/filesystem/gcsfs_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,66 +580,27 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
const char* const kTestFolders[] = {
"a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
};
for (auto const* f : kTestFolders) {
const auto folder = PreexistingBucketPath() + f;
ASSERT_OK(fs->CreateDir(folder, true));
for (int i = 0; i != 64; ++i) {
const auto filename = folder + "test-file-" + std::to_string(i);
ASSERT_OK_AND_ASSIGN(auto w, fs->OpenOutputStream(filename, {}));
ASSERT_OK(w->Write(filename.data(), filename.size()));
ASSERT_OK(w->Close());
}
}
ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));

ASSERT_OK(fs->DeleteDir(PreexistingBucketPath() + kTestFolders[0]));
ASSERT_OK(fs->DeleteDir(hierarchy.base_dir));
arrow::fs::AssertFileInfo(fs.get(), PreexistingBucketPath(), FileType::Directory);
arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);

for (auto const* f : kTestFolders) {
const auto folder = PreexistingBucketPath() + f;
arrow::fs::AssertFileInfo(fs.get(), folder, FileType::NotFound);
for (int i = 0; i != 64; ++i) {
const auto filename = folder + "test-file-" + std::to_string(i);
arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
for (auto const& info : hierarchy.contents) {
arrow::fs::AssertFileInfo(fs.get(), info.path(), FileType::NotFound);
}
}

TEST_F(GcsIntegrationTest, DeleteDirContentsSuccess) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
const char* const kTestFolders[] = {
"a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
};
for (auto const* f : kTestFolders) {
const auto folder = PreexistingBucketPath() + f;
ASSERT_OK(fs->CreateDir(folder, true));
for (int i = 0; i != 64; ++i) {
const auto filename = folder + "test-file-" + std::to_string(i);
ASSERT_OK_AND_ASSIGN(auto w, fs->OpenOutputStream(filename, {}));
ASSERT_OK(w->Write(filename.data(), filename.size()));
ASSERT_OK(w->Close());
}
}
ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));

const auto folder = PreexistingBucketPath() + kTestFolders[0];
ASSERT_OK(fs->DeleteDirContents(folder));
arrow::fs::AssertFileInfo(fs.get(), folder, FileType::Directory);
ASSERT_OK(fs->DeleteDirContents(hierarchy.base_dir));
arrow::fs::AssertFileInfo(fs.get(), hierarchy.base_dir, FileType::Directory);
arrow::fs::AssertFileInfo(fs.get(), PreexistingBucketPath(), FileType::Directory);
arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);

for (auto const* f : kTestFolders) {
const auto subfolder = PreexistingBucketPath() + f;
if (subfolder == folder) {
continue;
}
arrow::fs::AssertFileInfo(fs.get(), subfolder, FileType::NotFound);
for (int i = 0; i != 64; ++i) {
const auto filename = subfolder + "test-file-" + std::to_string(i);
arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
for (auto const& info : hierarchy.contents) {
if (info.path() == hierarchy.base_dir) continue;
arrow::fs::AssertFileInfo(fs.get(), info.path(), FileType::NotFound);
}
}

Expand Down