summaryrefslogtreecommitdiffstats
path: root/tests/component
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-03-23 01:20:51 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-03-23 01:20:53 +0100
commit1ea869b0c6b6287989f98ed16103a246fe9ae64a (patch)
treed66338f891ad8b440a36e781988fae89cca1da7f /tests/component
parentMerge "Fix the permission of stashed blocks created by updater" (diff)
parentRemove malloc in edify functions (diff)
downloadandroid_bootable_recovery-1ea869b0c6b6287989f98ed16103a246fe9ae64a.tar
android_bootable_recovery-1ea869b0c6b6287989f98ed16103a246fe9ae64a.tar.gz
android_bootable_recovery-1ea869b0c6b6287989f98ed16103a246fe9ae64a.tar.bz2
android_bootable_recovery-1ea869b0c6b6287989f98ed16103a246fe9ae64a.tar.lz
android_bootable_recovery-1ea869b0c6b6287989f98ed16103a246fe9ae64a.tar.xz
android_bootable_recovery-1ea869b0c6b6287989f98ed16103a246fe9ae64a.tar.zst
android_bootable_recovery-1ea869b0c6b6287989f98ed16103a246fe9ae64a.zip
Diffstat (limited to 'tests/component')
-rw-r--r--tests/component/edify_test.cpp5
-rw-r--r--tests/component/updater_test.cpp3
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);