ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from topic "healthd_test" am: 17ed9c4fb6

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392638

Change-Id: I5410990c3b920f655bd73c1e218c06855a851333
This commit is contained in:
Yifan Hong 2020-08-07 01:14:28 +00:00 • committed by Automerger Merge Worker
commit 0074cc1831
6 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
healthd/Android.bp
View file

@ -240,3 +240,20 @@ cc_test {
defaults: ["charger_defaults"], defaults: ["charger_defaults"],
srcs: ["charger_test.cpp"], srcs: ["charger_test.cpp"],
} }
cc_test {
name: "libhealthd_charger_test",
srcs: ["AnimationParser_test.cpp"],
shared_libs: [
"liblog",
"libbase",
"libcutils",
],
static_libs: [
"libhealthd_charger",
],
test_suites: [
"general-tests",
"device-tests",
],
}

4
healthd/AnimationParser.cpp
View file

@ -37,8 +37,8 @@ bool can_ignore_line(const char* str) {
return true; return true;
} }
bool remove_prefix(const std::string& line, const char* prefix, const char** rest) { bool remove_prefix(std::string_view line, const char* prefix, const char** rest) {
const char* str = line.c_str(); const char* str = line.data();
int start; int start;
char c; char c;

4
healthd/AnimationParser.h
View file

@ -17,6 +17,8 @@
#ifndef HEALTHD_ANIMATION_PARSER_H #ifndef HEALTHD_ANIMATION_PARSER_H
#define HEALTHD_ANIMATION_PARSER_H #define HEALTHD_ANIMATION_PARSER_H
#include <string_view>
#include "animation.h" #include "animation.h"
namespace android { namespace android {
@ -24,7 +26,7 @@ namespace android {
bool parse_animation_desc(const std::string& content, animation* anim); bool parse_animation_desc(const std::string& content, animation* anim);
bool can_ignore_line(const char* str); bool can_ignore_line(const char* str);
bool remove_prefix(const std::string& str, const char* prefix, const char** rest); bool remove_prefix(std::string_view str, const char* prefix, const char** rest);
bool parse_text_field(const char* in, animation::text_field* field); bool parse_text_field(const char* in, animation::text_field* field);
} // namespace android } // namespace android

0
healthd/tests/AnimationParser_test.cpp → healthd/AnimationParser_test.cpp
View file

7
healthd/TEST_MAPPING Normal file
View file

@ -0,0 +1,7 @@
{
"presubmit": [
{
"name": "libhealthd_charger_test"
}
]
}

21
healthd/tests/Android.mk
View file

@ -1,21 +0,0 @@
# Copyright 2016 The Android Open Source Project
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
AnimationParser_test.cpp \
LOCAL_MODULE := healthd_test
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_LIBRARIES := \
libhealthd_internal \
LOCAL_SHARED_LIBRARIES := \
liblog \
libbase \
libcutils \
include $(BUILD_NATIVE_TEST)