summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-03-01 19:58:27 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-03-01 19:58:27 +0100
commit4249cdfe29491b0ad8c418d8015a50cb37b6ff9b (patch)
treecdf6bc19fb0749ae82402af11aa34ab7db1a6f6e /tests
parentMerge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6af am: 7b9a92c1e2 (diff)
parentMerge "Add a singleton CacheLocation to replace the hard coded locations" am: 47cd789eed (diff)
downloadandroid_bootable_recovery-4249cdfe29491b0ad8c418d8015a50cb37b6ff9b.tar
android_bootable_recovery-4249cdfe29491b0ad8c418d8015a50cb37b6ff9b.tar.gz
android_bootable_recovery-4249cdfe29491b0ad8c418d8015a50cb37b6ff9b.tar.bz2
android_bootable_recovery-4249cdfe29491b0ad8c418d8015a50cb37b6ff9b.tar.lz
android_bootable_recovery-4249cdfe29491b0ad8c418d8015a50cb37b6ff9b.tar.xz
android_bootable_recovery-4249cdfe29491b0ad8c418d8015a50cb37b6ff9b.tar.zst
android_bootable_recovery-4249cdfe29491b0ad8c418d8015a50cb37b6ff9b.zip
Diffstat (limited to 'tests')
-rw-r--r--tests/component/applypatch_test.cpp5
-rw-r--r--tests/component/updater_test.cpp21
2 files changed, 17 insertions, 9 deletions
diff --git a/tests/component/applypatch_test.cpp b/tests/component/applypatch_test.cpp
index 21c9a52dc..b6d092557 100644
--- a/tests/component/applypatch_test.cpp
+++ b/tests/component/applypatch_test.cpp
@@ -35,6 +35,7 @@
#include "applypatch/applypatch.h"
#include "applypatch/applypatch_modes.h"
#include "common/test_constants.h"
+#include "otautil/cache_location.h"
#include "otautil/print_sha1.h"
static void sha1sum(const std::string& fname, std::string* sha1, size_t* fsize = nullptr) {
@@ -93,14 +94,14 @@ class ApplyPatchCacheTest : public ApplyPatchTest {
protected:
void SetUp() override {
ApplyPatchTest::SetUp();
- cache_temp_source = old_file;
+ CacheLocation::location().set_cache_temp_source(old_file);
}
};
class ApplyPatchModesTest : public ::testing::Test {
protected:
void SetUp() override {
- cache_temp_source = cache_source.path;
+ CacheLocation::location().set_cache_temp_source(cache_source.path);
}
TemporaryFile cache_source;
diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp
index 448fe4935..5bfd7cb40 100644
--- a/tests/component/updater_test.cpp
+++ b/tests/component/updater_test.cpp
@@ -41,6 +41,7 @@
#include "common/test_constants.h"
#include "edify/expr.h"
#include "otautil/SysUtil.h"
+#include "otautil/cache_location.h"
#include "otautil/error_code.h"
#include "otautil/print_sha1.h"
#include "updater/blockimg.h"
@@ -104,7 +105,16 @@ class UpdaterTest : public ::testing::Test {
RegisterBuiltins();
RegisterInstallFunctions();
RegisterBlockImageFunctions();
+
+ // Mock the location of last_command_file.
+ CacheLocation::location().set_cache_temp_source(temp_saved_source_.path);
+ CacheLocation::location().set_last_command_file(temp_last_command_.path);
+ CacheLocation::location().set_stash_directory_base(temp_stash_base_.path);
}
+
+ TemporaryFile temp_saved_source_;
+ TemporaryFile temp_last_command_;
+ TemporaryDir temp_stash_base_;
};
TEST_F(UpdaterTest, getprop) {
@@ -542,7 +552,7 @@ TEST_F(UpdaterTest, block_image_update_fail) {
expect("", script.c_str(), kNoCause, &updater_info);
// Updater generates the stash name based on the input file name.
std::string name_digest = get_sha1(update_file.path);
- std::string stash_base = "/cache/recovery/" + name_digest;
+ std::string stash_base = std::string(temp_stash_base_.path) + "/" + name_digest;
ASSERT_EQ(0, access(stash_base.c_str(), F_OK));
ASSERT_EQ(-1, access((stash_base + src_hash).c_str(), F_OK));
ASSERT_EQ(0, rmdir(stash_base.c_str()));
@@ -709,8 +719,7 @@ TEST_F(UpdaterTest, brotli_new_data) {
}
TEST_F(UpdaterTest, last_command_update) {
- TemporaryFile temp_file;
- last_command_file = temp_file.path;
+ std::string last_command_file = CacheLocation::location().last_command_file();
std::string block1 = std::string(4096, '1');
std::string block2 = std::string(4096, '2');
@@ -797,8 +806,7 @@ TEST_F(UpdaterTest, last_command_update) {
}
TEST_F(UpdaterTest, last_command_update_unresumable) {
- TemporaryFile temp_file;
- last_command_file = temp_file.path;
+ std::string last_command_file = CacheLocation::location().last_command_file();
std::string block1 = std::string(4096, '1');
std::string block2 = std::string(4096, '2');
@@ -853,8 +861,7 @@ TEST_F(UpdaterTest, last_command_update_unresumable) {
}
TEST_F(UpdaterTest, last_command_verify) {
- TemporaryFile temp_file;
- last_command_file = temp_file.path;
+ std::string last_command_file = CacheLocation::location().last_command_file();
std::string block1 = std::string(4096, '1');
std::string block2 = std::string(4096, '2');