Revert "AssetManager2: Fix list function"

This reverts commit adc0b87ec235a71d722fb8d6aad50ceaeac8c6d5.

Bug:73134570
Change-Id: I9e652245e7661eb7a34dadb5f363a08bc8c9e57e

1 files changed, 2 insertions, 70 deletions

diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp
index 7cac2b3417b5..eaf79cb12901 100644
--- a/libs/androidfw/tests/AssetManager2_test.cpp
+++ b/libs/androidfw/tests/AssetManager2_test.cpp
@@ -36,10 +36,6 @@ namespace lib_one = com::android::lib_one;
 namespace lib_two = com::android::lib_two;
 namespace libclient = com::android::libclient;
 
-using ::testing::Eq;
-using ::testing::NotNull;
-using ::testing::StrEq;
-
 namespace android {
 
 class AssetManager2Test : public ::testing::Test {
@@ -68,9 +64,6 @@ class AssetManager2Test : public ::testing::Test {
 
     system_assets_ = ApkAssets::Load(GetTestDataPath() + "/system/system.apk", true /*system*/);
     ASSERT_NE(nullptr, system_assets_);
-
-    app_assets_ = ApkAssets::Load(GetTestDataPath() + "/app/app.apk");
-    ASSERT_THAT(app_assets_, NotNull());
   }
 
  protected:
@@ -82,7 +75,6 @@ class AssetManager2Test : public ::testing::Test {
   std::unique_ptr<const ApkAssets> libclient_assets_;
   std::unique_ptr<const ApkAssets> appaslib_assets_;
   std::unique_ptr<const ApkAssets> system_assets_;
-  std::unique_ptr<const ApkAssets> app_assets_;
 };
 
 TEST_F(AssetManager2Test, FindsResourceFromSingleApkAssets) {
@@ -473,68 +465,8 @@ TEST_F(AssetManager2Test, GetResourceId) {
             assetmanager.GetResourceId("main", "layout", "com.android.basic"));
 }
 
-TEST_F(AssetManager2Test, OpensFileFromSingleApkAssets) {
-  AssetManager2 assetmanager;
-  assetmanager.SetApkAssets({system_assets_.get()});
-
-  std::unique_ptr<Asset> asset = assetmanager.Open("file.txt", Asset::ACCESS_BUFFER);
-  ASSERT_THAT(asset, NotNull());
-
-  const char* data = reinterpret_cast<const char*>(asset->getBuffer(false /*wordAligned*/));
-  ASSERT_THAT(data, NotNull());
-  EXPECT_THAT(std::string(data, asset->getLength()), StrEq("file\n"));
-}
-
-TEST_F(AssetManager2Test, OpensFileFromMultipleApkAssets) {
-  AssetManager2 assetmanager;
-  assetmanager.SetApkAssets({system_assets_.get(), app_assets_.get()});
-
-  std::unique_ptr<Asset> asset = assetmanager.Open("file.txt", Asset::ACCESS_BUFFER);
-  ASSERT_THAT(asset, NotNull());
-
-  const char* data = reinterpret_cast<const char*>(asset->getBuffer(false /*wordAligned*/));
-  ASSERT_THAT(data, NotNull());
-  EXPECT_THAT(std::string(data, asset->getLength()), StrEq("app override file\n"));
-}
-
-TEST_F(AssetManager2Test, OpenDir) {
-  AssetManager2 assetmanager;
-  assetmanager.SetApkAssets({system_assets_.get()});
+TEST_F(AssetManager2Test, OpensFileFromSingleApkAssets) {}
 
-  std::unique_ptr<AssetDir> asset_dir = assetmanager.OpenDir("");
-  ASSERT_THAT(asset_dir, NotNull());
-  ASSERT_THAT(asset_dir->getFileCount(), Eq(2u));
-
-  EXPECT_THAT(asset_dir->getFileName(0), Eq(String8("file.txt")));
-  EXPECT_THAT(asset_dir->getFileType(0), Eq(FileType::kFileTypeRegular));
-
-  EXPECT_THAT(asset_dir->getFileName(1), Eq(String8("subdir")));
-  EXPECT_THAT(asset_dir->getFileType(1), Eq(FileType::kFileTypeDirectory));
-
-  asset_dir = assetmanager.OpenDir("subdir");
-  ASSERT_THAT(asset_dir, NotNull());
-  ASSERT_THAT(asset_dir->getFileCount(), Eq(1u));
-
-  EXPECT_THAT(asset_dir->getFileName(0), Eq(String8("subdir_file.txt")));
-  EXPECT_THAT(asset_dir->getFileType(0), Eq(FileType::kFileTypeRegular));
-}
-
-TEST_F(AssetManager2Test, OpenDirFromManyApks) {
-  AssetManager2 assetmanager;
-  assetmanager.SetApkAssets({system_assets_.get(), app_assets_.get()});
-
-  std::unique_ptr<AssetDir> asset_dir = assetmanager.OpenDir("");
-  ASSERT_THAT(asset_dir, NotNull());
-  ASSERT_THAT(asset_dir->getFileCount(), Eq(3u));
-
-  EXPECT_THAT(asset_dir->getFileName(0), Eq(String8("app_file.txt")));
-  EXPECT_THAT(asset_dir->getFileType(0), Eq(FileType::kFileTypeRegular));
-
-  EXPECT_THAT(asset_dir->getFileName(1), Eq(String8("file.txt")));
-  EXPECT_THAT(asset_dir->getFileType(1), Eq(FileType::kFileTypeRegular));
-
-  EXPECT_THAT(asset_dir->getFileName(2), Eq(String8("subdir")));
-  EXPECT_THAT(asset_dir->getFileType(2), Eq(FileType::kFileTypeDirectory));
-}
+TEST_F(AssetManager2Test, OpensFileFromMultipleApkAssets) {}
 
 }  // namespace android