diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-03-23 01:45:51 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-23 01:45:51 +0100 |
| commit | 5e1a2dc5227d86761b43b39a93a83dfd95975de4 (patch) | |
| tree | 9e4357aa169dac1a093adc1ffc70d12d71f59c6d /tests | |
| parent | Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a am: deb2a29a42 (diff) | |
| parent | Merge "Remove malloc in edify functions" am: 1ea869b0c6 (diff) | |
| download | android_bootable_recovery-5e1a2dc5227d86761b43b39a93a83dfd95975de4.tar android_bootable_recovery-5e1a2dc5227d86761b43b39a93a83dfd95975de4.tar.gz android_bootable_recovery-5e1a2dc5227d86761b43b39a93a83dfd95975de4.tar.bz2 android_bootable_recovery-5e1a2dc5227d86761b43b39a93a83dfd95975de4.tar.lz android_bootable_recovery-5e1a2dc5227d86761b43b39a93a83dfd95975de4.tar.xz android_bootable_recovery-5e1a2dc5227d86761b43b39a93a83dfd95975de4.tar.zst android_bootable_recovery-5e1a2dc5227d86761b43b39a93a83dfd95975de4.zip | |
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/edify_test.cpp | 5 | ||||
| -rw-r--r-- | tests/component/updater_test.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/component/edify_test.cpp b/tests/component/edify_test.cpp index 287e40cc6..61a1e6b64 100644 --- a/tests/component/edify_test.cpp +++ b/tests/component/edify_test.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <memory> #include <string> #include <gtest/gtest.h> @@ -21,7 +22,7 @@ #include "edify/expr.h" static void expect(const char* expr_str, const char* expected) { - Expr* e; + std::unique_ptr<Expr> e; int error_count = 0; EXPECT_EQ(0, parse_string(expr_str, &e, &error_count)); EXPECT_EQ(0, error_count); @@ -152,7 +153,7 @@ TEST_F(EdifyTest, big_string) { TEST_F(EdifyTest, unknown_function) { // unknown function const char* script1 = "unknown_function()"; - Expr* expr; + std::unique_ptr<Expr> expr; int error_count = 0; EXPECT_EQ(1, parse_string(script1, &expr, &error_count)); EXPECT_EQ(1, error_count); diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp index 4f8349e2f..ef121a973 100644 --- a/tests/component/updater_test.cpp +++ b/tests/component/updater_test.cpp @@ -19,6 +19,7 @@ #include <sys/types.h> #include <unistd.h> +#include <memory> #include <string> #include <vector> @@ -46,7 +47,7 @@ struct selabel_handle *sehandle = nullptr; static void expect(const char* expected, const char* expr_str, CauseCode cause_code, UpdaterInfo* info = nullptr) { - Expr* e; + std::unique_ptr<Expr> e; int error_count = 0; ASSERT_EQ(0, parse_string(expr_str, &e, &error_count)); ASSERT_EQ(0, error_count); |