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

Follow up to change b638126ed DO NOT MERGE.

Browse source 
Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
This commit is contained in:
Narayan Kamath 2015-09-10 10:01:22 +01:00
parent b638126ed3
commit 6c53de92cf
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libutils/tests/Android.mk
View file

@ -33,10 +33,3 @@ $(foreach file,$(test_src_files), \
$(eval include $(BUILD_NATIVE_TEST)) \ $(eval include $(BUILD_NATIVE_TEST)) \
) )
include $(CLEAR_VARS)
LOCAL_MODULE := libutils_tests_host
LOCAL_SRC_FILES := Vector_test.cpp
LOCAL_STATIC_LIBRARIES := libutils liblog
include $(BUILD_HOST_NATIVE_TEST)

6
libutils/tests/Vector_test.cpp
View file

@ -16,6 +16,8 @@
#define LOG_TAG "Vector_test" #define LOG_TAG "Vector_test"
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#include <utils/Vector.h> #include <utils/Vector.h>
#include <cutils/log.h> #include <cutils/log.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
@ -87,9 +89,9 @@ TEST_F(VectorTest, SetCapacity_ShrinkBelowSize) {
vector.add(4); vector.add(4);
vector.setCapacity(8); vector.setCapacity(8);
ASSERT_EQ(8, vector.capacity()); ASSERT_EQ(8U, vector.capacity());
vector.setCapacity(2); vector.setCapacity(2);
ASSERT_EQ(8, vector.capacity()); ASSERT_EQ(8U, vector.capacity());
} }
// NOTE: All of the tests below are useless because of the "TODO" above. // NOTE: All of the tests below are useless because of the "TODO" above.