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

Commit 72edb4c0 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e am: e7c8bb47 am: 4b7ba78f 

am: 8d47d408

Change-Id: Id5a6203edd7d52faae0eed8be244364153fa6956
parents d476607b 8d47d408

base/include/android-base/strings.h

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ bool StartsWithIgnoreCase(const std::string& s, const char* prefix); 
bool EndsWith(const std::string& s, const char* suffix);

bool EndsWithIgnoreCase(const std::string& s, const char* suffix);



// Tests whether 'lhs' equals 'rhs', ignoring case.

bool EqualsIgnoreCase(const std::string& lhs, const std::string& rhs);



}  // namespace base

}  // namespace android

base/strings.cpp

+4 −0
Original line number Diff line number Diff line
@@ -112,5 +112,9 @@ bool EndsWithIgnoreCase(const std::string& s, const char* suffix) { 
  return EndsWith(s, suffix, false);

}



bool EqualsIgnoreCase(const std::string& lhs, const std::string& rhs) {

  return strcasecmp(lhs.c_str(), rhs.c_str()) == 0;

}



}  // namespace base

}  // namespace android

base/strings_test.cpp

+7 −0
Original line number Diff line number Diff line
@@ -244,3 +244,10 @@ TEST(strings, EndsWithIgnoreCase_contains_prefix) { 
  ASSERT_FALSE(android::base::EndsWithIgnoreCase("foobar", "OBA"));

  ASSERT_FALSE(android::base::EndsWithIgnoreCase("foobar", "FOO"));

}



TEST(strings, EqualsIgnoreCase) {

  ASSERT_TRUE(android::base::EqualsIgnoreCase("foo", "FOO"));

  ASSERT_TRUE(android::base::EqualsIgnoreCase("FOO", "foo"));

  ASSERT_FALSE(android::base::EqualsIgnoreCase("foo", "bar"));

  ASSERT_FALSE(android::base::EqualsIgnoreCase("foo", "fool"));

}