commit 1caae5f7f5b413043e1b0e25faf452b9bc3dff59
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 06 22:46:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 06 22:46:51 2020 +0000
tree 7a0c403ea6b69f86383943c033360212976d0096
parent 2fe12d26665240bf5461308cab898c34a67c832f
parent 6900a09fe7db47acbf995b09ef79c17417d121c3

Merge "Trivial strxfrm coverage improvement." am: 6900a09fe7

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1393618

Change-Id: I6f1c5da693359c9e40d10117beb28e34157e7a44

tests/string_test.cpp

diff --git a/tests/string_test.cpp b/tests/string_test.cpp
index 0ed0598..53fb18c 100644
--- a/tests/string_test.cpp
+++ b/tests/string_test.cpp
@@ -1592,10 +1592,21 @@
 TEST(STRING_TEST, strxfrm_smoke) {
   const char* src1 = "aab";
   char dst1[16] = {};
-  ASSERT_GT(strxfrm(dst1, src1, sizeof(dst1)), 0U);
+  // Dry run.
+  ASSERT_EQ(strxfrm(dst1, src1, 0), 3U);
+  ASSERT_STREQ(dst1, "");
+  // Really do it.
+  ASSERT_EQ(strxfrm(dst1, src1, sizeof(dst1)), 3U);
+
   const char* src2 = "aac";
   char dst2[16] = {};
-  ASSERT_GT(strxfrm(dst2, src2, sizeof(dst2)), 0U);
+  // Dry run.
+  ASSERT_EQ(strxfrm(dst2, src2, 0), 3U);
+  ASSERT_STREQ(dst2, "");
+  // Really do it.
+  ASSERT_EQ(strxfrm(dst2, src2, sizeof(dst2)), 3U);
+
+  // The "transform" of two different strings should cause different outputs.
   ASSERT_TRUE(strcmp(dst1, dst2) < 0);
 }