Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c53de92 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Follow up to change b638126e DO NOT MERGE. 

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

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
parent b638126e

libutils/tests/Android.mk

+0 −7
Original line number Diff line number Diff line
@@ -33,10 +33,3 @@ $(foreach file,$(test_src_files), \ 
    $(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)

libutils/tests/Vector_test.cpp

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#define LOG_TAG "Vector_test"



#define __STDC_LIMIT_MACROS

#include <stdint.h>

#include <utils/Vector.h>

#include <cutils/log.h>

#include <gtest/gtest.h>
@@ -87,9 +89,9 @@ TEST_F(VectorTest, SetCapacity_ShrinkBelowSize) { 
  vector.add(4);



  vector.setCapacity(8);

  ASSERT_EQ(8, vector.capacity());

  ASSERT_EQ(8U, vector.capacity());

  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.