From: Gennadiy Civil Date: Fri, 2 Aug 2019 17:27:06 +0000 (-0400) Subject: Merge pull request #2341 from ChrisBaish:master X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6c7a8bec8d4493124f593640079d35ee0172d683;p=googletest.git Merge pull request #2341 from ChrisBaish:master PiperOrigin-RevId: 261344735 --- 6c7a8bec8d4493124f593640079d35ee0172d683 diff --cc googletest/docs/primer.md index cbb48ec,43f1872..30d86a5 --- a/googletest/docs/primer.md +++ b/googletest/docs/primer.md @@@ -221,19 -213,13 +221,17 @@@ as `ASSERT_EQ(expected, actual)`, so lo The assertions in this group compare two **C strings**. If you want to compare two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. - | Fatal assertion | Nonfatal assertion | Verifies | - | ----------------------- | ----------------------- | ---------------------- | - | `ASSERT_STREQ(str1, | `EXPECT_STREQ(str1, | the two C strings have | - : str2);` : str2);` : the same content : - | `ASSERT_STRNE(str1, | `EXPECT_STRNE(str1, | the two C strings have | - : str2);` : str2);` : different contents : - | `ASSERT_STRCASEEQ(str1, | `EXPECT_STRCASEEQ(str1, | the two C strings have | - : str2);` : str2);` : the same content, : - : : : ignoring case : - | `ASSERT_STRCASENE(str1, | `EXPECT_STRCASENE(str1, | the two C strings have | - : str2);` : str2);` : different contents, : - : : : ignoring case : ++ ++ + | Fatal assertion | Nonfatal assertion | Verifies | + | -------------------------- | ------------------------------ | -------------------------------------------------------- | + | `ASSERT_STREQ(str1,str2);` | `EXPECT_STREQ(str1,str2);` | the two C strings have the same content | + | `ASSERT_STRNE(str1,str2);` | `EXPECT_STRNE(str1,str2);` | the two C strings have different contents | + | `ASSERT_STRCASEEQ(str1,str2);` | `EXPECT_STRCASEEQ(str1,str2);` | the two C strings have the same content, ignoring case | + | `ASSERT_STRCASENE(str1,str2);` | `EXPECT_STRCASENE(str1,str2);` | the two C strings have different contents, ignoring case | + ++ + Note that "CASE" in an assertion name means that case is ignored. A `NULL` pointer and an empty string are considered *different*.