TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix files.cc.

Browse Source 
PiperOrigin-RevId: 764926334
This commit is contained in:
Francis Tsui
2025-05-29 16:17:09 -07:00
committed by Copybara-Service
parent 20fcca4e95
commit 09cdc14fb6
21 changed files with 193 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/nearby_connections_manager_impl_test.cc
+12 -12
View File
@@ -388,7 +388,7 @@ class NearbyConnectionsManagerImplTest : public testing::Test {
const std::vector<uint8_t> expected_payload(std::begin(kPayload),
std::end(kPayload));
FilePath file = GetTemporaryDirectory()->append(FilePath("file.jpg"));
FilePath file = Files::GetTemporaryDirectory().append(FilePath("file.jpg"));
InitializeTemporaryFile(file);
absl::Notification notification;
@@ -1403,8 +1403,8 @@ TEST_F(NearbyConnectionsManagerImplTest,
nearby_connections_manager_->RegisterPayloadStatusListener(
kPayloadId3, payload_listener->GetWeakPtr());
FilePath file1 = GetTemporaryDirectory()->append(FilePath("file1.jpg"));
FilePath file2 = GetTemporaryDirectory()->append(FilePath("file2.jpg"));
FilePath file1 = Files::GetTemporaryDirectory().append(FilePath("file1.jpg"));
FilePath file2 = Files::GetTemporaryDirectory().append(FilePath("file2.jpg"));
InitializeTemporaryFile(file1);
InitializeTemporaryFile(file2);
@@ -1519,7 +1519,7 @@ TEST_F(NearbyConnectionsManagerImplTest, IncomingFilePayload) {
const std::vector<uint8_t> expected_payload(std::begin(kPayload),
std::end(kPayload));
FilePath file = GetTemporaryDirectory()->append(FilePath("file.jpg"));
FilePath file = Files::GetTemporaryDirectory().append(FilePath("file.jpg"));
InitializeTemporaryFile(file);
payload_listener_remote.payload_cb(
@@ -1569,7 +1569,7 @@ TEST_F(NearbyConnectionsManagerImplTest, ClearIncomingPayloads) {
nearby_connections_manager_->RegisterPayloadStatusListener(
kPayloadId, payload_listener->GetWeakPtr());
FilePath file = GetTemporaryDirectory()->append(FilePath("file.jpg"));
FilePath file = Files::GetTemporaryDirectory().append(FilePath("file.jpg"));
InitializeTemporaryFile(file);
payload_listener_remote.payload_cb(
@@ -1848,7 +1848,7 @@ TEST_F(NearbyConnectionsManagerImplTest,
ASSERT_TRUE(OnIncomingConnection(connection_listener_remote,
incoming_connection_listener,
payload_listener_remote) != nullptr);
FilePath file = GetTemporaryDirectory()->append(FilePath("file.jpg"));
FilePath file = Files::GetTemporaryDirectory().append(FilePath("file.jpg"));
payload_listener_remote.payload_cb(
kRemoteEndpointId, Payload(kPayloadId, InputFile(file.ToString())));
@@ -1881,7 +1881,7 @@ TEST_F(NearbyConnectionsManagerImplTest, OnPayloadReceivedForUnknownFile) {
ASSERT_TRUE(OnIncomingConnection(connection_listener_remote,
incoming_connection_listener,
payload_listener_remote) != nullptr);
FilePath file = GetTemporaryDirectory()->append(FilePath("file.jpg"));
FilePath file = Files::GetTemporaryDirectory().append(FilePath("file.jpg"));
payload_listener_remote.payload_cb(
kRemoteEndpointId, Payload(kPayloadId, InputFile(file.ToString())));
@@ -1895,7 +1895,7 @@ TEST_F(NearbyConnectionsManagerImplTest, OnPayloadReceivedForUnknownFile) {
nearby_connections_manager_->OnPayloadReceivedForTesting(kRemoteEndpointId,
payload);
FilePath file2 = GetTemporaryDirectory()->append(FilePath("file2.jpg"));
FilePath file2 = Files::GetTemporaryDirectory().append(FilePath("file2.jpg"));
Payload payload2(kPayloadId, InputFile(file2.ToString()));
nearby_connections_manager_->OnPayloadReceivedForTesting(kRemoteEndpointId,
payload2);
@@ -1908,7 +1908,7 @@ TEST_F(NearbyConnectionsManagerImplTest, OnPayloadReceivedForUnknownFile) {
std::make_shared<testing::NiceMock<MockPayloadStatusListener>>();
nearby_connections_manager_->RegisterPayloadStatusListener(
kPayloadId, payload_listener->GetWeakPtr());
FilePath file3 = GetTemporaryDirectory()->append(FilePath("file3.jpg"));
FilePath file3 = Files::GetTemporaryDirectory().append(FilePath("file3.jpg"));
Payload payload3(kPayloadId, InputFile(file3.ToString()));
nearby_connections_manager_->OnPayloadReceivedForTesting(kRemoteEndpointId,
payload3);
@@ -1939,7 +1939,7 @@ TEST_F(NearbyConnectionsManagerImplTest,
nearby_connections_manager_->RegisterPayloadStatusListener(
kPayloadId, payload_listener->GetWeakPtr());
FilePath file = GetTemporaryDirectory()->append(FilePath("file.jpg"));
FilePath file = Files::GetTemporaryDirectory().append(FilePath("file.jpg"));
Payload payload(kPayloadId, InputFile(file.ToString()));
nearby_connections_manager_->OnPayloadReceivedForTesting(kRemoteEndpointId,
@@ -1970,7 +1970,7 @@ TEST_F(NearbyConnectionsManagerImplTest,
payload_notification.Notify();
});
FilePath file2 = GetTemporaryDirectory()->append(FilePath("file2.jpg"));
FilePath file2 = Files::GetTemporaryDirectory().append(FilePath("file2.jpg"));
Payload payload2(kPayloadId, InputFile(file2.ToString()));
nearby_connections_manager_->OnPayloadReceivedForTesting(kRemoteEndpointId,
payload2);
@@ -1985,7 +1985,7 @@ TEST_F(NearbyConnectionsManagerImplTest,
}
TEST_F(NearbyConnectionsManagerImplTest, ProcessUnknownFilePathsToDelete) {
FilePath file = GetTemporaryDirectory()->append(FilePath("file.jpg"));
FilePath file = Files::GetTemporaryDirectory().append(FilePath("file.jpg"));
nearby_connections_manager_->ProcessUnknownFilePathsToDeleteForTesting(
PayloadStatus::kCanceled, PayloadContent::Type::kFile, file);
absl::flat_hash_set<FilePath> unknown_file_paths =
sharing/nearby_connections_types.h
+2 -2
View File
@@ -413,7 +413,7 @@ struct Payload {
id = std::hash<std::string>()(file.path.ToString());
content.type = PayloadContent::Type::kFile;
std::optional<uintmax_t> size = GetFileSize(file.path.GetPath());
std::optional<uintmax_t> size = Files::GetFileSize(file.path);
if (size.has_value()) {
content.file_payload.size = *size;
}
@@ -431,7 +431,7 @@ struct Payload {
absl::string_view parent_folder = absl::string_view())
: id(id) {
content.type = PayloadContent::Type::kFile;
std::optional<uintmax_t> size = GetFileSize(file.path.GetPath());
std::optional<uintmax_t> size = Files::GetFileSize(file.path);
if (size.has_value()) {
content.file_payload.size = *size;
}
sharing/nearby_file_handler.cc
+4 -4
View File
@@ -42,7 +42,7 @@ std::vector<NearbyFileHandler::FileInfo> DoOpenFiles(
absl::Span<const FilePath> file_paths) {
std::vector<NearbyFileHandler::FileInfo> files;
for (const auto& file_path : file_paths) {
std::optional<uintmax_t> size = GetFileSize(file_path.GetPath());
std::optional<uintmax_t> size = Files::GetFileSize(file_path);
if (!size.has_value()) {
LOG(ERROR) << __func__
<< ": Failed to open file. File=" << file_path.ToString();
@@ -78,16 +78,16 @@ void NearbyFileHandler::DeleteFilesFromDisk(
// wait 1 second to make the file being released from another process.
absl::SleepFor(absl::Seconds(1));
for (const auto& file_path : file_paths) {
if (!FileExists(file_path.GetPath())) {
if (!Files::FileExists(file_path)) {
continue;
}
if (RemoveFile(file_path.GetPath())) {
if (Files::RemoveFile(file_path)) {
VLOG(1) << __func__
<< ": Removed partial file. File=" << file_path.ToString();
} else {
// Try once more after 3 seconds.
absl::SleepFor(absl::Seconds(3));
if (RemoveFile(file_path.GetPath())) {
if (Files::RemoveFile(file_path)) {
VLOG(1) << __func__
<< ": Removed partial file after additional delay. File="
<< file_path.ToString();
sharing/nearby_file_handler_test.cc
+23 -23
View File
@@ -45,8 +45,8 @@ TEST(NearbyFileHandler, OpenFiles) {
NearbyFileHandler nearby_file_handler(mock_platform);
absl::Notification notification;
std::vector<NearbyFileHandler::FileInfo> result;
FilePath test_file =
GetTemporaryDirectory()->append(FilePath("nearby_nfh_test_abc.jpg"));
FilePath test_file = Files::GetTemporaryDirectory().append(
FilePath("nearby_nfh_test_abc.jpg"));
ASSERT_TRUE(CreateFile(test_file));
nearby_file_handler.OpenFiles(
@@ -58,61 +58,61 @@ TEST(NearbyFileHandler, OpenFiles) {
notification.WaitForNotificationWithTimeout(absl::Seconds(1));
EXPECT_EQ(result.size(), 1);
ASSERT_TRUE(RemoveFile(test_file.GetPath()));
ASSERT_TRUE(Files::RemoveFile(test_file));
}
TEST(NearbyFileHandler, DeleteAFileFromDisk) {
MockSharingPlatform mock_platform;
NearbyFileHandler nearby_file_handler(mock_platform);
FilePath test_file =
GetTemporaryDirectory()->append(FilePath("nearby_nfh_test_abc.jpg"));
FilePath test_file = Files::GetTemporaryDirectory().append(
FilePath("nearby_nfh_test_abc.jpg"));
ASSERT_TRUE(CreateFile(test_file));
std::vector<FilePath> file_paths;
file_paths.push_back(test_file);
nearby_file_handler.DeleteFilesFromDisk(file_paths, []() {});
ASSERT_TRUE(FileExists(test_file.GetPath()));
ASSERT_TRUE(Files::FileExists(test_file));
absl::SleepFor(absl::Seconds(2));
ASSERT_FALSE(FileExists(test_file.GetPath()));
ASSERT_FALSE(Files::FileExists(test_file));
}
TEST(NearbyFileHandler, DeleteMultipleFilesFromDisk) {
MockSharingPlatform mock_platform;
NearbyFileHandler nearby_file_handler(mock_platform);
FilePath test_file =
GetTemporaryDirectory()->append(FilePath("nearby_nfh_test_abc.jpg"));
FilePath test_file2 =
GetTemporaryDirectory()->append(FilePath("nearby_nfh_test_def.jpg"));
FilePath test_file3 =
GetTemporaryDirectory()->append(FilePath("nearby_nfh_test_ghi.jpg"));
FilePath test_file = Files::GetTemporaryDirectory().append(
FilePath("nearby_nfh_test_abc.jpg"));
FilePath test_file2 = Files::GetTemporaryDirectory().append(
FilePath("nearby_nfh_test_def.jpg"));
FilePath test_file3 = Files::GetTemporaryDirectory().append(
FilePath("nearby_nfh_test_ghi.jpg"));
std::vector<FilePath> file_paths;
file_paths = {test_file, test_file2, test_file3};
// Check it doesn't throw an exception.
nearby_file_handler.DeleteFilesFromDisk(file_paths, []() {});
ASSERT_FALSE(FileExists(test_file.GetPath()));
ASSERT_FALSE(FileExists(test_file2.GetPath()));
ASSERT_FALSE(FileExists(test_file3.GetPath()));
ASSERT_FALSE(Files::FileExists(test_file));
ASSERT_FALSE(Files::FileExists(test_file2));
ASSERT_FALSE(Files::FileExists(test_file3));
absl::SleepFor(absl::Seconds(2));
ASSERT_FALSE(FileExists(test_file.GetPath()));
ASSERT_FALSE(FileExists(test_file2.GetPath()));
ASSERT_FALSE(FileExists(test_file3.GetPath()));
ASSERT_FALSE(Files::FileExists(test_file));
ASSERT_FALSE(Files::FileExists(test_file2));
ASSERT_FALSE(Files::FileExists(test_file3));
}
TEST(NearbyFileHandler, TestCallback) {
MockSharingPlatform mock_platform;
std::atomic_bool received_callback = false;
NearbyFileHandler nearby_file_handler(mock_platform);
FilePath test_file =
GetTemporaryDirectory()->append(FilePath("nearby_nfh_test_abc.jpg"));
FilePath test_file = Files::GetTemporaryDirectory().append(
FilePath("nearby_nfh_test_abc.jpg"));
ASSERT_TRUE(CreateFile(test_file));
std::vector<FilePath> file_paths;
file_paths.push_back(test_file);
nearby_file_handler.DeleteFilesFromDisk(
file_paths, [&received_callback]() { received_callback = true; });
ASSERT_FALSE(received_callback);
ASSERT_TRUE(FileExists(test_file.GetPath()));
ASSERT_TRUE(Files::FileExists(test_file));
absl::SleepFor(absl::Seconds(2));
ASSERT_TRUE(received_callback);
ASSERT_FALSE(FileExists(test_file.GetPath()));
ASSERT_FALSE(Files::FileExists(test_file));
}
} // namespace
sharing/nearby_sharing_service_impl_test.cc
+6 -11
View File
@@ -128,12 +128,6 @@ using ::testing::UnorderedElementsAre;
constexpr absl::Duration kWaitTimeout = absl::Milliseconds(500);
constexpr absl::Duration kTaskWaitTimeout = absl::Seconds(2);
FilePath GetTempDir() {
std::optional<FilePath> temp_dir = nearby::sharing::GetTemporaryDirectory();
EXPECT_TRUE(temp_dir.has_value());
return temp_dir.value();
}
class MockTransferUpdateCallback : public TransferUpdateCallback {
public:
~MockTransferUpdateCallback() override = default;
@@ -270,7 +264,7 @@ constexpr absl::Duration kCertificateDownloadDuringDiscoveryPeriod =
std::unique_ptr<Payload> GetFilePayload(int64_t payload_id) {
FilePath path =
GetTemporaryDirectory()->append(FilePath(absl::StrCat(payload_id)));
Files::GetTemporaryDirectory().append(FilePath(absl::StrCat(payload_id)));
InputFile input_file{path.ToString()};
return std::make_unique<Payload>(input_file);
}
@@ -1230,7 +1224,7 @@ class NearbySharingServiceImplTest : public testing::Test {
EXPECT_FALSE(fake_nearby_connections_manager_->has_incoming_payloads());
// Remove test file.
RemoveFile(file_path.GetPath());
Files::RemoveFile(file_path);
}
void FlushTesting() {
@@ -1240,7 +1234,8 @@ class NearbySharingServiceImplTest : public testing::Test {
}
void SetDiskSpace(size_t size) {
fake_device_info_.SetAvailableDiskSpaceInBytes(GetTempDir(), size);
fake_device_info_.SetAvailableDiskSpaceInBytes(
Files::GetTemporaryDirectory(), size);
}
void ResetDiskSpace() { fake_device_info_.ResetDiskSpace(); }
@@ -1260,7 +1255,7 @@ class NearbySharingServiceImplTest : public testing::Test {
FilePath CreateTestFile(absl::string_view name,
const std::vector<uint8_t>& content) {
FilePath path = GetTemporaryDirectory()->append(FilePath(name));
FilePath path = Files::GetTemporaryDirectory().append(FilePath(name));
std::FILE* file = std::fopen(path.GetPath().c_str(), "w+");
std::fwrite(content.data(), 1, content.size(), file);
std::fclose(file);
@@ -3673,7 +3668,7 @@ TEST_F(NearbySharingServiceImplTest, SendFilesSuccess) {
PayloadInfo info = GetWrittenPayload();
ASSERT_TRUE(info.payload->content.is_file());
FilePath file = info.payload->content.file_payload.file.path;
ASSERT_TRUE(FileExists(file.GetPath()));
ASSERT_TRUE(Files::FileExists(file));
}
TEST_F(NearbySharingServiceImplTest, SendWifiCredentialsSuccess) {
sharing/nearby_sharing_settings_test.cc
+1 -1
View File
@@ -169,7 +169,7 @@ class NearbyShareSettingsTest : public ::testing::Test {
TEST_F(NearbyShareSettingsTest, GetAndSetCustomSavePath) {
absl::Notification notification;
std::string save_path = GetTemporaryDirectory()->ToString();
std::string save_path = Files::GetTemporaryDirectory().ToString();
settings()->SetCustomSavePathAsync(save_path,
[&]() { notification.Notify(); });
Flush();