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

Commit 65df16b0 authored by James Hawkins's avatar James Hawkins Committed by android-build-merger
Browse files

Merge "system/core/lib[c]utils: Fix signedness comparison warnings." 

am: bba2151b

* commit 'bba2151b':
  system/core/lib[c]utils: Fix signedness comparison warnings.
parents aa88fa58 bba2151b

libcutils/tests/PropertiesTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -106,14 +106,14 @@ TEST_F(PropertiesTest, SetString) { 
        ResetValue();



        // Since the value is null, default value will be returned

        int len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT);

        size_t len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT);

        EXPECT_EQ(strlen(PROPERTY_TEST_VALUE_DEFAULT), len);

        EXPECT_STREQ(PROPERTY_TEST_VALUE_DEFAULT, mValue);

    }



    // Trivial case => get returns what was set

    {

        int len = SetAndGetProperty("hello_world");

        size_t len = SetAndGetProperty("hello_world");

        EXPECT_EQ(strlen("hello_world"), len) << "hello_world key";

        EXPECT_STREQ("hello_world", mValue);

        ResetValue();
@@ -122,7 +122,7 @@ TEST_F(PropertiesTest, SetString) { 
    // Set to empty string => get returns default always

    {

        const char* EMPTY_STRING_DEFAULT = "EMPTY_STRING";

        int len = SetAndGetProperty("", EMPTY_STRING_DEFAULT);

        size_t len = SetAndGetProperty("", EMPTY_STRING_DEFAULT);

        EXPECT_EQ(strlen(EMPTY_STRING_DEFAULT), len) << "empty key";

        EXPECT_STREQ(EMPTY_STRING_DEFAULT, mValue);

        ResetValue();
@@ -147,7 +147,7 @@ TEST_F(PropertiesTest, SetString) { 


        // Expect that the value set fails since it's too long

        EXPECT_GT(0, property_set(PROPERTY_TEST_KEY, oneLongerString.c_str()));

        int len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT);

        size_t len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT);



        EXPECT_EQ(strlen(VALID_TEST_VALUE), len) << "set should've failed";

        EXPECT_STREQ(VALID_TEST_VALUE, mValue);

libutils/tests/Vector_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -89,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.