diff options
| author | Martijn Coenen <maco@google.com> | 2021-09-24 10:14:16 +0200 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2021-09-24 10:16:09 +0200 |
| commit | 35b4489b20026a93644db7a58c14900a812fd0ab (patch) | |
| tree | fa36dd0d0d86d88c5fff4263e598e64866592467 /jni/FuseUtilsTest.cpp | |
| parent | 597c4cd966e24801c89fadbad15975f8341208b4 (diff) | |
| download | MediaProvider-35b4489b20026a93644db7a58c14900a812fd0ab.tar.gz | |
Change containsMount() to look for any user-id.
On devices with app cloning, we may be responsible for storage paths
that represent a different user-id than the one that we are running as.
Change containsMount() to accept any user-id.
Bug: 200134631
Test: TEST_MAPPING, atest FuseUtilsTest
Change-Id: I4387beeed5925b9e43c4f45d0f5e9ed2f6a196d5
Diffstat (limited to 'jni/FuseUtilsTest.cpp')
| -rw-r--r-- | jni/FuseUtilsTest.cpp | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/jni/FuseUtilsTest.cpp b/jni/FuseUtilsTest.cpp index d9d28e618..a46c3a81e 100644 --- a/jni/FuseUtilsTest.cpp +++ b/jni/FuseUtilsTest.cpp @@ -23,44 +23,38 @@ using namespace mediaprovider::fuse; TEST(FuseUtilsTest, testContainsMount_isTrueForAndroidDataObb) { - EXPECT_TRUE(containsMount("/storage/emulated/1234/Android", "1234")); - EXPECT_TRUE(containsMount("/storage/emulated/1234/Android/data", "1234")); - EXPECT_TRUE(containsMount("/storage/emulated/1234/Android/obb", "1234")); + EXPECT_TRUE(containsMount("/storage/emulated/1234/Android")); + EXPECT_TRUE(containsMount("/storage/emulated/5678/Android")); + EXPECT_TRUE(containsMount("/storage/emulated/1234/Android/data")); + EXPECT_TRUE(containsMount("/storage/emulated/5678/Android/obb")); + EXPECT_TRUE(containsMount("/storage/emulated/1234/Android/obb")); + EXPECT_TRUE(containsMount("/storage/emulated/5678/Android/obb")); } TEST(FuseUtilsTest, testContainsMount) { - EXPECT_FALSE(containsMount("/random/path", "1234")); - EXPECT_FALSE(containsMount("/storage/abc-123", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/data/and/more", "1234")); + EXPECT_FALSE(containsMount("/random/path")); + EXPECT_FALSE(containsMount("/storage/abc-123")); + EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/data/and/more")); + EXPECT_FALSE(containsMount("/storage/emulated")); + EXPECT_FALSE(containsMount("/storage/emulated/")); + EXPECT_FALSE(containsMount("/storage/emulated//")); + EXPECT_FALSE(containsMount("/storage/emulated/0/")); } TEST(FuseUtilsTest, testContainsMount_isCaseInsensitive) { - EXPECT_TRUE(containsMount("/storage/emulated/1234/android", "1234")); - EXPECT_TRUE(containsMount("/storage/emulated/1234/Android/Data", "1234")); - EXPECT_TRUE(containsMount("/storage/emulated/1234/ANDroid/dATa", "1234")); - EXPECT_TRUE(containsMount("/storage/emulated/1234/ANDROID/OBB", "1234")); - EXPECT_TRUE(containsMount("/Storage/EMULATED/1234/Android/obb", "1234")); -} - -TEST(FuseUtilsTest, testContainsMount_isCaseInsensitiveForUserid) { - EXPECT_TRUE(containsMount("/storage/emulated/UserId/Android", "UserId")); - EXPECT_TRUE(containsMount("/storage/emulated/userid/Android/obb", "Userid")); - EXPECT_TRUE(containsMount("/storage/emulated/Userid/Android/obb", "userid")); + EXPECT_TRUE(containsMount("/storage/emulated/1234/android")); + EXPECT_TRUE(containsMount("/storage/emulated/1234/Android/Data")); + EXPECT_TRUE(containsMount("/storage/emulated/1234/ANDroid/dATa")); + EXPECT_TRUE(containsMount("/storage/emulated/1234/ANDROID/OBB")); + EXPECT_TRUE(containsMount("/Storage/EMULATED/1234/Android/obb")); } TEST(FuseUtilsTest, testContainsMount_isFalseForPathWithAdditionalSlash) { - EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/data/", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/obb/", "1234")); - - EXPECT_FALSE(containsMount("//storage/emulated/1234/Android", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated//1234/Android/data", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated/1234//Android/data", "1234")); -} + EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/")); + EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/data/")); + EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/obb/")); -TEST(FuseUtilsTest, testContainsMount_isFalseForPathWithWrongUserid) { - EXPECT_FALSE(containsMount("/storage/emulated/11234/Android", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated/0/Android/data", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated/12345/Android/obb", "1234")); - EXPECT_FALSE(containsMount("/storage/emulated/1234/Android/obb", "5678")); + EXPECT_FALSE(containsMount("//storage/emulated/1234/Android")); + EXPECT_FALSE(containsMount("/storage/emulated//1234/Android/data")); + EXPECT_FALSE(containsMount("/storage/emulated/1234//Android/data")); } |