commit 65cc7224494d2d470d8b2ff82cdd87f2e2df4666
author Yifan Hong <elsk@google.com> Fri Apr 14 15:30:52 2017 -0700
committer Yifan Hong <elsk@google.com> Sat Apr 15 00:52:56 2017 -0700
tree 2f3f96f67d4d08c2f0de1bbf276014161984ca9a
parent 398f4c7744018f763eb84d7d290793966e2e41b9

Add VintfObjectRecovery

A special VintfObject for recovery. CheckCompatibility
knows how to mount /system and /vendor if necessary.

Test: testing with a test CL that replaces graphics test
      into calling android::vintf::details::mountSystem
      / mountVendor, and the partitions are actually
      mounted.

Bug: 36814503
Change-Id: Ie6a8e533841a128a411134973006ac4afb17a78e

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index da93b94..c7a243f 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -733,16 +733,6 @@
     EXPECT_TRUE(manifest.checkCompatibility(matrix, &error)) << error;
 }
 
-namespace details {
-int32_t checkCompatibility(const std::vector<std::string> &xmls, bool mount,
-        std::function<status_t(void)> mountSystem,
-        std::function<status_t(void)> mountVendor,
-        std::function<const HalManifest *(bool)> GetFrameworkHalManifest,
-        std::function<const HalManifest *(bool)> GetDeviceHalManifest,
-        std::function<const RuntimeInfo *(bool)> GetRuntimeInfo,
-        std::string *error);
-} // namespace details
-
 TEST_F(LibVintfTest, Compat2) {
     std::string deviceManifestXml =
         "<manifest version=\"1.0\" type=\"device\">\n"
@@ -789,49 +779,61 @@
 
     bool systemMounted = false;
     bool vendorMounted = false;
-    auto mountSystem = [&systemMounted] () { systemMounted = true; return OK; };
-    auto mountVendor = [&vendorMounted] () { vendorMounted = true; return OK; };
+    bool systemUmounted = false;
+    bool vendorUmounted = false;
+    auto mountSystem  = [&systemMounted]  () { systemMounted = true;  return OK; };
+    auto mountVendor  = [&vendorMounted]  () { vendorMounted = true;  return OK; };
+    auto umountSystem = [&systemUmounted] () { systemUmounted = true; return OK; };
+    auto umountVendor = [&vendorUmounted] () { vendorUmounted = true; return OK; };
     auto nullManifestFunc = [](bool) -> const HalManifest * { return nullptr; };
     auto runtimeInfoFunc = [&](bool) { return &runtimeInfo; };
     // full OTA
     EXPECT_EQ(COMPATIBLE, details::checkCompatibility(
             {deviceManifestXml, deviceMatrixXml, frameworkManifestXml, frameworkMatrixXml},
-            false /* mount */, mountSystem, mountVendor,
+            false /* mount */, mountSystem, umountSystem, mountVendor, umountVendor,
             nullManifestFunc,
             nullManifestFunc,
             runtimeInfoFunc,
             &error)) << error;
     EXPECT_FALSE(systemMounted);
     EXPECT_FALSE(vendorMounted);
+    EXPECT_FALSE(systemUmounted);
+    EXPECT_FALSE(vendorUmounted);
     EXPECT_EQ(COMPATIBLE, details::checkCompatibility(
             {deviceManifestXml, deviceMatrixXml, frameworkManifestXml, frameworkMatrixXml},
-            true /* mount */, mountSystem, mountVendor,
+            true /* mount */, mountSystem, umountSystem, mountVendor, umountVendor,
             nullManifestFunc,
             nullManifestFunc,
             runtimeInfoFunc,
             &error)) << error;
     EXPECT_FALSE(systemMounted);
     EXPECT_FALSE(vendorMounted);
+    EXPECT_FALSE(systemUmounted);
+    EXPECT_FALSE(vendorUmounted);
 
     // framework only OTA
     EXPECT_GT(0, details::checkCompatibility(
             {frameworkManifestXml, frameworkMatrixXml},
-            false /* mount */, mountSystem, mountVendor,
+            false /* mount */, mountSystem, umountSystem, mountVendor, umountVendor,
             nullManifestFunc,
             nullManifestFunc,
             runtimeInfoFunc,
             &error)) << "should not mount, thus info should be missing";
     EXPECT_FALSE(systemMounted);
     EXPECT_FALSE(vendorMounted);
+    EXPECT_FALSE(systemUmounted);
+    EXPECT_FALSE(vendorUmounted);
     EXPECT_EQ(COMPATIBLE, details::checkCompatibility(
             {frameworkManifestXml, frameworkMatrixXml},
-            true /* mount */, mountSystem, mountVendor,
+            true /* mount */, mountSystem, umountSystem, mountVendor, umountVendor,
             nullManifestFunc,
             [&](auto) { return &devManifest; },
             runtimeInfoFunc,
             &error)) << error;
     EXPECT_FALSE(systemMounted);
     EXPECT_TRUE(vendorMounted);
+    EXPECT_FALSE(systemUmounted);
+    EXPECT_TRUE(vendorUmounted);
 
     CompatibilityMatrix failedFwkMatrix;
     std::string failedFrameworkMatrixXml;
@@ -856,13 +858,15 @@
     EXPECT_FALSE(runtimeInfo.checkCompatibility(failedFwkMatrix, &error)) << error;
     EXPECT_EQ(INCOMPATIBLE, details::checkCompatibility(
             {frameworkManifestXml, failedFrameworkMatrixXml},
-            true /* mount */, mountSystem, mountVendor,
+            true /* mount */, mountSystem, umountSystem, mountVendor, umountVendor,
             nullManifestFunc,
             [&](auto) { return &devManifest; },
             runtimeInfoFunc,
             &error)) << error;
     EXPECT_FALSE(systemMounted);
     EXPECT_TRUE(vendorMounted);
+    EXPECT_FALSE(systemUmounted);
+    EXPECT_TRUE(vendorUmounted);
 
     // Failed framework only OTA example 2: unsupported HAL
     failedFwkMatrix = {};
@@ -888,13 +892,15 @@
     EXPECT_TRUE(runtimeInfo.checkCompatibility(failedFwkMatrix, &error)) << error;
     EXPECT_EQ(INCOMPATIBLE, details::checkCompatibility(
             {frameworkManifestXml, failedFrameworkMatrixXml},
-            true /* mount */, mountSystem, mountVendor,
+            true /* mount */, mountSystem, umountSystem, mountVendor, umountVendor,
             nullManifestFunc,
             [&](auto) { return &devManifest; },
             runtimeInfoFunc,
             &error)) << error;
     EXPECT_FALSE(systemMounted);
     EXPECT_TRUE(vendorMounted);
+    EXPECT_FALSE(systemUmounted);
+    EXPECT_TRUE(vendorUmounted);
 }
 
 } // namespace vintf