Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2938569 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[incremental] storage is regarded as fully loaded if there's no file or only empty files"

parents 245a8aa1 425862f3

services/incremental/IncrementalService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1706,8 +1706,8 @@ float IncrementalService::getLoadingProgressFromPath(const IncFsMount& ifs, 
    }



    if (totalBlocks == 0) {

        LOG(ERROR) << "getLoadingProgress failed to get total num of blocks";

        return -EINVAL;

        // No file in the storage or files are empty; regarded as fully loaded

        return 1;

    }

    return (float)filledBlocks / (float)totalBlocks;

}

services/incremental/test/IncrementalServiceTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ TEST_F(IncrementalServiceTest, testMakeDirectories) { 
    ASSERT_EQ(res, 0);

}



TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithNoFile) {

TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccessWithNoFile) {

    mIncFs->countFilledBlocksSuccess();

    mFs->hasNoFile();
@@ -1077,7 +1077,7 @@ TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithNoFile) { 
    int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),

                                                       IncrementalService::CreateOptions::CreateNew,

                                                       {}, {}, {});

    ASSERT_EQ(-EINVAL, mIncrementalService->getLoadingProgress(storageId));

    ASSERT_EQ(1, mIncrementalService->getLoadingProgress(storageId));

}



TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithFailedRanges) {
@@ -1092,7 +1092,7 @@ TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithFailedRanges) { 
    ASSERT_EQ(-1, mIncrementalService->getLoadingProgress(storageId));

}



TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithEmptyRanges) {

TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccessWithEmptyRanges) {

    mIncFs->countFilledBlocksEmpty();

    mFs->hasFiles();
@@ -1101,7 +1101,7 @@ TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithEmptyRanges) { 
                                                       IncrementalService::CreateOptions::CreateNew,

                                                       {}, {}, {});

    EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(3);

    ASSERT_EQ(-EINVAL, mIncrementalService->getLoadingProgress(storageId));

    ASSERT_EQ(1, mIncrementalService->getLoadingProgress(storageId));

}



TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccess) {