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

Commit ad87d9dc authored by Tao Bao's avatar Tao Bao
Browse files

tests: Use get_bootloader_message_blk_device() to find /misc. 

Since commit fb00d82f has added
get_bootloader_message_blk_device() as an API, switch the tests-local
implementation to it.

Test: recovery_component_test on angler.
Test: recovery_component_test on a local build that doesn't have /misc.
Change-Id: I4f5f542cb9ef58292c587a677da73d8822db7262
parent b5fca379

tests/common/component_test_util.h

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agree to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef _COMPONENT_TEST_UTIL_H

#define _COMPONENT_TEST_UTIL_H



#include <string>



#include <android-base/properties.h>

#include <fs_mgr.h>



// Check if the /misc entry exists in the fstab.

static bool parse_misc() {

  std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),

                                                             fs_mgr_free_fstab);

  if (!fstab) {

    GTEST_LOG_(INFO) << "Failed to read default fstab";

    return false;

  }



  fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab.get(), "/misc");

  if (record == nullptr) {

    GTEST_LOG_(INFO) << "Failed to find /misc in fstab.";

    return false;

  }

  return true;

}



#endif //_COMPONENT_TEST_UTIL_H

tests/component/bootloader_message_test.cpp

+2 −3
Original line number Diff line number Diff line
@@ -21,14 +21,13 @@ 
#include <bootloader_message/bootloader_message.h>

#include <gtest/gtest.h>



#include "common/component_test_util.h"



class BootloaderMessageTest : public ::testing::Test {

 protected:

  BootloaderMessageTest() : has_misc(true) {}



  virtual void SetUp() override {

    has_misc = parse_misc();

    std::string err;

    has_misc = !get_bootloader_message_blk_device(&err).empty();

  }



  virtual void TearDown() override {

tests/component/uncrypt_test.cpp

+2 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <bootloader_message/bootloader_message.h>

#include <gtest/gtest.h>



#include "common/component_test_util.h"



using namespace std::string_literals;



static const std::string UNCRYPT_SOCKET = "/dev/socket/uncrypt";
@@ -65,7 +63,8 @@ class UncryptTest : public ::testing::Test { 


    ASSERT_TRUE(success) << "uncrypt service is not available.";



    has_misc = parse_misc();

    std::string err;

    has_misc = !get_bootloader_message_blk_device(&err).empty();

  }



  void SetupOrClearBcb(bool isSetup, const std::string& message,